Commit e80b572188cda0a6c697e45c08e139df02f002fc
1 parent
5ad4bd37
商品详情页面的优化
Showing
2 changed files
with
37 additions
and
142 deletions
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
| ... | ... | @@ -3385,6 +3385,7 @@ Page({ |
| 3385 | 3385 | teamgroup[i].open_num = order.length; |
| 3386 | 3386 | }) |
| 3387 | 3387 | }else{ |
| 3388 | + | |
| 3388 | 3389 | //获取order信息根据订单编号order_sn |
| 3389 | 3390 | await getApp().request.promiseGet("/api/weshop/rechargeServicelist/page", { |
| 3390 | 3391 | data: { store_id: os.stoid, prom_id: prom_id,pt_status: 1} | ... | ... |
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
| ... | ... | @@ -4,7 +4,7 @@ |
| 4 | 4 | <wxs module="tool" src="filter.wxs"></wxs> |
| 5 | 5 | |
| 6 | 6 | <!-- 商品内容区域,普通商品,秒杀,拼团 --> |
| 7 | -<block> | |
| 7 | +<block wx:if="{{isshow}}"> | |
| 8 | 8 | <view class="container"> |
| 9 | 9 | <view class="type-navbar"> |
| 10 | 10 | <view class="type-box" wx:for="{{categories}}" wx:key="categories"> |
| ... | ... | @@ -94,16 +94,7 @@ |
| 94 | 94 | </view> |
| 95 | 95 | </view> |
| 96 | 96 | |
| 97 | - <!-- 幸运购 --> | |
| 98 | - <view class="abs white xc-nanber" wx:if="{{false}}"> | |
| 99 | - <text class="fs22">已成团{{prom_act.buy_num}}期</text> | |
| 100 | - <view class="flex" style='margin-top:-34rpx'> | |
| 101 | - <view class="xc-people-img"> | |
| 102 | - <image class="imgs" src="{{prom_st==1? iurl+'/miniapp/images/r_logo_red.png':iurl+'/miniapp/images/r_logo.png'}}"></image> | |
| 103 | - </view> | |
| 104 | - <view class="t-s fs20 xc-people-val">{{prom_act.ct_num}}人团</view> | |
| 105 | - </view> | |
| 106 | - </view> | |
| 97 | + | |
| 107 | 98 | |
| 108 | 99 | <view class="hy-stop word-color fs26 abs" wx:if="{{prom_st==1}}">距活动结束还有</view> |
| 109 | 100 | <view class="hy-stop word-color-lan fs26 abs" wx:if="{{prom_st==0}}">距活动开始还有</view> |
| ... | ... | @@ -215,7 +206,7 @@ |
| 215 | 206 | <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image> |
| 216 | 207 | <view class="fs30" style="color:black;">选择门店</view> |
| 217 | 208 | </view> |
| 218 | - <view class="red_bb fs26">更多门店<text class="bg_jj"></text></view> | |
| 209 | + <view hidden="{{has_def && sys_switch.is_pricing_open_store}}" class="red_bb fs26">更多门店<text class="bg_jj"></text></view> | |
| 219 | 210 | </view> |
| 220 | 211 | |
| 221 | 212 | <view wx:if="{{def_pick_store && def_pick_store.pickup_name}}"> |
| ... | ... | @@ -243,42 +234,7 @@ |
| 243 | 234 | |
| 244 | 235 | </view> |
| 245 | 236 | |
| 246 | - | |
| 247 | - <view class="bdt16" wx:if="{{actList}}"> | |
| 248 | - <view class="cx-frame" style="position: relative; height: auto"> | |
| 249 | - <!-- <block> --> | |
| 250 | - <view class="flex ai_c" wx:for="{{actList}}"> | |
| 251 | - <view class="cx-sizs fs30 pdr40" wx:if="{{item.prom_type == 1}}">秒杀{{index+1}}</view> | |
| 252 | - <view class="f1"> | |
| 253 | - <!-- <view class="fs28 f1"> --> | |
| 254 | - <!-- <view> | |
| 255 | - <text class="prom_condition"> | |
| 256 | - <text class="fill-box">消费满</text>享优惠 | |
| 257 | - </text> | |
| 258 | - </view> --> | |
| 259 | - | |
| 260 | - <!-- <view class="word f1 fs26"> --> | |
| 261 | - <!-- <text class="tick lh2 pdr20" wx:if="{{item.money>0}}">减价{{item.money}}元</text> | |
| 262 | - <text class="tick lh2 pdr20" wx:if="{{item.sale>0}}">打{{item.sale}}折</text> | |
| 263 | - <text class="tick lh2 pdr20" wx:if="{{item.past==1}}">包邮</text> | |
| 264 | - <text class="tick lh2 pdr20" wx:if="{{item.intValue>0}}">送{{item.intValue}}积分</text> | |
| 265 | - <view class="tick lh2 pdr20" wx:if="{{item.couponId>0}}">送{{item.couponMoney}}元优惠券</view> | |
| 266 | - <view class="tick ellipsis-1x lh2" wx:if="{{item.gift_id>0}}">送商品{{item.goods_name}}</view> | |
| 267 | - <view class="tick ellipsis-1x lh2 details pdr40" wx:if="{{item.lb_id>0}}" data-id="{{item.lb_id}}" bindtap="viewLbDetails">送{{item.lbtitle}}</view> --> | |
| 268 | - <view class="tick ellipsis-1x lh2 details pdr40" bindtap="viewFlash" data-promtype="{{item.prom_type}}" data-promid="{{item.act_id}}">{{item.act_name}}</view> | |
| 269 | - <!-- </view> --> | |
| 270 | - <!-- </view> --> | |
| 271 | - </view> | |
| 272 | - </view> | |
| 273 | - | |
| 274 | - | |
| 275 | - <!-- </block> --> | |
| 276 | - </view> | |
| 277 | - </view> | |
| 278 | - | |
| 279 | 237 | |
| 280 | - | |
| 281 | - | |
| 282 | 238 | <!-- 保障服务 --> |
| 283 | 239 | <view class="bz_view flex bdt16 ai_c" wx:if="{{store_config.service_bz}}"> |
| 284 | 240 | <image class="bzfu_img" src="{{iurl}}/miniapp/images/bzfu_w.png"></image> |
| ... | ... | @@ -595,26 +551,8 @@ |
| 595 | 551 | </view> --> |
| 596 | 552 | |
| 597 | 553 | <!-- 底部按钮 --> |
| 598 | - <view class="join-cart jc_sb ai_c"> | |
| 599 | - | |
| 600 | - <view class="flex"> | |
| 601 | - <!-- <button wx:if="{{sys_switch.weapp_customertype==1}}" class="custom-service cart-ico new_split pdh20" open-type="contact" | |
| 602 | - session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}"> | |
| 603 | - <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image> | |
| 604 | - <view>客服</view> | |
| 605 | - </button> | |
| 606 | - | |
| 607 | - <view wx:elif="{{sys_switch.weapp_customertype==2}}" class="custom-service cart-ico new_split pdh20" bindtap="con_weixin" | |
| 608 | - style="text-align: center"> | |
| 609 | - <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image> | |
| 610 | - <view>客服</view> | |
| 611 | - </view> | |
| 554 | + <view class="join-cart ai_c"> | |
| 612 | 555 | |
| 613 | - <view wx:else class="custom-service cart-ico new_split pdh20" bindtap="contactService" style="text-align: center"> | |
| 614 | - <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image> | |
| 615 | - <view>客服</view> | |
| 616 | - </view> --> | |
| 617 | - | |
| 618 | 556 | <view class="custom-service cart-ico new_split pdh20" bindtap="openCS"> |
| 619 | 557 | <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image> |
| 620 | 558 | <view>客服</view> |
| ... | ... | @@ -633,72 +571,23 @@ |
| 633 | 571 | <view>购物车</view> |
| 634 | 572 | </navigator> |
| 635 | 573 | </view> |
| 636 | - </view> | |
| 637 | 574 | |
| 638 | - | |
| 639 | - <view class="flex f1 btn-group"> | |
| 640 | - | |
| 641 | - <!-- 从“秒杀”入口进入购买商品 --> | |
| 642 | - <block wx:if="{{options.prom_type == 1}}"> | |
| 643 | - <!-- 活动正在开始，商品还没抢光 --> | |
| 644 | - <block wx:if="{{prom_st==1 && !prom_r_null}}"> | |
| 645 | - <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn f1">加入购物车</view> | |
| 646 | - <view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn f1">立即抢购</view> | |
| 647 | - </block> | |
| 648 | - | |
| 649 | - <!-- 活动还没开始，商品还没抢光 --> | |
| 650 | - <block wx:if="{{prom_st == 0 && !prom_r_null}}"> | |
| 651 | - <!-- 秒杀预热要单独购买 --> | |
| 652 | - <!-- is_shop_buy支持以原价购买 --> | |
| 653 | - <block wx:if="{{prom_type==1 && prom_act.is_shop_buy}}"> | |
| 654 | - <view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn f1">单独购买</view> | |
| 655 | - <view class="buy-btn cart-btn lanse f1">即将开始</view> | |
| 656 | - </block> | |
| 657 | - <block wx:else> | |
| 658 | - <view class="buy-btn cart-btn cart-btn-lg lanse set_width f1">即将开始</view> | |
| 659 | - </block> | |
| 660 | - </block> | |
| 661 | - | |
| 662 | - <!-- 商品已被抢光 --> | |
| 663 | - <block wx:if="{{prom_r_null}}"> | |
| 664 | - <block wx:if="{{prom_type==1 && prom_act.is_shop_buy}}"> | |
| 665 | - <view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn f1">单独购买</view> | |
| 666 | - <view class="buy-btn cart-btn huise f1">已抢光</view> | |
| 667 | - </block> | |
| 668 | - <view wx:else class="buy-btn cart-btn cart-btn-lg huise set_width f1">已抢光</view> | |
| 669 | - </block> | |
| 670 | - | |
| 671 | - <!-- 活动已经结束，商品还没抢光 --> | |
| 672 | - <block wx:if="{{prom_st==3 && !prom_r_null}}"> | |
| 673 | - <block wx:if="{{prom_type==1 && prom_act.is_shop_buy}}"> | |
| 674 | - <view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn f1">单独购买</view> | |
| 675 | - <view class="buy-btn cart-btn huise f1">活动已经结束</view> | |
| 676 | - </block> | |
| 677 | - <view wx:else class="buy-btn cart-btn cart-btn-lg huise set_width f1">活动已经结束</view> | |
| 678 | - </block> | |
| 679 | - | |
| 680 | - </block> | |
| 681 | - | |
| 682 | - <!-- -----拼单------ --> | |
| 683 | - <!-- <block wx:elif="{{options.prom_type==6}}"> | |
| 575 | + <!-- -----拼单------ --> | |
| 576 | + <block > | |
| 684 | 577 | <view bindtap="openSpecModel_pt" data-it="1" data-ind="1" class="join-btn cart-btn line-h"> |
| 685 | 578 | <view class="fir-v"> |
| 686 | - | |
| 687 | - <block wx:if="{{card_field && sele_g[card_field]>0}}"> | |
| 688 | - {{filters.toFix(sele_g[card_field],2)}} | |
| 689 | - </block> | |
| 690 | - <block wx:else>{{filters.toFix(sele_g.shop_price,2)}}</block> | |
| 579 | + {{filters.toFix(sele_g.money,2)}} | |
| 691 | 580 | </view> |
| 692 | 581 | <view>单独购买</view> |
| 693 | 582 | </view> |
| 694 | - <block wx:if="{{user_order_pt_state==0}}"> --> | |
| 583 | + <block wx:if="{{user_order_pt_state==0}}"> | |
| 695 | 584 | <!-- --商家团-- --> |
| 696 | - <!-- <view bindtap="openSpecModel_pt" data-it="0" wx:if="{{prom_st==1 && !prom_r_null && prom_act.kttype==1}}" class="buy-btn cart-btn line-h"> | |
| 585 | + <view bindtap="openSpecModel_pt" data-it="0" wx:if="{{prom_st==1 && !prom_r_null && prom_act.kttype==1}}" class="buy-btn cart-btn line-h"> | |
| 697 | 586 | <view class="fir-v">￥{{prom_act.price}}</view> |
| 698 | 587 | <view>去参团</view> |
| 699 | - </view> --> | |
| 588 | + </view> | |
| 700 | 589 | <!-- --会员团-- --> |
| 701 | - <!-- <view bindtap="openSpecModel_pt" data-it="0" wx:if="{{prom_st==1 && !prom_r_null && prom_act.kttype==2}}" class="buy-btn cart-btn line-h"> | |
| 590 | + <view bindtap="openSpecModel_pt" data-it="0" wx:if="{{prom_st==1 && !prom_r_null && prom_act.kttype==2}}" class="buy-btn cart-btn line-h"> | |
| 702 | 591 | |
| 703 | 592 | <view class="pd_top1" wx:if="{{prom_act.tz_yhjgtype>1}}"> |
| 704 | 593 | <view>一键开团</view> |
| ... | ... | @@ -713,9 +602,9 @@ |
| 713 | 602 | <view class="fir-v">￥{{ filters.toFix(prom_act.price,2)}}</view> |
| 714 | 603 | <view>一键开团</view> |
| 715 | 604 | </view> |
| 716 | - </view> --> | |
| 605 | + </view> | |
| 717 | 606 | <!-- -阶梯团-- --> |
| 718 | - <!-- <view bindtap="openSpecModel_pt" data-it="0" wx:if="{{prom_st==1 && !prom_r_null && prom_act.kttype==3 && user_order_pt_state!=3 }}" class="buy-btn cart-btn line-h"> | |
| 607 | + <view bindtap="openSpecModel_pt" data-it="0" wx:if="{{prom_st==1 && !prom_r_null && prom_act.kttype==3 && user_order_pt_state!=3 }}" class="buy-btn cart-btn line-h"> | |
| 719 | 608 | <view class="fir-v">￥{{filters.toFix(prom_act.yf_price,2)}}</view> |
| 720 | 609 | <view>支付定金</view> |
| 721 | 610 | </view> |
| ... | ... | @@ -734,16 +623,7 @@ |
| 734 | 623 | 支付尾款 |
| 735 | 624 | </view> |
| 736 | 625 | </block> |
| 737 | - </block> --> | |
| 738 | - | |
| 739 | - | |
| 740 | - <!-- 从“我的服务”入口进入购买商品 --> | |
| 741 | - <block wx:else> | |
| 742 | - <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn f1">加入购物车</view> | |
| 743 | - <view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn f1">立即购买</view> | |
| 744 | 626 | </block> |
| 745 | - | |
| 746 | - </view> | |
| 747 | 627 | |
| 748 | 628 | </view> |
| 749 | 629 | |
| ... | ... | @@ -788,7 +668,11 @@ |
| 788 | 668 | <view class="address-frame xc-ash"> |
| 789 | 669 | <view class="flex-vertical-between butttem5"> |
| 790 | 670 | <view class="flex xc-ash"> |
| 791 | - <view class="fs30 xc-black3 address_name">{{item.pickup_name}}</view> | |
| 671 | + <view class="fs30 xc-black3 address_name">{{item.pickup_name}} | |
| 672 | + <block wx:if="{{tool.is_no_dis(sele_g.storageId,item.keyid)}}"> | |
| 673 | + <text class="no_store">(配送不匹配)</text> | |
| 674 | + </block> | |
| 675 | + </view> | |
| 792 | 676 | </view> |
| 793 | 677 | <view> |
| 794 | 678 | <view class="distance fs24 address-val" wx:if="{{item.distance!=null}}"> |
| ... | ... | @@ -814,7 +698,11 @@ |
| 814 | 698 | <view class="address-frame xc-ash"> |
| 815 | 699 | <view class="flex-vertical-between "> |
| 816 | 700 | <view class="flex xc-ash"> |
| 817 | - <view class="fs30 xc-black3 address_name">{{item.pickup_name}}</view> | |
| 701 | + <view class="fs30 xc-black3 address_name">{{item.pickup_name}} | |
| 702 | + <block wx:if="{{tool.is_no_dis(sele_g.storageId,item.keyid)}}"> | |
| 703 | + <text class="no_store">(配送不匹配)</text> | |
| 704 | + </block> | |
| 705 | + </view> | |
| 818 | 706 | </view> |
| 819 | 707 | <view> |
| 820 | 708 | <view class="distance fs24 address-val" wx:if="{{item.distance!=null}}">距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}} |
| ... | ... | @@ -842,7 +730,11 @@ |
| 842 | 730 | <view class="address-frame xc-ash"> |
| 843 | 731 | <view class="flex-vertical-between "> |
| 844 | 732 | <view class="flex xc-ash"> |
| 845 | - <view class="fs28 xc-black3 address_name">{{item.pickup_name}}</view> | |
| 733 | + <view class="fs28 xc-black3 address_name">{{item.pickup_name}} | |
| 734 | + <block wx:if="{{tool.is_no_dis(sele_g.storageId,item.keyid)}}"> | |
| 735 | + <text class="no_store">(配送不匹配)</text> | |
| 736 | + </block> | |
| 737 | + </view> | |
| 846 | 738 | </view> |
| 847 | 739 | <view> |
| 848 | 740 | <view class="distance fs24 address-val" wx:if="{{item.distance!=null}}"> |
| ... | ... | @@ -913,12 +805,6 @@ |
| 913 | 805 | </view> |
| 914 | 806 | </view> |
| 915 | 807 | |
| 916 | -<!-- 弹起来,购买预热商品的普通购买 --> | |
| 917 | -<view hidden="{{!openSpecModal_flash_normal}}"> | |
| 918 | - <include src="buy_flash_normal.wxml" /> | |
| 919 | -</view> | |
| 920 | - | |
| 921 | - | |
| 922 | 808 | <!-- 联系客服操作菜单 --> |
| 923 | 809 | <view class="action {{!hiddenCS ? 'active':''}}" hidden="{{hiddenCS}}"> |
| 924 | 810 | <view class="pd20 t-c pr"> |
| ... | ... | @@ -945,3 +831,11 @@ |
| 945 | 831 | </view> |
| 946 | 832 | |
| 947 | 833 | <view class="mask2" bindtap="closeCS"></view> |
| 834 | + | |
| 835 | +<!-- --弹起来,选择规格数量,拼单商品购买---- --> | |
| 836 | +<view hidden="{{!openSpecModal_pt}}"> | |
| 837 | + <include src="buy_pt.wxml" /> | |
| 838 | +</view> | |
| 839 | + | |
| 840 | +<!-- 分享控件，底部弹出 --> | |
| 841 | +<share id="share_button" bind:send="send" bind:cancel="cancel" bind:share_img="saveImageToPhotosAlbum" wx:if="{{share_hidden}}"></share> | ... | ... |