From eb90e544a73289ac83b0aa6679ee20bcabaa86b8 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Wed, 22 May 2024 16:13:36 +0800
Subject: [PATCH] 选择门店的优化

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

diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index c105b25..be34d9b 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -1100,6 +1100,7 @@
       <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
       <view>客服</view>
     </view> -->
+    
 
     <view class="custom-service cart-ico new_split" bindtap="openCS">
       <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
@@ -1430,6 +1431,39 @@
           </block>
         </view>
 
+        <!-- 选择门店模块 -->
+        <view class="flex-space-between address ai_end xc-width ">
+          <view class="flex" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
+            <text class="fs30 xc-black3 shop_name bold  {{def_pick_store.distance!=null?'max':''}} ">{{def_pick_store.pickup_name}}</text>
+            <view class="distance fs24 xc-ash" 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="flex" bindtap="choice_store" wx:else>
+            <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
+            <view class="fs30" style="color:black;">选择门店</view>
+          </view>
+          <view hidden="{{has_def && sys_switch.is_pricing_open_store}}" class="red-co fs28" bindtap="choice_store">更多门店<text class="right-arrow"></text></view>
+        </view>
+        <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
+        <block wx:else>
+          <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
+          <block wx:else>
+            <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>
+
+            <view class="no_store" wx:elif="{{def_pick_store.is_no_dis_nor}}">(该店不可售)</view>
+            <view class="no_store" wx:elif="{{def_pick_store.is_no_dis_nor && is_normal}}">(该店不可售)</view>
+            <view class="no_store" wx:elif="{{def_pick_store.is_no_dis_act && !is_normal}}">(该店不可售)</view>
+            <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && !filters.is_virtual_gd(sele_g.is_virtual) && sales_rules>=2 && prom_type==0 &&!sele_g.whsle_id }}">
+              (库存不足)
+            </view>
+          </block>
+        </block>
+        <view class="fs24 xc-ash-9f xc-distance-top " wx:if="{{def_pick_store && def_pick_store.fulladdress}}">
+          地址:{{def_pick_store.fulladdress}}
+        </view>
+
       </view>
 
       <!-- 商品的属性项目 -->
@@ -1449,6 +1483,7 @@
           </block>
         </view>
       </view>
+
       <view class="b_num">
         <view>购买数量</view>
         <view class="count">
--
libgit2 0.21.4