From 84657494e7fb6e544553441e3c6b506e187e7986 Mon Sep 17 00:00:00 2001
From: abson <antploy.ni@meidd.com>
Date: Thu, 24 Mar 2022 14:10:37 +0800
Subject: [PATCH] 小程序 商品详情页 优惠促销和门店互换位置

---
 pages/goods/goodsInfo/goodsInfo.wxml | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------
 1 file changed, 57 insertions(+), 57 deletions(-)

diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index a5695bc..fe43b80 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -490,61 +490,8 @@
             </view>
           </view>
         </block>
-        <!-- 门店收货地址 -->
-        <view class="xc-address_frame bdt16 flex-vertical xc-ash {{def_pick_store!=null?'sn_height':'on_height'}}">
-          <view class="address_frame" bindtap="choice_store" data-ind="0">
-            <view class="flex-vertical-between ">
-              <view class="flex-vertical select_store_height">
-                <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
-                <view class="fs30" style="color:black;">选择门店</view>
-              </view>
-              <view class="red_bb fs26">更多门店<text class="bg_jj"></text></view>
-            </view>
-            <view wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
-              <view class="flex-space-between address ai_end pdv10">
-                <view>
-                  <text class="fs30 xc-black3 shop_name bold">{{def_pick_store.pickup_name}}</text>
-                </view>
-                <view class="distance fs24" wx:if="{{def_pick_store.distance!=null}}">
-                  距离：{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
-                </view>
-              </view>
-              <view class="no_store" wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
-              <block wx:else>
-                <view class="no_store" wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">
-                  (库存不足)
-                </view>
-                <block wx:else>
-                  <view class="no_store" wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">
-                    (配送不匹配)
-                  </view>
-                  <view class="no_store" wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0}}">
-                    (库存不足)
-                  </view>
-                </block>
-              </block>
-              <view class="fs24 xc-ash-9f">地址:{{def_pick_store.fulladdress}}</view>
-            </view>
-          </view>
-        </view>
-        <!-- 许程 7.24暂时注释 -->
-        <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}}">
-          <view class="cx-frame flex" style="position: relative" wx:if="{{fir_quan.length>0}}">
-            <view class="cx-sizs fs30">领券</view>
-            <view class="flex ai_c f1 pdh20">
-              <view class="xc-coupon-fram" wx:for="{{fir_quan}}" wx:key="id">
-                <view class="circle xc-circular xc-one"></view>
-                <view class="xc-coupon t-c four-level-word">
-                  满{{item.condition}}减{{item.money}}
-                </view>
-                <view class="circle xc-circular xc-two"></view>
-              </view>
-            </view>
-            <view data-coupon="1" bindtap="switchCoupon" class="cx-obtain-coupon wsize">
-              <text class="bg_jj"></text>
-            </view>
-          </view>
-        </view>
+       
+        
         <!-- 要判断是不是有促销活动 -->
         <block wx:if="{{prom_goods}}">
           <view class="cx-frame flex" style="position: relative; height: auto" hidden="{{prom_type==4 || prom_type==6}}">
@@ -601,7 +548,6 @@
         </view>
         </block>
 
-
         <!-- 要判断是不是有订单优惠 -->
         <block wx:if="{{order_prom}}">
           <view class="cx-frame flex" style="position: relative; height: auto">
@@ -664,7 +610,61 @@
             </view>
           </block>
         </block>
-
+        <!-- 许程 7.24暂时注释 -->
+        <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}}">
+          <view class="cx-frame flex" style="position: relative" wx:if="{{fir_quan.length>0}}">
+            <view class="cx-sizs fs30">领券</view>
+            <view class="flex ai_c f1 pdh20">
+              <view class="xc-coupon-fram" wx:for="{{fir_quan}}" wx:key="id">
+                <view class="circle xc-circular xc-one"></view>
+                <view class="xc-coupon t-c four-level-word">
+                  满{{item.condition}}减{{item.money}}
+                </view>
+                <view class="circle xc-circular xc-two"></view>
+              </view>
+            </view>
+            <view data-coupon="1" bindtap="switchCoupon" class="cx-obtain-coupon wsize">
+              <text class="bg_jj"></text>
+            </view>
+          </view>
+        </view>
+         <!-- 门店收货地址 -->
+         <view class="xc-address_frame bdt16 flex-vertical xc-ash {{def_pick_store!=null?'sn_height':'on_height'}}">
+          <view class="address_frame" bindtap="choice_store" data-ind="0">
+            <view class="flex-vertical-between ">
+              <view class="flex-vertical select_store_height">
+                <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
+                <view class="fs30" style="color:black;">选择门店</view>
+              </view>
+              <view class="red_bb fs26">更多门店<text class="bg_jj"></text></view>
+            </view>
+            <view wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
+              <view class="flex-space-between address ai_end pdv10">
+                <view>
+                  <text class="fs30 xc-black3 shop_name bold">{{def_pick_store.pickup_name}}</text>
+                </view>
+                <view class="distance fs24" wx:if="{{def_pick_store.distance!=null}}">
+                  距离：{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
+                </view>
+              </view>
+              <view class="no_store" wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
+              <block wx:else>
+                <view class="no_store" wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">
+                  (库存不足)
+                </view>
+                <block wx:else>
+                  <view class="no_store" wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">
+                    (配送不匹配)
+                  </view>
+                  <view class="no_store" wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0}}">
+                    (库存不足)
+                  </view>
+                </block>
+              </block>
+              <view class="fs24 xc-ash-9f">地址:{{def_pick_store.fulladdress}}</view>
+            </view>
+          </view>
+        </view>
         <!-- 保障服务 -->
         <view class="bz_view flex bdt16 ai_c" wx:if="{{bconfig.service_bz}}">
           <image class="bzfu_img" src="{{iurl}}/miniapp/images/bzfu_w.png"></image>
--
libgit2 0.21.4