From 61793b4aecfadd939daafa18b8f9c78b308795b6 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Wed, 9 Aug 2023 11:02:31 +0800
Subject: [PATCH] 可售不可售的显示顺序的优化

---
 pages/goods/goodsInfo/goodsInfo.js   | 40 ++++++++++++++++++++++------------------
 pages/goods/goodsInfo/goodsInfo.wxml |  6 +++---
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 3347ab5..ac8c730 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -273,6 +273,7 @@ Page({
         cx_prom_group: [], //促销活动，用于显示和判断默认要用什么促销活动
         showFold:true,
         new_share_imgurl:'', //普通商品分享图片
+
       },
 
       //------初始化加载----------
@@ -846,28 +847,29 @@ Page({
           });
 
           var ee = JSON.parse(JSON.stringify(e));
-          //--定时器推迟一下--
-          setTimeout(function () {
-            if (th.data.fir_goods) var g_distr_type = th.data.fir_goods.distr_type;
-            //--如果默认门店的配送方式不对，就不能被选择，这里不控制，如果不一样，就说明配送方式不对--
-            if (ee.distr_type != 0 && g_distr_type != 0 && ee.distr_type != g_distr_type) {
-              ee.is_no_dis = 1;
-            }
 
-            //-- 如果有指定门店的时候,pickup_ids是经过判断是不是普通商品后才会有的 --
-            if(th.data.sele_g && th.data.sele_g.pickup_ids){
+            //--定时器推迟一下--
+            var appd = getApp().globalData;
+            var w_time = setInterval(function () {
+              if (that.data.is_get_local_ok == 0) return false;
+              if (!that.data.sele_g) return false;
+
+              if (th.data.fir_goods) var g_distr_type = th.data.fir_goods.distr_type;
+              //--如果默认门店的配送方式不对，就不能被选择，这里不控制，如果不一样，就说明配送方式不对--
+              if (ee.distr_type != 0 && g_distr_type != 0 && ee.distr_type != g_distr_type) {
+                ee.is_no_dis = 1;
+              }
+
+              //-- 如果有指定门店的时候,pickup_ids是经过判断是不是普通商品后才会有的 --
+              if(th.data.sele_g && th.data.sele_g.pickup_ids && th.data.prom_type==0){
                 var idx=th.data.sele_g.pickup_ids.findIndex(function (e){
-                    return e.pickup_id==ee.pickup_id;
+                  return e.pickup_id==ee.pickup_id;
                 })
                 if(idx<0){
-                  ee.is_no_dis=1;
+                  ee.is_no_dis_nor=1;
                 }
-            }
-
+              }
 
-            var appd = getApp().globalData;
-            var w_time = setInterval(function () {
-              if (that.data.is_get_local_ok == 0) return false;
               clearInterval(w_time);
               var distance = null;
               var e = JSON.parse(JSON.stringify(ee));
@@ -910,8 +912,8 @@ Page({
                   that.set_def_storage(e);
                 }
               }
-            }, 500)
-          }, 700)
+            }, 200)
+
         });
       },
 
@@ -3519,6 +3521,8 @@ Page({
 
                 var timer_get = setInterval(function () {
                   if (th.data.is_get_local_ok == 0) return false;
+                  if (!th.data.fir_def_store) return false;
+
                   var dd = null,
                     i = getApp().request;
                   if (!th.data.sele_g) return false;
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 2cb7762..3c01209 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -1325,7 +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 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 && prom_type==0 &&!sele_g.whsle_id }}">
               (库存不足)
             </view>
@@ -1668,9 +1668,9 @@
                   <view class="flex-vertical-between ">
                     <view class="flex xc-ash">
                       <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}}">(该店不可售)</text>
+                        <text class="c-red22" wx:elif="{{item.is_no_dis_nor}}">(该店不可售)</text>
+                        <text class="c-red22" wx:elif="{{item.is_no_qyt }}">(库存不足)</text>
                       </view>
                     </view>
                     <view>
--
libgit2 0.21.4