From e570982c5d69d8b0debde62421467e1048d49846 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Wed, 9 Aug 2023 09:20:46 +0800
Subject: [PATCH] ppt测试返回的bug优化

---
 packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml            |  2 +-
 packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js   | 16 ++++++++++++++++
 packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml |  4 ++--
 pages/goods/goodsInfo/buy_com_pop.wxml                          |  6 +++---
 pages/goods/goodsInfo/buy_pt.wxml                               |  4 ++--
 pages/goods/goodsInfo/goodsInfo.js                              | 28 ++++++++++++++++++++++++----
 pages/goods/goodsInfo/goodsInfo.wxml                            | 11 +++++++++--
 7 files changed, 57 insertions(+), 14 deletions(-)

diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml
index 23c34f5..21273f0 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml
@@ -177,7 +177,7 @@
 		      </block>
 
               <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>
+                  <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">该店不可售</view>
               </block>
 
 		      <block wx:else> 	
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
index 3423071..8e15d4b 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
@@ -3684,6 +3684,15 @@ Page({
                 is_find_def_store = 1;
               }
 
+              //-- 如果库存为0就要重新赋值 --
+              if(def_pick_store.CanOutQty<=0){
+                def_pick_store.CanOutQty=Qty;
+                th.setData({
+                  def_pick_store
+                })
+              }
+
+
             } else {
               th.setData({
                 all_sto: null,
@@ -3716,6 +3725,13 @@ Page({
                         th.setData({def_pick_store: th.data.fir_def_store})
                       is_find_def_store = 1;
                     }
+
+                    //-- 如果库存为0就要重新赋值 --
+                    if(n_item.StorageNo ==def_pick_store.pickup_no && def_pick_store.CanOutQty<0) {
+                      def_pick_store.CanOutQty= o_plist[kk].CanOutQty;
+                      th.setData({ def_pick_store })
+                    }
+
                   }
                   break;
                 }
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
index 09c2b40..23ca40f 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
@@ -1371,7 +1371,7 @@
                     <view class="flex xc-ash" style="flex-shrink:0;max-width: 62%;">
                       <view class="fs30 xc-black3 address_name">{{item.pickup_name}}</view>
                       <text class="c-red22" wx:if="{{item.is_no_dis}}">(配送不匹配)</text>
-                      <text class="c-red22" wx:if="{{item.is_no_dis_nor && is_normal==1}}">(配送不匹配)</text>
+                      <text class="c-red22" wx:if="{{item.is_no_dis_nor && is_normal==1}}">(该店不可售)</text>
                     </view>
                     <view>
                       <view class="distance fs24 address-val" wx:if="{{item.distance!=null}}">
@@ -1399,7 +1399,7 @@
                     <view class="flex xc-ash">
                       <view class="fs30 xc-black3 address_name">{{item.pickup_name}}</view>
                       <text class="c-red22" wx:if="{{item.is_no_dis}}">(配送不匹配)</text>
-                      <text class="c-red22" wx:if="{{item.is_no_dis_nor && is_normal==1}}">(配送不匹配)</text>
+                      <text class="c-red22" wx:if="{{item.is_no_dis_nor && is_normal==1}}">(该店不可售)</text>
                     </view>
                     <view>
                       <view class="distance fs24 address-val" wx:if="{{item.distance!=null}}">
diff --git a/pages/goods/goodsInfo/buy_com_pop.wxml b/pages/goods/goodsInfo/buy_com_pop.wxml
index a0ffcd1..242d7e0 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}}">(该店不可售)</view>
             <view wx:elif="{{def_pick_store &&  !def_pick_store.CanOutQty  && !filters.is_virtual_gd(sele_g.is_virtual) && sales_rules>=2}}">
                 (库存不足)
             </view>
@@ -115,7 +115,7 @@
     </block>
     <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>
 
@@ -149,7 +149,7 @@
                     <block wx:else>
                         <block wx:if="{{sales_rules>=2  && !sele_g.whsle_id }}">
                             <view wx:if="{{!def_pick_store.CanOutQty || def_pick_store.CanOutQty<1 }}" class="spec-cart-btn fs32" data-action="add"
-                                  style="background-color: #dcdcdc;color: #999">库存不足
+                                  style="background-color: #dcdcdc;color: #999">库存不足1
                             </view>
                             <block wx:else>
                                 <view class="flex jc_sb">
diff --git a/pages/goods/goodsInfo/buy_pt.wxml b/pages/goods/goodsInfo/buy_pt.wxml
index 96aca25..430d85c 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 && is_normal==1}}">(配送不匹配)</view>
+                  <view class="no_store" wx:elif="{{def_pick_store.is_no_dis_nor}}">(该店不可售)</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>
@@ -161,7 +161,7 @@
 		      </block>
 
               <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>
+                  <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">该店不可售</view>
               </block>
 
 		      <block wx:else> 	
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index e4bdc9c..58730c6 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -3586,10 +3586,6 @@ Page({
 
                             if(idx1<0){
                               th.data.def_pick_store.is_no_dis_nor=1;
-                              //-- 如果不是活动的普通购买的时候 --
-                              if(!th.data.is_normal){
-                                th.data.def_pick_store.is_no_dis=1;
-                              }
                               that.setData({
                                  def_pick_store: th.data.def_pick_store
                                })
@@ -4032,6 +4028,7 @@ Page({
 
                       var def_pick_store = th.data.def_pick_store;
                       var plist = res.data.data.pageData;
+
                       if (th.data.sales_rules == 3) {
                         var lock_num = 0;
                         var Qty = 0;
@@ -4054,6 +4051,15 @@ Page({
                             is_find_def_store = 1;
                           }
 
+                          //-- 如果库存为0就要重新赋值 --
+                          if(def_pick_store.CanOutQty<=0){
+                             def_pick_store.CanOutQty=Qty;
+                             th.setData({
+                              def_pick_store
+                            })
+                          }
+
+
                         } else {
                           th.setData({
                             all_sto: null,
@@ -4079,6 +4085,13 @@ Page({
                               if (n_item.CanOutQty > lock_num) {
                                 o_plist[kk].CanOutQty = n_item.CanOutQty - lock_num;
                                 new_list.push(o_plist[kk]);
+
+                                var ck_store=th.data.fir_def_store;
+                                if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}'){
+                                  ck_store=th.data.def_pick_store;
+                                }
+
+
                                 //--如果找到默认门店,同时也应该判断配送方式对不对--
                                 if (th.data.fir_def_store && n_item.StorageNo == th.data.fir_def_store.pickup_no && (g_distr_type == 0 || th.data.fir_def_store.distr_type == 0 || th.data.def_pick_store.distr_type == g_distr_type)) {
                                   th.data.fir_def_store.CanOutQty = n_item.CanOutQty - lock_num;
@@ -4088,6 +4101,13 @@ Page({
                                     })
                                   is_find_def_store = 1;
                                 }
+
+                                //-- 如果库存为0就要重新赋值 --
+                                if(n_item.StorageNo ==def_pick_store.pickup_no && def_pick_store.CanOutQty<0) {
+                                  def_pick_store.CanOutQty= o_plist[kk].CanOutQty;
+                                  th.setData({ def_pick_store })
+                                }
+
                               }
                               break;
                             }
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 1c29541..2cb7762 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -709,6 +709,9 @@
                   <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.is_no_dis_nor && prom_type==0}}">
+                    (该店不可售)
+                  </view>
                   <view class="no_store" wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules>=2 && prom_type==0 && !sele_g.whsle_id}}">
                     (库存不足)
                   </view>
@@ -1322,6 +1325,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:if="{{def_pick_store.is_no_dis_nor}}">(该店不可售)</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>
@@ -1378,6 +1382,9 @@
       <view wx:if="{{def_pick_store && def_pick_store.is_no_dis}}" class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">
         配送不匹配
       </view>
+      <view wx:elif="{{def_pick_store && def_pick_store.is_no_dis_nor}}" class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">
+        该店不可售
+      </view>
       <block wx:else>
         <!-- 根本就找不到门店 -->
         <block wx:if="{{!only_pk && !def_pickpu_list}}">
@@ -1633,7 +1640,7 @@
                       <view class="fs30 xc-black3 address_name">{{item.pickup_name}}
                         <text class="c-red22" wx:if="{{item.is_no_qyt}}">(库存不足)</text>
                         <text class="c-red22" wx:elif="{{item.is_no_dis}}">(配送不匹配)</text>
-                        <text class="c-red22" wx:elif="{{item.is_no_dis_nor && is_normal==1}}">(配送不匹配)</text>
+                        <text class="c-red22" wx:elif="{{item.is_no_dis_nor}}">(该店不可售)</text>
                       </view>
                     </view>
                     <view>
@@ -1663,7 +1670,7 @@
                       <view class="fs30 xc-black3 address_name">{{item.pickup_name}}
                         <text class="c-red22" wx:if="{{item.is_no_qyt }}">(库存不足)</text>
                         <text class="c-red22" wx:if="{{item.is_no_dis}}">(配送不匹配)</text>
-                        <text class="c-red22" wx:if="{{item.is_no_dis_nor && is_normal==1}}">(配送不匹配)</text>
+                        <text class="c-red22" wx:if="{{item.is_no_dis_nor}}">(该店不可售)</text>
                       </view>
                     </view>
                     <view>
--
libgit2 0.21.4