From 2ae97899ac7b34e101c120c285c1d929f6e30803 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Thu, 25 May 2023 09:21:53 +0800
Subject: [PATCH] 库存不足的显示优化

---
 packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml |  3 +--
 pages/goods/goodsInfo/buy_com_pop.wxml                          |  4 ++--
 pages/goods/goodsInfo/buy_integral.wxml                         |  4 ++--
 pages/goods/goodsInfo/buy_pt.wxml                               | 48 +++++++++++++++++++++++++++++++++---------------
 4 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
index 4f4031b..9ab30ae 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
@@ -436,8 +436,7 @@
                   <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
-                        && !filters.is_virtual_gd(sele_g.is_virtual)  && sales_rules>=2 && prom_type==0}}">
+                  <view class="no_store" wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && !filters.is_virtual_gd(sele_g.is_virtual)  && sales_rules>=2 && prom_type==0}}">
                     (库存不足)
                   </view>
                 </block>
diff --git a/pages/goods/goodsInfo/buy_com_pop.wxml b/pages/goods/goodsInfo/buy_com_pop.wxml
index e2e58ef..5161a5b 100644
--- a/pages/goods/goodsInfo/buy_com_pop.wxml
+++ b/pages/goods/goodsInfo/buy_com_pop.wxml
@@ -33,8 +33,8 @@
     <!-- 选择门店模块 -->
     <view class="flex-space-between address ai_end xc-width ">
 
-        <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
-            <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
+        <view class="flex" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
+            <text class="fs30 xc-black3 shop_name {{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"}}
 
diff --git a/pages/goods/goodsInfo/buy_integral.wxml b/pages/goods/goodsInfo/buy_integral.wxml
index 891eb4d..6f05c80 100644
--- a/pages/goods/goodsInfo/buy_integral.wxml
+++ b/pages/goods/goodsInfo/buy_integral.wxml
@@ -26,8 +26,8 @@
 		              <!-- 选择门店模块 -->
 		               <view  class="flex-space-between address ai_end xc-width ">
 		      
-		                           <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
-		                             <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
+		                           <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"}}
 		                               
diff --git a/pages/goods/goodsInfo/buy_pt.wxml b/pages/goods/goodsInfo/buy_pt.wxml
index 0af0bf5..4a302f1 100644
--- a/pages/goods/goodsInfo/buy_pt.wxml
+++ b/pages/goods/goodsInfo/buy_pt.wxml
@@ -25,8 +25,10 @@
             <view class="flex">
 			  <view class="spec-goods-stock">已售：{{sele_g.sales_sum}}</view>
               <block wx:if="{{sales_rules>=2}}">
-                 <view class="spec-goods-stock" wx:if="{{def_pick_store && def_pick_store.CanOutQty}}">可售：{{def_pick_store.CanOutQty}}</view>
-              	 <view class="spec-goods-stock" wx:else>可售:0</view>
+                  <block wx:if="{{!filters.is_virtual_gd(sele_g.is_virtual)}}">
+                     <view class="spec-goods-stock" wx:if="{{def_pick_store && def_pick_store.CanOutQty}}">可售：{{def_pick_store.CanOutQty}}</view>
+                     <view class="spec-goods-stock" wx:else>可售:0</view>
+                  </block>
               </block>
               <block wx:else><view class="spec-goods-stock">可售：{{sele_g.store_count}}</view></block>    
             </view>
@@ -47,11 +49,11 @@
       <view style="margin-top: 20rpx">
         <view  class="flex-space-between address ai_end xc-width ">
 
-          <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
-            <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
+          <view class="flex" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
+            <text class="fs30 xc-black3 shop_name {{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}}">
+            <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>
@@ -176,16 +178,32 @@
 		  				 <block wx:else>
 		  					 <block wx:if="{{!def_pick_store}}">
 		  						 <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">请先选择门店</view>
-		  					 </block>					 
-		  					 <block wx:else>	 						 						  																	
-		  							 <block wx:if="{{data.store_count<=0}}">
-		  								  <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>	
-		  							 </block>
-		  							 <block wx:else>								 
-		  								 <view bindtap="addCart_pt" class="spec-cart-btn spec-buy" data-action="buy">立即购买</view> 
-		  							 </block>
-		  						 					 
-		  					 </block>									 
+		  					 </block>
+
+                             <block wx:else>
+                                 <!-- 如果是线下库存购买的时候,且是普通商品购买的时候 -->
+                                 <block wx:if="{{sales_rules>=2 && !sele_g.whsle_id && !filters.is_virtual_gd(sele_g.is_virtual) }}">
+                                     <block wx:if="{{!def_pick_store.CanOutQty}}">
+                                         <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">
+                                             库存不足
+                                         </view>
+                                     </block>
+                                     <block wx:else>
+                                         <view bindtap="addCart_pt" class="spec-cart-btn spec-buy" data-action="buy">立即购买</view>
+                                     </block>
+                                 </block>
+                                 <!-- 线上销售 -->
+                                 <block wx:else>
+                                     <block wx:if="{{sele_g.store_count<=0 && is_no_new}}">
+                                         <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">
+                                             库存不足
+                                         </view>
+                                     </block>
+                                     <block wx:else>
+                                         <view bindtap="addCart_pt" class="spec-cart-btn spec-buy" data-action="buy">立即购买</view>
+                                     </block>
+                                 </block>
+                             </block>
 		  				 </block>
 		  		   </block>  			
 		  		</block>	
--
libgit2 0.21.4