From f3c2a294618671b434dce9f92810d5c0893094a2 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Mon, 28 Aug 2023 15:38:52 +0800
Subject: [PATCH] 团购的指定门店不可售

---
 pages/cart/cart/cart.js                 | 11 ++++++++---
 pages/goods/goodsInfo/goodsInfo.js      |  6 +++---
 pages/user/order_detail/order_detail.js |  3 ++-
 pages/user/order_list/order_list.js     |  4 ++--
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index 2d25077..6c8fffa 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -3357,13 +3357,18 @@ Page({
               if (res.data.code == 0) gd = res.data.data;
             })
 
-            //判断秒杀的指定门店
-            if(py_type==1 && i_arr[j].prom && i_arr[j].prom.pick_up_lists){
+            //判断秒杀的指定门店和团购的指定门店
+            if([1,2].indexOf(py_type)>-1 && i_arr[j].prom && i_arr[j].prom.pick_up_lists){
               var idx0=i_arr[j].prom.pick_up_lists.findIndex(function (e){
                 return e.pickup_id==i_arr[j].pick_id;
               })
               if(idx0<0){
-                getApp().confirmBox(i_arr[j].goods_name + "秒杀活动的门店不可售");
+
+                var act_type=0;
+                if(py_type==1) act_type='秒杀';
+                if(py_type==2) act_type='团购';
+
+                getApp().confirmBox(i_arr[j].goods_name + act_type+"活动的门店不可售");
                 wx.hideLoading();
                 return false;
               }
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 7562ebd..44c188d 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -3645,9 +3645,9 @@ Page({
                       }
 
 
-
+                      var py=parseFloat(th.data.prom_type+'');
                       //指定门店判断， 不是普通购买的时候，秒杀的时候，秒杀有指定门店
-                      if(!is_normal && (th.data.prom_type==1 || th.data.prom_type==6) && th.data.prom_act.pick_up_lists){
+                      if(!is_normal && [1,2,6].indexOf(py)>-1 && th.data.prom_act.pick_up_lists){
                         pickup_ids=th.data.prom_act.pick_up_lists
                       }
 
@@ -3675,7 +3675,7 @@ Page({
 
                             if(idx1<0){
                               //如果是秒杀的指定门店，就要设置秒杀的
-                              if(!is_normal && (th.data.prom_type==1 || th.data.prom_type==6)  ){
+                              if(!is_normal &&  [1,2,6].indexOf(py)>-1  ){
                                 th.data.def_pick_store.is_no_dis_act=1;
                               }else{
                                 th.data.def_pick_store.is_no_dis_nor=1;
diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js
index cff2a9e..496b672 100644
--- a/pages/user/order_detail/order_detail.js
+++ b/pages/user/order_detail/order_detail.js
@@ -1038,10 +1038,11 @@ Page({
                 var act_type='';
                 switch (c_type){
                     case 1:act_type='秒杀';break;
+                    case 2:act_type='团购';break;
                     case 6:act_type='拼团';break;
                 }
                 //指定门店的控制
-                if ([1,6].indexOf(c_type)>-1 && prom.pick_up_lists) {
+                if ([1,2,6].indexOf(c_type)>-1 && prom.pick_up_lists) {
                     var idx0=prom.pick_up_lists.findIndex(function (e){
                         return e.pickup_id==order.pickup_id;
                     })
diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index 4df4dac..7ac5f86 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -778,7 +778,6 @@ Page({
         return false;
       }
 
-
       //-- 要进行判断指定门店的判断优化,先做普通商品 --
       if([0,3,5,7,10].indexOf(parseInt(good.prom_type))>-1 && gg.pick_group_ids && !good.is_gift){
           var idx0=gg.pick_up_lists.findIndex(function (e){
@@ -1354,11 +1353,12 @@ Page({
         var act_type='';
         switch (c_type){
           case 1:act_type='秒杀';break;
+          case 2:act_type='团购';break;
           case 6:act_type='拼团';break;
         }
 
         //指定门店的控制
-        if ([1,6].indexOf(c_type)>-1 && prom.pick_up_lists) {
+        if ([1,2,6].indexOf(c_type)>-1 && prom.pick_up_lists) {
           var idx0=prom.pick_up_lists.findIndex(function (e){
             return e.pickup_id==order.pickup_id;
           })
--
libgit2 0.21.4