合并解决冲突

WXD-SEASON\season
2 parents aba52904 c1146c44
Showing 14 changed files with 428 additions and 136 deletions
app.js
packageA/pages/details_serviceCard/details_serviceCard.js
packageA/pages/goodsInfo/goodsInfo.js
packageA/pages/goodsInfo/goodsInfo.wxml
packageA/pages/profile/profile.js
packageA/pages/quan_pro/quan_pro.js
packageA/pages/quan_pro/quan_pro.wxml
packageE/pages/togoin/togoin.js
packageE/pages/user/labels/labels.js
pages/cart/cart/cart.js
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.wxml
pages/user/order_detail/order_detail.js
pages/user/order_list/order_list.js
@@ -1455,10 +1455,78 @@ App({
             })
         }
         return  cx_arr;
-     },
+    },
+
+   //-- 获取判断注册成功后，是跳转等级卡，还是新人有礼 --
+   async go_to_page(func){
+
+       //新判断新人有礼
+       var res= await getApp().request.promiseGet("/api/weshop/marketing/newpeople/act/judge", {
+           data: {
+               storeId: os.stoid,
+               userId: this.globalData.user_id
+           }
+       });
+
+       if (res.data.code == 0) {
+           var actid = res.data.data.id; //活动id
+           var giftBagId = res.data.data.giftBagId; //礼包id
+           var new_nav = "/pages/giftpack/newvipgift/newvipgift?actId=" + actid + '&' + 'actType=' + 1 + '&' + 'giftBagId=' + giftBagId;
+           this.goto(new_nav);
+           return false;
+       }
+       //如果已经是等级卡了就跳过
+       if(this.globalData.userInfo.card_field){
+           //没有等级卡和新人有礼的时候
+           if(func)  func();
+           return  false;
+       }
+       var dj_buy=await getApp().promiseGet("/store/storemoduleendtime/page?store_id=" + this.globalData.setting.stoid+ "&type=3", {});
+       var ob = { isout: 0, isbuy: 0 };
+       if (dj_buy.data.code == 0) {
+           var arr = dj_buy.data.data.pageData;
+           //----如果数组不为空----
+           if (arr.length > 0) {
+               arr.forEach(function (val, ind) {
+                   if (val.is_sy == 0 || val.is_sy == 1) {
+                       ob.isbuy = 1;
+                       var now = ut.gettimestamp();
+                       if (now > val.end_time) ob.isout = 1;
+                       return false;
+                   }
+               })
+           }
+       }
+
+       //-- 获取等级卡,直接去买等级卡 --
+       if(ob.isbuy && !ob.isout){
+           //-- 获取等级卡购买的数量 --
+           var conf=await getApp().promiseGet("/api/weshop/storeconfig/get/" + this.globalData.setting.stoid, {});
+           //-- 获取等级卡的会员已经购买的数量 ---
+           var dj=await getApp().promiseGet("/api/weshop/users/getUserCard/" + this.globalData.setting.stoid, {});
+           var dj_num=0;
+           if(dj.data.code==0){
+               dj_num=dj.data.data?dj.data.data:0;
+           }
+
+           var sw_list= conf.data.data.switch_list;
+           if(sw_list){
+               sw_list=JSON.parse(sw_list);
+           }
+
+
+           if (sw_list && sw_list.rank_switch==2 && conf.data.code == 0 && conf.data.data.dj_num>0 && conf.data.data.dj_num>dj_num) {
+               var nav = "/pages/user/plus/plus";
+               this.goto(nav);
+               return false;
+           }
+       }
+       //没有等级卡和新人有礼的时候
+       if(func)  func();
+   }
-    });
+});
@@ -605,7 +605,7 @@ Page({
 		let order_sn = this.data.details.order_sn;
 		let order_id = this.data.details.order_id;
 		let store_id = app.globalData.setting.stoid;
-		let user_id = os.user_id;
+		let user_id = getApp().globalData.user_id;
 		let flag = true;
 		// 如果是普通购买或单独购买，不用判断
@@ -648,7 +648,7 @@ Page({
 						var t_now = ut.gettimestamp();
-						if (act_details.is_end == 0 && act_details.start_time < t_now && act_details.end_time > t_now) {
+						if (act_details.is_end == 1 || act_details.start_time > t_now || act_details.end_time < t_now) {
 							wx.showModal({
 								title: '提示',
 								content: '活动发生了变化,无法支付,请取消订单,重新购买！',
@@ -658,10 +658,23 @@ 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 && flag){
+				if(act_details && act_details.buy_limit>0 && flag){
 					await getApp().request.promiseGet("/api/weshop/rechargeServicelist/getUserBuyGoodsNum", {
 						data: {
 							store_id: store_id,
@@ -625,26 +625,20 @@ Page({
         //获取用户的默认门店
         th.check_guide(()=>{
             getApp().get_user_store(function(e) {
-                console.log('get_user_store');
-                console.log("999999999");
-
-
                 if(!e) {
                     th.data.fir_def_store={}; //赋值空对象
                     return false;
                 }
-                console.log("000000");
-
                 if(getApp().globalData.is_dj_pk)  th.setData({has_def:1})
                 var ee=JSON.parse(JSON.stringify(e));
-
-
                 console.log(e);
                 //--定时器推迟一下--
-                setTimeout(function () {
+                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;
                     }
@@ -654,77 +648,74 @@ Page({
                         ee.is_no_dis=1;
                     }
-                    var appd=getApp().globalData;
-                    var w_time = setInterval(function() {
-                        if (that.data.is_get_local_ok == 0) return false;
-                        clearInterval(w_time);
-                        var distance = null;
-                        var e=JSON.parse(JSON.stringify(ee));
-
-                        //如果有开启近距离的话,同时距离优不一样了
-                        if (that.data.lat != null) {
-                            //如果经纬度有变化的话
-                            if(e && appd.lat==that.data.lat && appd.lon==that.data.lon  && e.distance>0 ){
-                                that.data.fir_def_store=e;
-                                that.setData({
-                                    def_pick_store: e,
-                                    sto_sele_name: e.pickup_name,
-                                    sto_sele_id: e.pickup_id,
-                                    sto_sele_distr: e.distr_type,
-                                    sto_sele_keyid:e.keyid,
-                                })
-                            }else{
-                                //要用接口是获取距离，js的计算不准
-                                getApp().request.promiseGet("/api/weshop/pickup/list",{
-                                    data:{store_id:os.stoid,pickup_id:e.pickup_id,lat:th.data.lat,lon: th.data.lon, is_pos: 1},
-                                }).then(res=>{
-                                    if(ut.ajax_ok(res)){
-                                        e=res.data.data.pageData[0];
-                                        if (e){
-                                            e.is_no_dis=ee.is_no_dis;
-                                            appd.pk_store=e;
-                                            that.data.fir_def_store=e;
-
-                                            console.log('get_user_store--2');
-                                            console.log(e);
-
-                                            that.setData({
-                                                def_pick_store: e,
-                                                sto_sele_name: e.pickup_name,
-                                                sto_sele_id: e.pickup_id,
-                                                sto_sele_distr: e.distr_type,
-                                                sto_sele_keyid:e.keyid,
-                                            })
-                                        }
+                    clearInterval(w_time);
+                    var distance = null;
+                    var e=JSON.parse(JSON.stringify(ee));
+
+                    //如果有开启近距离的话,同时距离优不一样了
+                    if (that.data.lat != null) {
+                        //如果经纬度有变化的话
+                        if(e && appd.lat==that.data.lat && appd.lon==that.data.lon  && e.distance>0 ){
+                            that.data.fir_def_store=e;
+                            that.setData({
+                                def_pick_store: e,
+                                sto_sele_name: e.pickup_name,
+                                sto_sele_id: e.pickup_id,
+                                sto_sele_distr: e.distr_type,
+                                sto_sele_keyid:e.keyid,
+                            })
+                        }else{
+                            //要用接口是获取距离，js的计算不准
+                            getApp().request.promiseGet("/api/weshop/pickup/list",{
+                                data:{store_id:os.stoid,pickup_id:e.pickup_id,lat:th.data.lat,lon: th.data.lon, is_pos: 1},
+                            }).then(res=>{
+                                if(ut.ajax_ok(res)){
+                                    e=res.data.data.pageData[0];
+                                    if (e){
+                                        e.is_no_dis=ee.is_no_dis;
+                                        appd.pk_store=e;
+                                        that.data.fir_def_store=e;
+
+                                        console.log('get_user_store--2');
+                                        console.log(e);
+
+                                        that.setData({
+                                            def_pick_store: e,
+                                            sto_sele_name: e.pickup_name,
+                                            sto_sele_id: e.pickup_id,
+                                            sto_sele_distr: e.distr_type,
+                                            sto_sele_keyid:e.keyid,
+                                        })
                                     }
-                                })
-                            }
-                            //e.distance = distance;
-                            appd.lat=that.data.lat;
-                            appd.lon=that.data.lon;
+                                }
+                            })
+                        }
-                        } else {
-                            if (e) {
-
-
-                                console.log('get_user_store3---');
-                                console.log(e);
-
-                                e.distance = null;
-                                that.data.fir_def_store=e;
-                                that.setData({
-                                    def_pick_store: e,
-                                    sto_sele_name: e.pickup_name,
-                                    sto_sele_id: e.pickup_id,
-                                    sto_sele_distr: e.distr_type,
-                                    sto_sele_keyid:e.keyid,
-                                })
-                            }
+                        //e.distance = distance;
+                        appd.lat=that.data.lat;
+                        appd.lon=that.data.lon;
+
+                    } else {
+                        if (e) {
+
+                            console.log('get_user_store3---');
+                            console.log(e);
+
+                            e.distance = null;
+                            that.data.fir_def_store=e;
+                            that.setData({
+                                def_pick_store: e,
+                                sto_sele_name: e.pickup_name,
+                                sto_sele_id: e.pickup_id,
+                                sto_sele_distr: e.distr_type,
+                                sto_sele_keyid:e.keyid,
+                            })
                         }
-                    }, 500)
-                },1500)
+                    }
+                }, 200)
+
             });
         })
@@ -808,7 +799,8 @@ Page({
         });
         th.data.enterAddressPage && (this.data.enterAddressPage = !1);
-        th.get_sto();
+        //没有互动，就调用默认的门店
+        if(!th.data.prom_type) th.get_sto();
     })
@@ -1642,6 +1634,7 @@ Page({
     var th = this,that=this;
     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= {
@@ -1694,31 +1687,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==1 && th.data.prom_act && th.data.prom_act.pick_up_lists && e.data.data.pageData.length){
+                  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)!='{}'){
+                      //-- 查找一下门店有没有在 --
+                      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
+                          })
+                      }
+                  }
+
+              }
+
+              //-- 如果门店过滤后，还会是数量 --
+              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{
+                  wx.hideLoading();
+              }
+
-			  //-- 如果有默认选择门店的时候，要把默认门店放在第一位，修改不要配送方式的判断 --
-			  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);  
 		    },800)
         }
@@ -172,6 +172,7 @@
 							<view class="no_store" wx:if="{{only_pk && !only_pk.length}}">(未找到门店)</view>
 							<block wx:else>
 								<view class="no_store" wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(未找到门店)</view>
+								<text wx:elif="{{def_pick_store.is_no_dis_act}}" class="no_store">(该店不可售)</text>
 								<block wx:else>
 									<view class="no_store" wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">(配送不匹配)</view>
 								</block>
@@ -686,6 +687,7 @@
 				<view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
 				<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_act}}">(该店不可售)</view>
 					<view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && !filters.is_virtual_gd(sele_g.is_virtual) && sales_rules==2 && prom_type==0}}">(库存不足)</view>
 				</block>
 			</block>
@@ -709,6 +711,7 @@
 		<view class="spec-cart-btns">
 			<view wx:if="{{def_pick_store && def_pick_store.is_no_dis}}" class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">配送不匹配</view>
+			<view wx:elif="{{def_pick_store && def_pick_store.is_no_dis_act}}" class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">该店不可售</view>
 			<block wx:else>
 				<!-- 根本就找不到门店 -->
@@ -831,9 +834,10 @@
 									<view class="flex-vertical-between butttem5">
 										<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)}}">
+												<block wx:if="{{tool.is_no_dis(data.storageId,item.keyid)}}">
 													<text class="no_store">(配送不匹配)</text>
 												</block>
+												<text wx:elif="{{item.is_no_dis_act}}" class="no_store">(该店不可售)</text>
 											</view>
 										</view>
@@ -862,9 +866,10 @@
 									<view class="flex-vertical-between ">
 										<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)}}">
+												<block wx:if="{{tool.is_no_dis(data.storageId,item.keyid)}}">
 													<text class="no_store">(配送不匹配)</text>
 												</block>
+												<text wx:elif="{{item.is_no_dis_act}}" class="no_store">(该店不可售)</text>
 											</view>
 										</view>
 										<view>
@@ -894,9 +899,10 @@
 								<view class="flex-vertical-between ">
 									<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)}}">
+											<block wx:if="{{tool.is_no_dis(data.storageId,item.keyid)}}">
 												<text class="no_store">(配送不匹配)</text>
 											</block>
+											<text wx:elif="{{item.is_no_dis_act}}" class="no_store">(该店不可售)</text>
 										</view>
 									</view>
 									<view>
@@ -1040,7 +1040,11 @@ Page({
                 getApp().globalData.login_back = 1;
                 wx.setStorageSync("userinfo", e.data.data);
                 wx.setStorageSync("isAuth", !0), app.globalData.userInfo = e.data.data, app.globalData.userInfo.head_pic = s.getFullUrl(a.globalData.userInfo.head_pic);
-                wx.navigateBack({delta: 1})
+                //wx.navigateBack({delta: 1})
+                //-- 看情况,是跳转等级卡，还是跳转到新人有礼 --
+                getApp().go_to_page(function (){
+                    wx.navigateBack({ delta: 1 })
+                })
             },
             failStatus: function (t) {
@@ -2,7 +2,7 @@ var t = require(&quot;../../../utils/util.js&quot;), ut = t,
   e = require("../../../utils/common.js"),
   oo = getApp().globalData,
   os = getApp().globalData.setting;
-  var utils = require('../../../utils/util.js'),ut=utils;
+
 Page({
   data: {
@@ -44,23 +44,64 @@ Page({
   },
   //---展示,显示券的信息---
-  onShow: function() {
+  onShow:async function() {
     //检查能不能分享
     getApp().check_can_share();
-
     var th=this;
-    var user_id=getApp().globalData.user_id;
-    getApp().request.promiseGet("/api/weshop/prom/coupon/pageCouponList", {
-      data:{store_id:os.stoid,type:1,id:th.data.id,user_id:user_id}
-    }).then(res => {
-         th.setData({is_get:1});
-         if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){
-            th.setData({q_data:res.data.data.pageData[0]});
-         }
-    });
-
     th.setData({getcurday:ut.gettimestamp()});
+
+    var rs=await getApp().request.promiseGet("/api/weshop/prom/coupon/get/"+th.data.id, {})
+    if(!rs){
+        th.setData({is_get:1});
+        return false;
+    }
+    if(rs.data.code!=0){
+        th.setData({is_get:1});
+        return false;
+    }
+    var r_data=rs.data.data;
+    if(r_data.store_id!=os.stoid){
+        th.setData({is_get:1});
+        return false;
+    }
+    if(r_data.type!=1){
+        th.setData({is_get:2});
+        return false;
+    }
+
+    var now=ut.gettimestamp();
+
+    if(r_data.send_start_time>now){
+       th.setData({is_get:3});
+       return false;
+    }
+
+    if(r_data.send_end_time<now){
+       th.setData({is_get:4});
+       return false;
+    }
+
+    th.setData({is_get:1});
+    th.setData({ q_data:r_data });
+
+    //如果只限定链接的时候，要取消分享按钮
+    if(r_data.is_share){
+        wx.hideShareMenu();
+    }
+
+
+    // var user_id=getApp().globalData.user_id;
+    // await getApp().request.promiseGet("/api/weshop/prom/coupon/pageCouponList", {
+    //   data:{store_id:os.stoid,type:1,id:th.data.id,user_id:user_id}
+    // }).then(res => {
+    //      th.setData({is_get:1});
+    //      if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){
+    //         th.setData({q_data:res.data.data.pageData[0]});
+    //      }
+    // });
+
+
   },
   onHide: function() {
@@ -11,7 +11,10 @@
                 <view>
                     <image style="width: 70rpx; height: 70rpx; vertical-align: middle; margin-right: 20rpx" src="{{iurl}}/miniapp/images/coupon_img/coupon_logo.png"></image>
                     <text wx:if="{{q_data}}">{{q_data.name}}</text>
-                    <text wx:elif="{{is_get}}" class="fs28">不存在此微券或数量已领取完</text>
+                    <text wx:elif="{{is_get==1}}" class="fs28">不存在此微券或数量已领取完</text>
+                    <text wx:elif="{{is_get==2}}" class="fs28">该优惠券不是免费发放类型</text>
+                    <text wx:elif="{{is_get==3}}" class="fs28">活动未开始暂时无法发放优惠券</text>
+                    <text wx:elif="{{is_get==4}}" class="fs28">优惠券已过期</text>
                 </view>
                 <view class="fs30 flex" wx:if="{{q_data}}" style="height: 100rpx;justify-content: space-between;">
                     <view class="flex ai-center">
@@ -45,7 +48,10 @@
             </block>
             <view wx:elif="{{is_get}}" class="fs28" style="text-align: center;color: #999;position: absolute;bottom: 20rpx;">
-                不存在此微券或数量已领取完
+                <text wx:if="{{is_get==1}}">不存在此微券或数量已领取完</text>
+                <text wx:if="{{is_get==2}}">该优惠券不是免费发放类型</text>
+                <text wx:if="{{is_get==3}}">活动未开始暂时无法发放优惠券</text>
+                <text wx:if="{{is_get==4}}">优惠券已过期</text>
             </view>
         </view>
@@ -357,7 +357,12 @@ Page({
           }
         })
-        wx.navigateBack({ delta: 1 })
+        //-- 看情况,是跳转等级卡，还是跳转到新人有礼 --
+        getApp().go_to_page(function (){
+          wx.navigateBack({ delta: 1 })
+        })
+
+
       },
       failStatus: function (t) {
@@ -273,9 +273,14 @@ Page({
                           //   check_label: arr
                           // })
                           // th.goto();
-                          wx.reLaunch({
-                            url: '/pages/user/index/index',
+                          // wx.reLaunch({
+                          //   url: '/pages/user/index/index',
+                          // })
+                          //-- 看情况,是跳转等级卡，还是跳转到新人有礼 --
+                          getApp().go_to_page(function (){
+                            wx.navigateBack({ delta: 1 })
                           })
+
                         }, 2000);
                       } else {
                         getApp().my_warnning("系统繁忙,请稍后再试", 0, th);
@@ -672,14 +672,25 @@ Page({
               })
               //只有一种活动，但是又是秒杀之类是互动，就要失效。不能是普通购买
-              if (prom && prom.length == 1 && [1, 2, 4, 6, 8, 9].indexOf(prom.prom_type) > -1 && !prom.is_integral_normal && !prom.is_pd_normal) {
+              if (prom && prom.length == 1 && [1, 2, 4, 6, 8, 9].indexOf(prom[0].prom_type) > -1 && !item.is_integral_normal && !item.is_pd_normal) {
                 th.disInvalid(item);
                 continue;
               }
+
               //只有秒杀和积分购的时候，不能是普通购买
-              if (prom && prom.length == 2 && [1, 4].indexOf(prom.prom_type) > -1 && [1, 4].indexOf(prom.prom_type) > -1 && !prom.is_integral_normal && !prom.is_pd_normal) {
-                th.disInvalid(item);
-                continue;
+              if (prom && prom.length == 2 && !item.is_integral_normal && !item.is_pd_normal) {
+                var idx=prom.findIndex(function (e){
+                  return e.prom_type==1;
+                })
+                var idx2=prom.findIndex(function (e){
+                  return e.prom_type==4;
+                })
+                //--如果是有秒杀和积分的时候--
+                if(idx>-1 && idx2>-1){
+                  th.disInvalid(item);
+                  continue;
+                }
+
               }
             }
@@ -724,6 +735,8 @@ Page({
                 //商品已经下架
                 continue;
               }
+              //把活动写入
+              item.prom=prom;
               //判断秒杀的限购
               if (item.goods_num + promgoodsbuynum > prom.buy_limit && prom.buy_limit > 0) {
@@ -984,6 +997,8 @@ Page({
                 }, 0, 1);
                 continue;
               }
+
+              item.prom=prom;
               //判断秒杀的限购
               var msNum = 0
               await getApp().request.promiseGet("/api/weshop/rechargeServicelist/getUserBuyGoodsNum", {
@@ -3327,6 +3342,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){
+              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 + "秒杀活动的门店不可售");
+                wx.hideLoading();
+                return false;
+              }
+            }
+
             if ([0, 3, 5, 7, 10].indexOf(py_type) > -1) {
               //如果是指定门店，就要判断
               if(gd.pick_group_ids){
@@ -3582,8 +3609,22 @@ Page({
               store_id: oo.stoid
             }
           });
+
+
+          //判断秒杀的指定门店
+          if(i_arr[j].prom_type==1 && i_arr[j].prom && i_arr[j].prom.pick_up_lists && i_arr[j].selected){
+            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].service_name + "秒杀活动的门店不可售");
+              wx.hideLoading();
+              return false;
+            }
+          }
         }
       }
+
       //排除失效服务结算
       this.data.invalidList.map(item => {
         if (item.selected && item.classType == 1) {
@@ -3596,6 +3637,8 @@ Page({
           });
         }
       })
+
+
       wx.hideLoading();
       getApp().goto("/packageA/pages/cart2_ser/cart2_ser?is_cart=1");
     }
@@ -3569,14 +3569,21 @@ Page({
                     if (e.data.code == 0 && e.data.data && e.data.data.pageData && e.data.data.pageData.length > 0) {
+                      var pickup_ids=th.data.sele_g.pickup_ids;
+
+                      //指定门店判断， 不是普通购买的时候，秒杀的时候，秒杀有指定门店
+                      if(!is_normal && th.data.prom_type==1 && th.data.prom_act.pick_up_lists){
+                        pickup_ids=th.data.prom_act.pick_up_lists
+                      }
+
                       //-- 如果有指定门店的时候 --
-                      if(th.data.sele_g.pickup_ids){
+                      if(pickup_ids){
                         var ok_arr=[];
                         for (let i in e.data.data.pageData) {
                             let ite = e.data.data.pageData[i];
                             //-- 查找一下门店有没有在 --
-                            var idx=th.data.sele_g.pickup_ids.findIndex(function (e){
+                            var idx=pickup_ids.findIndex(function (e){
                                 return e.pickup_id==ite.pickup_id;
                             })
                             if(idx>-1){
@@ -3588,12 +3595,18 @@ Page({
                         if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}'){
                             //-- 查找一下门店有没有在 --
-                            var idx1=th.data.sele_g.pickup_ids.findIndex(function (e){
+                            var idx1=pickup_ids.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_nor=1;
+                              //如果是秒杀的指定门店，就要设置秒杀的
+                              if(!is_normal && th.data.prom_type==1){
+                                th.data.def_pick_store.is_no_dis_act=1;
+                              }else{
+                                th.data.def_pick_store.is_no_dis_nor=1;
+                              }
                               that.setData({
                                  def_pick_store: th.data.def_pick_store
                                })
@@ -3601,7 +3614,7 @@ Page({
                         }
-                          e.data.data.pageData=ok_arr;     //数组重新赋值
+                        e.data.data.pageData=ok_arr;     //数组重新赋值
                         e.data.data.total=ok_arr.length; //数组的长度
                       }
@@ -712,6 +712,9 @@
                   <view class="no_store" wx:elif="{{def_pick_store && def_pick_store.is_no_dis_nor && prom_type==0}}">
                     (该店不可售)
                   </view>
+                  <view class="no_store" wx:elif="{{def_pick_store && def_pick_store.is_no_dis_act}}">
+                    (该店不可售)
+                  </view>
                   <view class="no_store" wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules>=2 && prom_type==0 && !sele_g.whsle_id}}">
                     (库存不足)
                   </view>
@@ -1325,7 +1328,10 @@
           <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
           <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}}">(该店不可售)</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 && prom_type==0 &&!sele_g.whsle_id }}">
               (库存不足)
             </view>
@@ -1385,6 +1391,12 @@
       <view wx:elif="{{def_pick_store && def_pick_store.is_no_dis_nor}}" class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">
         该店不可售
       </view>
+      <view wx:elif="{{def_pick_store && def_pick_store.is_no_dis_nor && is_normal}}" class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">
+        该店不可售
+      </view>
+      <view wx:elif="{{def_pick_store && def_pick_store.is_no_dis_act && !is_normal}}" class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">
+        该店不可售
+      </view>
       <block wx:else>
         <!-- 根本就找不到门店 -->
         <block wx:if="{{!only_pk && !def_pickpu_list}}">
@@ -1641,6 +1653,8 @@
                         <text class="c-red22" wx:if="{{item.is_no_qyt}}">(库存不足)</text>
                         <text class="c-red22" wx:elif="{{item.is_no_dis}}">(配送不匹配)</text>
                         <text class="c-red22" wx:elif="{{item.is_no_dis_nor}}">(该店不可售)</text>
+                        <text class="c-red22" wx:elif="{{item.is_no_dis_nor && is_normal}}">(该店不可售)</text>
+                        <text class="c-red22" wx:elif="{{item.is_no_dis_act && !is_normal}}">(该店不可售)</text>
                       </view>
                     </view>
                     <view>
@@ -1670,6 +1684,8 @@
                       <view class="fs30 xc-black3 address_name">{{item.pickup_name}}
                         <text class="c-red22" wx:if="{{item.is_no_dis}}">(配送不匹配)</text>
                         <text class="c-red22" wx:elif="{{item.is_no_dis_nor}}">(该店不可售)</text>
+                        <text class="c-red22" wx:elif="{{item.is_no_dis_nor && is_normal}}">(该店不可售)</text>
+                        <text class="c-red22" wx:elif="{{item.is_no_dis_act && !is_normal}}">(该店不可售)</text>
                         <text class="c-red22" wx:elif="{{item.is_no_qyt }}">(库存不足)</text>
                       </view>
                     </view>
@@ -978,6 +978,19 @@ Page({
             }
             //----------如果有活动，并且在进行中，就不计算线下库存---------------
             if (prom) {
+
+                //指定门店的控制
+                if (goodsinfo.prom_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 + "秒杀活动的门店不可售");
+                        th.setData({ paying: 0 });
+                        return false;
+                    }
+                }
+
                 var now = ut.gettimestamp();
                 if (prom.is_end == 1 && prom.end_time < now) {
                     var content = goodsinfo.goods_name + '商品的活动已经结束,请取消订单'
@@ -1292,6 +1292,20 @@ Page({
       }
       //----------如果有活动，并且在进行中，就不计算线下库存---------------
       if (prom) {
+
+        //指定门店的控制
+        if (goodsinfo.prom_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 + "秒杀活动的门店不可售");
+            th.setData({ paying: 0 });
+            return false;
+          }
+        }
+
+
         var now = ut.gettimestamp();
         if (prom.is_end == 1 && prom.end_time < now) {
           var content = goodsinfo.goods_name + '商品的活动已经结束,请取消订单'
@@ -2849,10 +2863,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 && flag){
+        if(act_details && act_details.buy_limit>0 && flag){
             await getApp().request.promiseGet("/api/weshop/rechargeServicelist/getUserBuyGoodsNum", {
               data: {
                 store_id: store_id,