解决合并fu

WXD-SEASON\season
2 parents 1175de65 6dd87a15
Showing 10 changed files with 222 additions and 78 deletions
packageA/pages/details_serviceCard/details_serviceCard.js
packageA/pages/serviceCard_pd/goodsInfo/buy_pt.wxml
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxss
pages/goods/goodsInfo/buy_pt.wxml
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.wxml
pages/user/order_detail/order_detail.js
pages/user/order_list/order_list.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,
@@ -54,7 +54,8 @@
           <view hidden="{{has_def && sys_switch.is_pricing_open_store}}" class="red-co fs28" bindtap="choice_store" >更多门店<text class="right-arrow"></text></view>
         </view>
-		<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}}">(该店不可售)</view>
+		<view class="no_store" wx:elif="{{def_pick_store.is_no_dis_act && !is_normal}}">(该店不可售)</view>
 		<view class="no_store" wx:elif="{{is_normal && def_pick_store && def_pick_store.CanOutQty<=0}}">(库存不足)</view>
         <view class="fs24 xc-ash-9f xc-distance-top" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">地址:{{def_pick_store.fulladdress}}</view>
       </view>
@@ -146,7 +147,7 @@
 		  <view class="spec-cart-btns">	
 		      <!-- 根本就找不到门店 -->
 		      <block wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">
-		      	   <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">配送不匹配</view>		   
+		      	   <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">该店不可售</view>
 		      </block>
 		      <block wx:else> 	
@@ -182,14 +183,16 @@
 		  		</block>	
 			   </block>				   
 		    </view>
-		  
 	  </block>		  
 	  <block wx:else>
 		  <!-- 根本就找不到门店 -->
 		  <block wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">
-		  	  <view class="spec-cart-btn spec-buy w100"  style="background-color: #dcdcdc;color: #999;">配送不匹配</view>		   
-		  </block>		 
-		  <block wx:else>
+		  	  <view class="spec-cart-btn spec-buy w100"  style="background-color: #dcdcdc;color: #999;">该店不可售</view>
+		  </block>
+          <block wx:elif="{{def_pick_store && def_pick_store.is_no_dis_act}}">
+              <view class="spec-cart-btn spec-buy w100"  style="background-color: #dcdcdc;color: #999;">该店不可售</view>
+          </block>
+          <block wx:else>
 		      <view bindtap="addCart_pt" class="spec-cart-btn spec-buy w100" data-action="buy">确定</view>
 		  </block> 
 	  </block>
@@ -354,17 +354,17 @@ Page({
             if(getApp().globalData.is_dj_pk) th.setData({has_def:1})
             var ee = JSON.parse(JSON.stringify(e));
             //--定时器推迟一下--
-            setTimeout(function () {
-                if (!th.data.data) return false;
-                var ser_card = th.data.data;
-                //--如果默认门店不在等级卡的默认们店以内
-                if (ser_card.storageId != null && ser_card.storageId != "" && ser_card.storageId.indexOf(ee.keyid) == -1) {
-                    ee.is_no_dis = 1;
-                }
                 var appd = getApp().globalData;
                 var w_time = setInterval(function () {
                     if (that.data.is_get_local_ok == 0) return false;
+                    if (!th.data.data) return false;
+                    var ser_card = th.data.data;
+                    //--如果默认门店不在等级卡的默认们店以内
+                    if (ser_card.storageId != null && ser_card.storageId != "" && ser_card.storageId.indexOf(ee.keyid) == -1) {
+                        ee.is_no_dis = 1;
+                    }
+
                     clearInterval(w_time);
                     var distance = null;
                     var e = JSON.parse(JSON.stringify(ee));
@@ -429,7 +429,7 @@ Page({
                         }
                     }
                 }, 500)
-            }, 700)
+
         });
@@ -992,9 +992,6 @@ Page({
             }
-
-
-
     },
@@ -1003,6 +1000,7 @@ Page({
             openSpecModal: !1,
             openSpecModal_pt: !1,
             openSpecModal_flash_normal: !1,
+            is_normal:0
         });
     },
@@ -1216,9 +1214,23 @@ Page({
     //---------拿出门店分类和门店------------
     get_sto(e) {
+        var is_normal=e;
         var th = this, that = this;
+
+        if (e == 1) {
+            th.setData({
+                is_normal: 1
+            })
+        } else {
+            th.setData({
+                is_normal: 0
+            })
+        }
+
         var timer_get = setInterval(function () {
             if (th.data.is_get_local_ok == 0) return false;
+            if (!th.data.fir_def_store) return false;
+
             var i = getApp().request;
             if (!th.data.data) return false;
             var dd = {
@@ -1240,7 +1252,8 @@ Page({
             }
             wx.showLoading({
-                title: '加载中.'
+                title: '加载中.',
+                mask:true
             });
             //----------获取门店----------------
             getApp().request.promiseGet("/api/weshop/pickup/list", {
@@ -1272,31 +1285,69 @@ Page({
                             }
                         }
-                        //如果有开启距离的功能，没有设置默认门店，要用最近的门店作为默认门店
-                        if (dd.lat && (!th.data.def_pick_store || JSON.stringify(th.data.def_pick_store) == '{}') && th.data.bconfig && th.data.bconfig.is_sort_storage) {
-                            th.setData({
-                                def_pick_store: e.data.data.pageData[0],
-                                sto_sele_name: e.data.data.pageData[0].pickup_name,
-                                sto_sele_id: e.data.data.pageData[0].pickup_id,
-                                sto_sele_distr: e.data.data.pageData[0].distr_type,
-                                sto_sele_keyid: e.data.data.pageData[0].keyid,
-                            });
-                            th.data.fir_def_store = e.data.data.pageData[0];
-                        }
+                        //如果有秒杀的指定门店
+                        if(th.data.prom_type==6 && th.data.prom_act && th.data.prom_act.pick_up_lists && e.data.data.pageData.length && !is_normal){
+                            var pick_up_lists=th.data.prom_act.pick_up_lists;
+                            for (var kq = 0; kq < e.data.data.pageData.length; kq++) {
+                                var it0=e.data.data.pageData[kq];
+                                var idx0=pick_up_lists.findIndex(function (e){
+                                    return e.pickup_id==it0.pickup_id;
+                                })
+                                if (idx0<0) {
+                                    //删除
+                                    e.data.data.pageData.splice(kq--, 1);
+                                }
+                            }
-                        //-- 如果有默认选择门店的时候，要把默认门店放在第一位，修改不要配送方式的判断 --
-                        if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}') {
-                            for (var k = 0; k < e.data.data.pageData.length; k++) {
-                                if (e.data.data.pageData[k].pickup_id == th.data.def_pick_store.pickup_id) {
-                                    e.data.data.pageData.splice(k, 1); //删除
-                                    break;
+                            if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store)!='{}'){
+                                //-- 查找一下门店有没有在 --
+                                var idx1=pick_up_lists.findIndex(function (e){
+                                    return e.pickup_id==th.data.def_pick_store.pickup_id;
+                                })
+                                if(idx1<0){
+                                    //如果是秒杀的指定门店，就要设置秒杀的
+                                    th.data.def_pick_store.is_no_dis_act=1;
+                                    that.setData({
+                                        def_pick_store: th.data.def_pick_store
+                                    })
                                 }
                             }
-                            e.data.data.pageData.splice(0, 0, th.data.def_pick_store); //添加
+
                         }
-                        th.setData({all_pick_list: e.data.data.pageData});
-                        th.deal_pickup(e);
+                        //-- 如果门店过滤后，还会是数量 --
+                        if(e.data.data.pageData.length) {
+
+                            //如果有开启距离的功能，没有设置默认门店，要用最近的门店作为默认门店
+                            if (dd.lat && (!th.data.def_pick_store || JSON.stringify(th.data.def_pick_store) == '{}') && th.data.bconfig && th.data.bconfig.is_sort_storage) {
+                                th.setData({
+                                    def_pick_store: e.data.data.pageData[0],
+                                    sto_sele_name: e.data.data.pageData[0].pickup_name,
+                                    sto_sele_id: e.data.data.pageData[0].pickup_id,
+                                    sto_sele_distr: e.data.data.pageData[0].distr_type,
+                                    sto_sele_keyid: e.data.data.pageData[0].keyid,
+                                });
+                                th.data.fir_def_store = e.data.data.pageData[0];
+                            }
+
+                            //-- 如果有默认选择门店的时候，要把默认门店放在第一位，修改不要配送方式的判断 --
+                            if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}') {
+                                for (var k = 0; k < e.data.data.pageData.length; k++) {
+                                    if (e.data.data.pageData[k].pickup_id == th.data.def_pick_store.pickup_id) {
+                                        e.data.data.pageData.splice(k, 1); //删除
+                                        break;
+                                    }
+                                }
+                                e.data.data.pageData.splice(0, 0, th.data.def_pick_store); //添加
+                            }
+
+                            th.setData({all_pick_list: e.data.data.pageData});
+                            th.deal_pickup(e);
+                        }else{
+                            th.setData({all_pick_list: null, only_pk:null,def_pickpu_list:null });
+
+                            wx.hideLoading();
+                        }
                     }, 800)
                 }
@@ -3366,15 +3417,17 @@ Page({
                             getApp().goto("/pages/team/team_success/team_success?ordersn=" + odr.order_sn);
                         } else {
+                            th.get_sto();
                             th.setData({
-                                is_normal: ind,
+                                is_normal: 0,
                                 openSpecModal_pt: 1
                             });
                         }
                     }
                     else {
+                        th.get_sto();
                         th.setData({
-                            is_normal: ind,
+                            is_normal: 0,
                             openSpecModal_pt: 1
                         });
                     }
@@ -224,7 +224,8 @@
 							<block wx:else>
 								<view class="no_store" wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(未找到门店)</view>
 								<block wx:else>
-									<view class="no_store" wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">(配送不匹配)</view>
+									<view class="no_store" wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">(该店不可售)</view>
+									<view class="no_store" wx:elif="{{def_pick_store && def_pick_store.is_no_dis_act}}">(该店不可售)</view>
 								</block>
 							</block>
@@ -670,8 +671,9 @@
 										<view class="flex xc-ash" style="flex-shrink:0;max-width: 62%;" >
 											<view class="fs30 xc-black3 address_name">{{item.pickup_name}}
 												<block wx:if="{{tool.is_no_dis(sele_g.storageId,item.keyid)}}">
-													<text class="no_store">(配送不匹配)</text>
+													<text class="no_store">(该店不可售)</text>
 												</block>
+												<text wx:elif="{{item.is_no_dis_act && !is_normal}}" class="no_store">(该店不可售)</text>
 											</view>
 										</view>
 										<view>
@@ -700,8 +702,9 @@
 										<view class="flex xc-ash">
 											<view class="fs30 xc-black3 address_name">{{item.pickup_name}}
                                                 <block wx:if="{{tool.is_no_dis(sele_g.storageId,item.keyid)}}">
-													<text class="no_store">(配送不匹配)</text>
+													<text class="no_store">(该店不可售)</text>
 												</block>
+												<text wx:elif="{{item.is_no_dis_act && !is_normal}}" class="no_store">(该店不可售)</text>
 											</view>
 										</view>
 										<view>
@@ -732,8 +735,9 @@
 									<view class="flex xc-ash">
 										<view class="fs28 xc-black3 address_name">{{item.pickup_name}}
 											<block wx:if="{{tool.is_no_dis(sele_g.storageId,item.keyid)}}">
-												<text class="no_store">(配送不匹配)</text>
+												<text class="no_store">(该店不可售)</text>
 											</block>
+											<text wx:elif="{{item.is_no_dis_act && !is_normal}}" class="no_store">(该店不可售)</text>
 										</view>
 									</view>
 									<view>
@@ -2525,6 +2525,7 @@ margin-left: 17rpx;
  }
  .address_name{
    margin-right: 10rpx;
+   max-width: 370rpx;
  }
  .address-val{
@@ -73,6 +73,7 @@
               <block wx:else>
                   <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>
                   <view class="no_store" wx:elif="{{def_pick_store.is_no_dis_nor && is_normal}}">(该店不可售)</view>
+                  <view class="no_store" wx:elif="{{def_pick_store.is_no_dis_act && !is_normal}}">(该店不可售)</view>
                   <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && !filters.is_virtual_gd(sele_g.is_virtual) && sales_rules>=2 && is_normal}}">(库存不足)</view>
               </block>
           </block>
@@ -220,7 +221,10 @@
 		  <!-- 根本就找不到门店 -->
 		  <block wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">
 		  	  <view class="spec-cart-btn spec-buy w100"  style="background-color: #dcdcdc;color: #999;">配送不匹配</view>		   
-		  </block>		 
+		  </block>
+          <block wx:elif="{{def_pick_store && def_pick_store.is_no_dis_act}}">
+              <view class="spec-cart-btn spec-buy w100" data-action="add" style="background-color: #dcdcdc;color: #999;">该店不可售</view>
+          </block>
 		  <block wx:else>
 		      <view bindtap="addCart_pt" class="spec-cart-btn spec-buy w100" data-action="buy">确定</view>
 		  </block> 
@@ -2598,9 +2598,7 @@ Page({
                 sele_g: this.data.data,
                 gid: this.data.data.goods_id
               })
-
-              this.sele_spec_chech_activity();
-
+              this.sele_spec_chech_activity(1);
             }
             this.setData({
@@ -3517,6 +3515,16 @@ Page({
                       prom_id: prom.id
                     })
+                    var pro_null=null;
+                    if(goodsinfo.prom_type==1){
+                      var rs=   await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/1/" + prom.id, {});
+                      if(rs && rs.data.code == 0 && rs.data.data <= 0 ){
+                        pro_null=1;
+                      }
+                    }
+                    th.setData({pro_null});
+
+
                     //却换图片
                     th.init(goodsinfo.goods_id);
                     var newTime = ut.gettimestamp();
@@ -3635,9 +3643,11 @@ Page({
                       if(!is_normal && th.data.prom_type>0){
                         pickup_ids=null;
                       }
-                      
+
+
+
                       //指定门店判断， 不是普通购买的时候，秒杀的时候，秒杀有指定门店
-                      if(!is_normal && th.data.prom_type==1 && th.data.prom_act.pick_up_lists){
+                      if(!is_normal && (th.data.prom_type==1 || th.data.prom_type==6) && th.data.prom_act.pick_up_lists){
                         pickup_ids=th.data.prom_act.pick_up_lists
                       }
@@ -3658,7 +3668,6 @@ Page({
                         //判断会员的默认的门店是不是匹配指定的门店
                         if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}'){
-
                             //-- 查找一下门店有没有在 --
                             var idx1=pickup_ids.findIndex(function (e){
                               return e.pickup_id==th.data.def_pick_store.pickup_id;
@@ -3666,12 +3675,11 @@ Page({
                             if(idx1<0){
                               //如果是秒杀的指定门店，就要设置秒杀的
-                              if(!is_normal && th.data.prom_type==1){
+                              if(!is_normal && (th.data.prom_type==1 || th.data.prom_type==6)  ){
                                 th.data.def_pick_store.is_no_dis_act=1;
                               }else{
                                 th.data.def_pick_store.is_no_dis_nor=1;
                               }
-
                             }else{
                               th.data.def_pick_store.is_no_dis_nor=0;
                               th.data.def_pick_store.is_no_dis_act=0;
@@ -3682,19 +3690,18 @@ Page({
                             })
                         }
-
-
                         e.data.data.pageData=ok_arr;     //数组重新赋值
                         e.data.data.total=ok_arr.length; //数组的长度
                       }
                       else{
                         //-- 多规格指定门店优化 --
                         if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}'){
-                          th.data.def_pick_store.is_no_dis_nor=0;
-                          th.data.def_pick_store.is_no_dis_act=0;
-                          that.setData({
-                            def_pick_store: th.data.def_pick_store
-                          })
+
+                            th.data.def_pick_store.is_no_dis_nor=0;
+                            th.data.def_pick_store.is_no_dis_act=0;
+                            that.setData({
+                              def_pick_store: th.data.def_pick_store
+                            })
                         }
                       }
@@ -4535,7 +4542,7 @@ Page({
                         if (em.data.code == 0) {
                           if (em.data.data <= 0) ee.setData({
-                            prom_r_null: 1
+                            prom_r_null: 1,pro_null:1
                           });
                           //拿取价格并且判断时间--
                           getApp().request.get("/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + prom_id, {
@@ -4643,6 +4650,7 @@ Page({
                                     ee.setData({
                                       sku_g: list,
+                                      is_more_flash:1
                                     });
                                   }
@@ -8574,11 +8582,19 @@ Page({
                                         if (arr.length == 1) {
                                           th.data.prom_type = arr[0].prom_type;
                                           th.data.prom_id = arr[0].act_id;
+                                          //-- 基础的活动类型 --
+                                          th.data.base_nor_prom_type = arr[0].prom_type;
+                                          th.data.base_nor_prom_id = arr[0].act_id;
+
                                         }
                                         //-- 如果只有一个进行中的活动的话 --
                                         else if (arr2.length == 1) {
                                           th.data.prom_type = arr2[0].prom_type;
                                           th.data.prom_id = arr2[0].act_id;
+
+                                          //-- 基础的活动类型 --
+                                          th.data.base_nor_prom_type = arr[0].prom_type;
+                                          th.data.base_nor_prom_id = arr[0].act_id;
                                         }
                                         if (arr4.length > 0) {
@@ -1115,19 +1115,40 @@
       <block wx:if="{{prom_r_null}}">
+        <block wx:if="{{prom_type==1}}">
+
+          <!-- 多个秒杀的时候 -->
+          <block wx:if="{{is_more_flash}}">
+              <block wx:if="{{prom_act.is_shop_buy}}">
+                <view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn">单独购买</view>
+                <view bindtap="openSpecModel" data-ind="2"  class="buy-btn cart-btn">立即抢购</view>
+              </block>
+              <block wx:else>
+                <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn">加入购物车</view>
+                <view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn">立即抢购</view>
+              </block>
+          </block>
+          <block wx:else>
+              <block wx:if="{{prom_act.is_shop_buy}}">
+                <view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn">单独购买</view>
+                <view  class="buy-btn cart-btn huise">已抢光</view>
+              </block>
+              <block wx:else>
+                <view  class="buy-btn cart-btn huise">已抢光</view>
+              </block>
+          </block>
+
-        <block wx:if="{{prom_type==1 && prom_act.is_shop_buy}}">
-          <view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn">单独购买</view>
-          <view class="buy-btn cart-btn huise">已抢光</view>
         </block>
+
         <view wx:else class="buy-btn cart-btn cart-btn-lg huise set_width">已抢光</view>
+
       </block>
       <block wx:if="{{prom_st==3 && !prom_r_null}}">
         <block wx:if="{{prom_type==1 && prom_act.is_shop_buy}}">
           <view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn">单独购买</view>
           <view class="buy-btn cart-btn huise">活动已经结束</view>
         </block>
-
         <view wx:else class="buy-btn cart-btn cart-btn-lg lanse set_width">活动已经结束</view>
       </block>
     </block>
@@ -1266,8 +1287,8 @@
               券后￥
               <text class="fs32">{{sele_g.offline_price}}</text>
             </view>
-
           </view>
+
           <block wx:if="{{prom_type==0}}">
             <view class="flex">
               <view class="spec-goods-stock">已售：{{sele_g.sales_sum}}</view>
@@ -1424,8 +1445,6 @@
               </block>
               <block wx:else>
-
-
                 <!-- 如果是线下库存购买的时候,且是普通商品购买的时候 -->
                 <block wx:if="{{sales_rules>=2 && prom_type==0 && !sele_g.whsle_id}}">
@@ -1445,7 +1464,13 @@
                 </block>
                 <!-- 线上销售 -->
                 <block wx:else>
-                  <block wx:if="{{ sele_g.store_count<1  && is_no_new}}">
+
+                  <block wx:if="{{prom_type==1  && !is_normal && pro_null}}">
+                    <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">
+                      已抢光
+                    </view>
+                  </block>
+                  <block wx:elif="{{ sele_g.store_count<1  && is_no_new}}">
                     <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">
                       库存不足
                     </view>
@@ -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;
                     }
@@ -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;
+              }
+            }
+
+
           }
         });