From 5d869d2c6dee37a6121e2b98b1abc058fcc449f9 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Thu, 30 Nov 2023 14:02:54 +0800
Subject: [PATCH] 指定门店选择的bug优化

---
 pages/goods/goodsInfo/goodsInfo.js | 40 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 36 insertions(+), 4 deletions(-)

diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 7a61c2e..eef016d 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -4003,7 +4003,32 @@ Page({
                 }
 
                 var g_distr_type = th.data.sele_g.distr_type;
-                wx.hideLoading();
+                wx.hideLoading()
+
+
+                /*--- 判断初始的用户的默认门店要不要弄进去 ---*/
+                var fid=-1;
+                if(th.data.fir_def_store){
+                  var fid=e.data.data.pageData.findIndex((e)=>{
+                    return e.pickup_id==th.data.fir_def_store.pickup_id;
+                  })
+                }
+                //--如果找到默认门店,同时也应该判断配送方式对不对--
+                if (th.data.fir_def_store && th.data.fir_def_store.pickup_id  && fid<0 &&
+                    (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 = 0;
+                  //--当选择的门店是客户默认的门店的时候--
+                  if (th.data.def_pick_store && th.data.fir_def_store.pickup_id == th.data.def_pick_store.pickup_id) {
+                    th.setData({
+                      def_pick_store: th.data.fir_def_store
+                    });
+                    e.data.data.pageData.unshift(th.data.def_pick_store);
+                  } else {
+                    e.data.data.pageData.splice(1, 0, th.data.fir_def_store);
+                  }
+                }
+
+
 
                 //单总量超出10个的时候，同时门店有分类
                 if (e.data.data.total > 10 && e.his_cate_num) {
@@ -4365,8 +4390,14 @@ Page({
                       em.his_cate_num=e.his_cate_num;
 
 
+                      var fid=-1;
+                      if(th.data.fir_def_store){
+                          var fid=em.data.data.pageData.findIndex((e)=>{
+                            return e.pickup_id==th.data.fir_def_store.pickup_id;
+                          })
+                      }
                       //--如果找到默认门店,同时也应该判断配送方式对不对--
-                      if (th.data.fir_def_store && !is_find_def_store && th.data.fir_def_store.pickup_id  &&
+                      if (th.data.fir_def_store && th.data.fir_def_store.pickup_id  && fid<0 &&
                         (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 = 0;
                         //--当选择的门店是客户默认的门店的时候--
@@ -7323,6 +7354,7 @@ Page({
                           })
                         }
                       },
+
                       //关闭选择门店
                       close_popup: function (e) {
                         var th = this;
@@ -7528,7 +7560,7 @@ Page({
 
                           if (!item) return false;
 
-                          if (item.is_no_dis_nor) {
+                          if (item.is_no_dis_nor || (item.is_no_dis_act && !th.data.is_normal)){
                             wx.showToast({
                               title: "该门店不可售，请选择其他门店",
                               icon: 'none',
@@ -8551,7 +8583,7 @@ Page({
                                   let item = f_more[i];
                                   f_more[i].prom_id = item.act_id;
                                   f_more[i].prom_type = 1;
-                                  
+
                                   var url = "/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + item.act_id;
                                   await getApp().request.promiseGet(url, {}).then(rs => {
                                     if (rs.data.code == 0 && rs.data.data) {
--
libgit2 0.21.4