From ae200e6d42437f4092d4065700284c673d243ebb Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Wed, 16 Aug 2023 15:33:21 +0800
Subject: [PATCH] 拼团的卡项的普通购买优化

---
 packageA/pages/serviceCard_pd/goodsInfo/buy_pt.wxml    |  5 ++---
 packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js   | 15 ++++++++++++---
 packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml |  6 +++---
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/packageA/pages/serviceCard_pd/goodsInfo/buy_pt.wxml b/packageA/pages/serviceCard_pd/goodsInfo/buy_pt.wxml
index 9c62aca..019324a 100644
--- a/packageA/pages/serviceCard_pd/goodsInfo/buy_pt.wxml
+++ b/packageA/pages/serviceCard_pd/goodsInfo/buy_pt.wxml
@@ -55,7 +55,7 @@
           <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 class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(该店不可售)</view>
-		<view class="no_store" wx:elif="{{def_pick_store.is_no_dis_act}}">(该店不可售)</view>
+		<view class="no_store" wx:elif="{{def_pick_store.is_no_dis_act && !is_normal}}">(该店不可售)</view>
 		<view class="no_store" wx:elif="{{is_normal && def_pick_store && def_pick_store.CanOutQty<=0}}">(库存不足)</view>
         <view class="fs24 xc-ash-9f xc-distance-top" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">地址:{{def_pick_store.fulladdress}}</view>
       </view>
@@ -147,7 +147,7 @@
 		  <view class="spec-cart-btns">	
 		      <!-- 根本就找不到门店 -->
 		      <block wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">
-		      	   <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">配送不匹配</view>		   
+		      	   <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">该店不可售</view>
 		      </block>
 		      <block wx:else> 	
 		  
@@ -183,7 +183,6 @@
 		  		</block>	
 			   </block>				   
 		    </view>
-		  
 	  </block>		  
 	  <block wx:else>
 		  <!-- 根本就找不到门店 -->
diff --git a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
index 258fba8..ab5d2ae 100644
--- a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
+++ b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
@@ -992,9 +992,6 @@ Page({
 
             }
 
-
-
-
     },
 
 
@@ -1003,6 +1000,7 @@ Page({
             openSpecModal: !1,
             openSpecModal_pt: !1,
             openSpecModal_flash_normal: !1,
+            is_normal:0
         });
     },
 
@@ -1218,6 +1216,17 @@ Page({
     get_sto(e) {
         var is_normal=e;
         var th = this, that = this;
+
+        if (e == 1) {
+            th.setData({
+                is_normal: 1
+            })
+        } else {
+            th.setData({
+                is_normal: 0
+            })
+        }
+
         var timer_get = setInterval(function () {
             if (th.data.is_get_local_ok == 0) return false;
             if (!th.data.fir_def_store) return false;
diff --git a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
index c6f0cea..4e33079 100644
--- a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
+++ b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
@@ -673,7 +673,7 @@
 												<block wx:if="{{tool.is_no_dis(sele_g.storageId,item.keyid)}}">
 													<text class="no_store">(该店不可售)</text>
 												</block>
-												<text wx:elif="{{item.is_no_dis_act}}" class="no_store">(该店不可售)</text>
+												<text wx:elif="{{item.is_no_dis_act && !is_normal}}" class="no_store">(该店不可售)</text>
 											</view>
 										</view>
 										<view>
@@ -704,7 +704,7 @@
                                                 <block wx:if="{{tool.is_no_dis(sele_g.storageId,item.keyid)}}">
 													<text class="no_store">(该店不可售)</text>
 												</block>
-												<text wx:elif="{{item.is_no_dis_act}}" class="no_store">(该店不可售)</text>
+												<text wx:elif="{{item.is_no_dis_act && !is_normal}}" class="no_store">(该店不可售)</text>
 											</view>
 										</view>
 										<view>
@@ -737,7 +737,7 @@
 											<block wx:if="{{tool.is_no_dis(sele_g.storageId,item.keyid)}}">
 												<text class="no_store">(该店不可售)</text>
 											</block>
-											<text wx:elif="{{item.is_no_dis_act}}" class="no_store">(该店不可售)</text>
+											<text wx:elif="{{item.is_no_dis_act && !is_normal}}" class="no_store">(该店不可售)</text>
 										</view>
 									</view>
 									<view>
--
libgit2 0.21.4