From 2afdecc5c2f5ff60f3263f4200c42eb3add084d4 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Wed, 9 Aug 2023 14:37:13 +0800
Subject: [PATCH] 该店不可售

---
 packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml | 5 ++---
 packageE/pages/cart/cart2_pt/cart2_pt.js             | 1 +
 pages/goods/goodsInfo/buy_com_pop.wxml               | 4 ++--
 pages/goods/goodsInfo/buy_pt.wxml                    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml
index e46d24c..a07ac33 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml
@@ -72,7 +72,7 @@
           </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_nor && is_normal}}">(门店不可售)</view>
+		<view class="no_store" wx:elif="{{def_pick_store.is_no_dis_nor && is_normal}}">(该店不可售)</view>
 		<view class="no_store" wx:elif="{{is_normal && def_pick_store && def_pick_store.CanOutQty<=0  && !filters.is_virtual_gd(sele_g.is_virtual) }}">(库存不足)</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>
@@ -175,8 +175,7 @@
 		      <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>		   
 		      </block>
-
-              <block wx:elif="{{def_pick_store && def_pick_store.is_no_dis_nor && is_normal}}">
+              <block wx:elif="{{def_pick_store && def_pick_store.is_no_dis_nor}}">
                   <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">该店不可售</view>
               </block>
 
diff --git a/packageE/pages/cart/cart2_pt/cart2_pt.js b/packageE/pages/cart/cart2_pt/cart2_pt.js
index 94d3cc8..a542b56 100644
--- a/packageE/pages/cart/cart2_pt/cart2_pt.js
+++ b/packageE/pages/cart/cart2_pt/cart2_pt.js
@@ -102,6 +102,7 @@ Page({
   },
   onLoad: function (t) {
     this.data.fir_in=1;
+    wx.setNavigationBarTitle({ title: "填写订单", })
     var th = this;
     getApp().getConfig2(function (e) {
       th.setData({
diff --git a/pages/goods/goodsInfo/buy_com_pop.wxml b/pages/goods/goodsInfo/buy_com_pop.wxml
index acb7633..ec0a0b0 100644
--- a/pages/goods/goodsInfo/buy_com_pop.wxml
+++ b/pages/goods/goodsInfo/buy_com_pop.wxml
@@ -57,7 +57,7 @@
         <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 wx:elif="{{def_pick_store &&  !def_pick_store.CanOutQty  && !filters.is_virtual_gd(sele_g.is_virtual) && sales_rules>=2}}">
                 (库存不足)
             </view>
@@ -113,7 +113,7 @@
             配送不匹配
         </view>
     </block>
-    <block wx:elif="{{def_pick_store && def_pick_store.is_no_dis_nor}}">
+    <block wx:elif="{{def_pick_store && def_pick_store.is_no_dis_nor && is_normal}}">
         <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">
             该店不可售
         </view>
diff --git a/pages/goods/goodsInfo/buy_pt.wxml b/pages/goods/goodsInfo/buy_pt.wxml
index 430d85c..eaf853f 100644
--- a/pages/goods/goodsInfo/buy_pt.wxml
+++ b/pages/goods/goodsInfo/buy_pt.wxml
@@ -72,7 +72,7 @@
               <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 wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && !filters.is_virtual_gd(sele_g.is_virtual) && sales_rules>=2 && is_normal}}">(库存不足)</view>
               </block>
           </block>
--
libgit2 0.21.4