diff --git a/packageA/pages/details_serviceCard/details_serviceCard.js b/packageA/pages/details_serviceCard/details_serviceCard.js
index a94af0f..9459004 100644
--- a/packageA/pages/details_serviceCard/details_serviceCard.js
+++ b/packageA/pages/details_serviceCard/details_serviceCard.js
@@ -747,10 +747,24 @@ Page({
 							return false;
 						}
 
+						//指定门店的控制
+						if (act_details.pick_up_lists) {
+							var idx0=act_details.pick_up_lists.findIndex(function (e){
+								return e.pickup_id==it.pickup_id;
+							})
+							if(idx0<0){
+								getApp().confirmBox(it.service_name + "拼团活动的门店不可售");
+								th.setData({ paying: 0 });
+								flag = false;
+								return false;
+							}
+						}
+
+
 					};
 				});
 
-				if(act_details.buy_limit>0){
+				if(act_details.buy_limit>0 && flag){
 					await getApp().request.promiseGet("/api/weshop/rechargeServicelist/getUserBuyGoodsNum", {
 						data: {
 							store_id: store_id,
diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js
index a1fbcd3..fa56d78 100644
--- a/pages/user/order_detail/order_detail.js
+++ b/pages/user/order_detail/order_detail.js
@@ -978,14 +978,19 @@ Page({
             }
             //----------如果有活动，并且在进行中，就不计算线下库存---------------
             if (prom) {
-
+                let c_type=parseInt(goodsinfo.prom_type+'');
+                var act_type='';
+                switch (c_type){
+                    case 1:act_type='秒杀';break;
+                    case 6:act_type='拼团';break;
+                }
                 //指定门店的控制
-                if (goodsinfo.prom_type == 1 && prom.pick_up_lists) {
+                if ([1,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;
                     })
                     if(idx0<0){
-                        getApp().confirmBox(goodsinfo.goods_name + "秒杀活动的门店不可售");
+                        getApp().confirmBox(goodsinfo.goods_name +act_type+"活动的门店不可售");
                         th.setData({ paying: 0 });
                         return false;
                     }
diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index 95b35b4..5436d26 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -1031,8 +1031,7 @@ Page({
             }
             if (prom) {
               var t_now = ut.gettimestamp();
-              if (prom.is_end == 0 && prom.start_time < t_now && prom.end_time > t_now) {
-
+              if (prom.is_end == 0 && prom.start_time < t_now && prom.end_time > t_now ) {
                 var content = gg.goods_name + '商品的活动发生了变化,请取消订单重新购买';
                 th.toast(content);
                 th.setData({ paying: 0 });
@@ -1292,20 +1291,25 @@ Page({
       }
       //----------如果有活动，并且在进行中，就不计算线下库存---------------
       if (prom) {
+        let c_type=parseInt(goodsinfo.prom_type+'');
+        var act_type='';
+        switch (c_type){
+          case 1:act_type='秒杀';break;
+          case 6:act_type='拼团';break;
+        }
 
         //指定门店的控制
-        if (goodsinfo.prom_type == 1 && prom.pick_up_lists) {
+        if ([1,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;
           })
           if(idx0<0){
-            getApp().confirmBox(goodsinfo.goods_name + "秒杀活动的门店不可售");
+            getApp().confirmBox(goodsinfo.goods_name +act_type+ "活动的门店不可售");
             th.setData({ paying: 0 });
             return false;
           }
         }
 
-
         var now = ut.gettimestamp();
         if (prom.is_end == 1 && prom.end_time < now) {
           var content = goodsinfo.goods_name + '商品的活动已经结束,请取消订单'
@@ -2951,6 +2955,21 @@ Page({
               flag = false;
               return false;
             }
+
+            //指定门店的控制
+            if (act_details.pick_up_lists) {
+              var idx0=act_details.pick_up_lists.findIndex(function (e){
+                return e.pickup_id==it.pickup_id;
+              })
+              if(idx0<0){
+                getApp().confirmBox(it.service_name + "拼团活动的门店不可售");
+                th.setData({ paying: 0 });
+                flag = false;
+                return false;
+              }
+            }
+
+
           }
         });