From f23d4e4f7d6a1f975dd780444a1925f54f573fdf Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Tue, 26 Dec 2023 15:43:53 +0800
Subject: [PATCH] 默认门店的优化

---
 pages/goods/goodsInfo/goodsInfo.js | 10 ++++++++++
 pages/goods/goodsList/goodsList.js |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 2af60b2..a4664d2 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -7721,6 +7721,16 @@ Page({
 
                           if (!item) return false;
 
+                          if (item.is_no_dis_nor || (item.is_no_dis_act && !th.data.is_normal)){
+                            wx.showToast({
+                              title: "该门店不可售，请选择其他门店",
+                              icon: 'none',
+                              duration: 2000
+                            });
+                            return false;
+                          }
+
+                          if (!th.data.sele_g) return false;
                           //判断门店的配送方式是不是匹配
                           var g_distr_type = th.data.sele_g.distr_type;
                           if (item.distr_type != 0 && g_distr_type != 0 && item.distr_type != g_distr_type) {
diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js
index 206976b..b30e22c 100644
--- a/pages/goods/goodsList/goodsList.js
+++ b/pages/goods/goodsList/goodsList.js
@@ -282,7 +282,7 @@ Page({
             arr[i].content=content;
 
 
-            //--送礼包--
+            //--送券--
             if(parseInt(content.is_coupon)) {
                 //-- 获取 --
                 await getApp().request.promiseGet("/api/weshop/prom/coupon/get/"+content.coupon, {
--
libgit2 0.21.4