wxd / MShopWeApp

Commit 84657494e7fb6e544553441e3c6b506e187e7986

Authored by abson
1 parent de1adffa

小程序 商品详情页 优惠促销和门店互换位置

Inline Side-by-side
Showing 1 changed file with 57 additions and 57 deletions
pages/goods/goodsInfo/goodsInfo.wxml
  View file @8465749
... ... @@ -490,61 +490,8 @@
490 490 </view>
491 491 </view>
492 492 </block>
493   - <!-- 门店收货地址 -->
494   - <view class="xc-address_frame bdt16 flex-vertical xc-ash {{def_pick_store!=null?'sn_height':'on_height'}}">
495   - <view class="address_frame" bindtap="choice_store" data-ind="0">
496   - <view class="flex-vertical-between ">
497   - <view class="flex-vertical select_store_height">
498   - <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
499   - <view class="fs30" style="color:black;">选择门店</view>
500   - </view>
501   - <view class="red_bb fs26">更多门店<text class="bg_jj"></text></view>
502   - </view>
503   - <view wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
504   - <view class="flex-space-between address ai_end pdv10">
505   - <view>
506   - <text class="fs30 xc-black3 shop_name bold">{{def_pick_store.pickup_name}}</text>
507   - </view>
508   - <view class="distance fs24" wx:if="{{def_pick_store.distance!=null}}">
509   - 距离：{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
510   - </view>
511   - </view>
512   - <view class="no_store" wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
513   - <block wx:else>
514   - <view class="no_store" wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">
515   - (库存不足)
516   - </view>
517   - <block wx:else>
518   - <view class="no_store" wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">
519   - (配送不匹配)
520   - </view>
521   - <view class="no_store" wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0}}">
522   - (库存不足)
523   - </view>
524   - </block>
525   - </block>
526   - <view class="fs24 xc-ash-9f">地址:{{def_pick_store.fulladdress}}</view>
527   - </view>
528   - </view>
529   - </view>
530   - <!-- 许程 7.24暂时注释 -->
531   - <view class="bdt16" wx:if="{{prom_type!=1&& prom_type!=1 && prom_act.kttype!=3&&prom_act.kttype!=2&&prom_act.kttype!=1 && is_closecoupon!=1}}">
532   - <view class="cx-frame flex" style="position: relative" wx:if="{{fir_quan.length>0}}">
533   - <view class="cx-sizs fs30">领券</view>
534   - <view class="flex ai_c f1 pdh20">
535   - <view class="xc-coupon-fram" wx:for="{{fir_quan}}" wx:key="id">
536   - <view class="circle xc-circular xc-one"></view>
537   - <view class="xc-coupon t-c four-level-word">
538   - 满{{item.condition}}减{{item.money}}
539   - </view>
540   - <view class="circle xc-circular xc-two"></view>
541   - </view>
542   - </view>
543   - <view data-coupon="1" bindtap="switchCoupon" class="cx-obtain-coupon wsize">
544   - <text class="bg_jj"></text>
545   - </view>
546   - </view>
547   - </view>
  493 +
  494 +
548 495 <!-- 要判断是不是有促销活动 -->
549 496 <block wx:if="{{prom_goods}}">
550 497 <view class="cx-frame flex" style="position: relative; height: auto" hidden="{{prom_type==4 || prom_type==6}}">
... ... @@ -601,7 +548,6 @@
601 548 </view>
602 549 </block>
603 550  
604   -
605 551 <!-- 要判断是不是有订单优惠 -->
606 552 <block wx:if="{{order_prom}}">
607 553 <view class="cx-frame flex" style="position: relative; height: auto">
... ... @@ -664,7 +610,61 @@
664 610 </view>
665 611 </block>
666 612 </block>
667   -
  613 + <!-- 许程 7.24暂时注释 -->
  614 + <view class="bdt16" wx:if="{{prom_type!=1&& prom_type!=1 && prom_act.kttype!=3&&prom_act.kttype!=2&&prom_act.kttype!=1 && is_closecoupon!=1}}">
  615 + <view class="cx-frame flex" style="position: relative" wx:if="{{fir_quan.length>0}}">
  616 + <view class="cx-sizs fs30">领券</view>
  617 + <view class="flex ai_c f1 pdh20">
  618 + <view class="xc-coupon-fram" wx:for="{{fir_quan}}" wx:key="id">
  619 + <view class="circle xc-circular xc-one"></view>
  620 + <view class="xc-coupon t-c four-level-word">
  621 + 满{{item.condition}}减{{item.money}}
  622 + </view>
  623 + <view class="circle xc-circular xc-two"></view>
  624 + </view>
  625 + </view>
  626 + <view data-coupon="1" bindtap="switchCoupon" class="cx-obtain-coupon wsize">
  627 + <text class="bg_jj"></text>
  628 + </view>
  629 + </view>
  630 + </view>
  631 + <!-- 门店收货地址 -->
  632 + <view class="xc-address_frame bdt16 flex-vertical xc-ash {{def_pick_store!=null?'sn_height':'on_height'}}">
  633 + <view class="address_frame" bindtap="choice_store" data-ind="0">
  634 + <view class="flex-vertical-between ">
  635 + <view class="flex-vertical select_store_height">
  636 + <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
  637 + <view class="fs30" style="color:black;">选择门店</view>
  638 + </view>
  639 + <view class="red_bb fs26">更多门店<text class="bg_jj"></text></view>
  640 + </view>
  641 + <view wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
  642 + <view class="flex-space-between address ai_end pdv10">
  643 + <view>
  644 + <text class="fs30 xc-black3 shop_name bold">{{def_pick_store.pickup_name}}</text>
  645 + </view>
  646 + <view class="distance fs24" wx:if="{{def_pick_store.distance!=null}}">
  647 + 距离：{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
  648 + </view>
  649 + </view>
  650 + <view class="no_store" wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
  651 + <block wx:else>
  652 + <view class="no_store" wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">
  653 + (库存不足)
  654 + </view>
  655 + <block wx:else>
  656 + <view class="no_store" wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">
  657 + (配送不匹配)
  658 + </view>
  659 + <view class="no_store" wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0}}">
  660 + (库存不足)
  661 + </view>
  662 + </block>
  663 + </block>
  664 + <view class="fs24 xc-ash-9f">地址:{{def_pick_store.fulladdress}}</view>
  665 + </view>
  666 + </view>
  667 + </view>
668 668 <!-- 保障服务 -->
669 669 <view class="bz_view flex bdt16 ai_c" wx:if="{{bconfig.service_bz}}">
670 670 <image class="bzfu_img" src="{{iurl}}/miniapp/images/bzfu_w.png"></image>
... ...