Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into test

WXD-SEASON\season
2 parents 1499ef36 cc9ae391
Showing 51 changed files with 2543 additions and 1361 deletions
app.js
app.wxss
components/diy_seckill/diy_seckill.wxml
components/promate_pop/promate_pop.js
components/promate_pop/promate_pop.wxml
components/promate_pop/promate_pop.wxss
packageA/pages/prom_list/prom_list.js
packageA/pages/serviceCard_pd/cart/cart.js
packageA/pages/serviceCard_pd/cart/cart.wxml
packageA/pages/serviceCard_pd/team_show/team_show.js
packageB/pages/zuhegou/index/index.js
packageB/pages/zuhegou/index/index.wxml
packageB/pages/zuhegou/index/index.wxss
packageB/pages/zuhegou/preindex/index.js
packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js
packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.wxml
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
packageC/pages/payForAnother/payForAnother.js
@@ -494,6 +494,17 @@ App({
             "/pages/cart/cart/cart", "/pages/user/index/index",
             "/pages/distribution/distribution"];
+        //因为地址有参数
+        for(var i in arr_tabbar){
+            var ck_url=arr_tabbar[i];
+            if (("/"+url).indexOf(ck_url) != -1) {
+                if (url.indexOf("categoryList?type=1") != -1) this.globalData.cat_type = 1;
+                if (url.indexOf("categoryList?type=2") != -1) this.globalData.cat_type = 2;
+                wx.reLaunch({ url: url, })  //跳到tabbar页
+                return;
+            }
+        }
+
         if (arr_tabbar.indexOf(url) != -1) {
             if (url.indexOf("categoryList?type=1") != -1) this.globalData.cat_type = 1;
             if (url.indexOf("categoryList?type=2") != -1) this.globalData.cat_type = 2;
@@ -1220,7 +1220,10 @@ background: #ffe3e2;
 /* 保障服务样式，多使用 */
-.bz_view {
+
+
+
+.bz_view22 {
 	/* height:100rpx; padding: 0 34rpx 0 13rpx; */
 	color: #333;
 	font-size: 28rpx;
@@ -1230,20 +1233,32 @@ background: #ffe3e2;
 	/* border-bottom: 3rpx solid #eee; */
 	/* border-top: 3rpx solid #eee; */
 }
-.bzfu_img {
+
+.bz_view22 view {
+  width: 470rpx;
+  word-break: break-all;
+	/* max-height: 70rpx; */
+	/* overflow: hidden; */
+}
+
+.bzfu_img22 {
 	width: 164rpx;
-  height: 34rpx;
-  min-width: 35%;
+	height: 34rpx;
 	/* margin-right: 18rpx; margin-left: 12rpx */
 }
-.bz-content {
-  padding: 0 0 0 20rpx;
-  text-align: right;
-  width: 100%;
-  
+
+.bz-content22 {
+	padding: 0 0 0 20rpx;
+}
+
+
+.hideArea22 {
+	position: absolute;
+	left: -1000px;
+	top: -1000px;
 }
-.bg_jj {
+.bg_jj22 {
 	width: 14rpx;
 	height: 14rpx;
 	border-top: 2rpx solid #d70026;
@@ -1252,10 +1267,15 @@ background: #ffe3e2;
 	display: inline-block;
 	margin-bottom: 3rpx;
 }
-.bg_jj.down {
+.bg_jj22.down22 {
 	transform: rotateZ(135deg);
 }
-.cx-obtain-coupon {
+.bg_jj22.up22 {
+	transform: rotateZ(-45deg);
+	margin-top: 6rpx;
+}
+
+.cx-obtain-coupon22 {
 	/* width: 65rpx;
     height: 100%;
     padding-left:15rpx; */
@@ -1265,21 +1285,21 @@ background: #ffe3e2;
 	/* position: absolute;
     right: 5rpx; */
 }
-.wsize {
+.wsize22 {
 	font-size: 32rpx
 }
-.arrow {
+.arrow22 {
 	width: auto !important;
 	position: absolute;
-	right: 0;
+	right: 10rpx;
 	top: 50%;
 	transform: translateY(-50%);
 }
-.xc-coupon-frame .rel:not(:first-child) {
+.xc-coupon-frame22 .rel22:not(:first-child) {
 	margin-top: 20rpx;
 }
-.xc-coupon-frame .coupon {
+.xc-coupon-frame22 .coupon22 {
 	width: 100%;
 	height: 168rpx;
 	border-radius: 25rpx;
@@ -1290,3 +1310,31 @@ background: #ffe3e2;
 }
+
+.up22 {
+	animation: up .7s;
+}
+
+.down22 {
+	animation: down 1s;
+}
+
+@keyframes up22 {
+	0% {
+		transform: translateY(550rpx);
+	}
+
+	100% {
+		transform: translateY(0);
+	}
+}
+
+@keyframes down22 {
+	0% {
+		transform: translateY(0);
+	}
+
+	100% {
+		transform: translateY(550rpx);
+	}
+}
 \ No newline at end of file
@@ -441,13 +441,13 @@
   </block>
   <block wx:else>
     <!--秒杀-->
-    <view class='top' bindtap="go_to_skill">
+    <view class='top' bindtap="go_to_skill" style="font-size:32rpx;">
       <view class="flex">
         <view class='t_left'></view>
         <view class='t_ms'>秒杀</view>
       </view>
-      <view class='right_k'>
-        <image src="{{imghost}}/miniapp/images/icon-arrowdown.png" lazy-load="true"></image>
+      <view  style="width: 30rpx;">
+        <image src="{{imghost}}/miniapp/images/icon-arrowdown.png" lazy-load="true" style="width: 30rpx;height: 30rpx;"></image>
       </view>
     </view>
     <!--商品展示-->
@@ -523,7 +523,7 @@
               </view>
               <view class="o1_right">
-                <view class="sp_wzi ellipsis-2">{{aitem.title}}</view>
+                <view class="sp_wzi ellipsis-2">{{aitem.goods_name}}</view>
                 <view class="o1_sj_kill">
                   <text>{{aitem.djs.day}}</text> 天
                   <text>{{aitem.djs.hou}}</text> :
+const ut = require("../../utils/util.js");
 Component({
   /*** 页面的初始数据***/
   data: {
@@ -8,7 +9,9 @@ Component({
   },
   methods: {
 	  //-- 初始化弹出框 --
-	  set_init(type,cx_prom_group,is_cart){
+	  set_init(type,cx_prom_group0,is_cart){
+
+		 var cx_prom_group=JSON.parse(JSON.stringify(cx_prom_group0));
 		 if(!type) type=0;
 		 if(!is_cart) is_cart=0;
@@ -18,6 +21,32 @@ Component({
 		 if(fd==-1){
 			 cx_prom_group[0].sele=1;
 		 }
+
+		 //-- 优惠促销要重新组装 --
+		 var yh_index=cx_prom_group.findIndex(function (p_time){
+			  return p_time.prom_type==3;
+		 })
+		 if(yh_index>-1){
+             var prom_list=cx_prom_group[yh_index].promGoodsListsDtos;
+			 //规格参数
+		 	 cx_prom_group[yh_index].more=ut.format_yh_act(prom_list[0]);
+			 cx_prom_group[yh_index].yh_index=0;  //优惠阶梯
+
+
+			 if(prom_list.length){
+				 for(var i=1;i<prom_list.length;i++){
+					 var copy_obj=JSON.parse(JSON.stringify(cx_prom_group[yh_index]));
+					 delete copy_obj.promGoodsListsDtos
+					 copy_obj.more=ut.format_yh_act(prom_list[i]);
+					 copy_obj.is_no_sele=1;
+					 copy_obj.condition=prom_list[i].condition + (prom_list[i].prom_type == 1 ? '件' : '元'),
+					 copy_obj.yh_index=i;  //优惠阶梯
+					 cx_prom_group.splice(yh_index+i,0,copy_obj);
+				 }
+			 }
+
+		 }
+
          this.setData({
 			 type:type,pro_pop:1,cx_prom_group,is_cart:is_cart
 		 })
@@ -27,10 +56,10 @@ Component({
 	  close_pro_pop: async function (e) {
 		  this.setData({pro_pop: 0});
 		  if(!this.data.type) return false;
-		  var idx=this.data.cx_prom_group.findIndex(function (e){
+		  var obj=this.data.cx_prom_group.find(function (e){
 			  return e.sele==1;
 		  })
-		  this.triggerEvent('sure_cx_group',{sele_idx:idx},{bubbles: true});
+		  this.triggerEvent('sure_cx_group',{sele_prom_type:obj.prom_type},{bubbles: true});
 	  },
 	  go_the_url:function (e){
@@ -38,6 +67,9 @@ Component({
 		  var item=this.data.cx_prom_group[index];
 		  var prom_id = item.prom_id;
+		  if(!prom_id) prom_id=item.id;
+
+
 		  var prom_type = item.prom_type;
 		  var url='';
 		  switch (parseInt(prom_type)){
@@ -70,7 +102,32 @@ Component({
 			  else cx_prom_group[idx].sele=1;
 		  }
 		  this.setData({cx_prom_group})
-	  }
+	  },
+
+	  // 促销 -> 送礼包 -> 查看详情
+	  viewLbDetails(e) {
+		  let id = e.currentTarget.dataset.id; // 获取礼包id
+		  let flag = e.currentTarget.dataset.flag;
+		  let url = '';
+		  if (flag == 2) { // flag =1 控制跳转到专享礼包
+			  url = `/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo?isBuy=1&id=${id}&is_act=1`;
+			  // url = `/pages/giftpack/giftpacklist/giftpacklist?lbId=${id}&flag=1`;
+		  } else if (flag == 1) { // flag =1 控制跳转到专享礼包
+			  url = `/pages/giftpack/giftpacklist/giftpacklist?lbId=${id}&flag=1`;
+		  } else {
+			  url = `/packageA/pages/myGiftDetails/myGiftDetails?btn=0&index=0&id=${id}`; // btn=0 控制跳转到的页面不显示按钮
+		  };
+		  // console.log('myurl', url);
+		  getApp().goto(url);
+	  },
+
+	  //显示多赠品
+	  show_zp: function (e) {
+		  var prom_id = e.currentTarget.dataset.prom;
+		  var index = e.currentTarget.dataset.index;
+		  getApp().goto("/packageD/pages/gift/gift?prom_id=" + prom_id + "&index=" + index);
+	  },
+
   }
 })
 \ No newline at end of file
@@ -29,7 +29,28 @@
                                {{item.show_time}}
                             </view>
                             <view wx:else class="fs22" style="max-width: 430rpx; color: #b9b6b6">
-                                <text wx:for="{{item.more}}" wx:for-item="bm" class="tick pdr20" >{{bm}}</text>
+                                <block  wx:for="{{item.more}}" wx:for-item="bm">
+                                    <text wx:if="{{bm.is_fir}}" class="tick pdr20" >{{bm.text}}</text>
+                                    <view class="tick pdr20"  wx:if="{{bm.is_quan}}">{{bm.text}}</view>
+                                    <view class="tick pdr20 ellipsis-1x lh2  {{!bm.is_no_goto?'details':'' }} "  wx:if="{{bm.is_gift}}"
+                                          bindtap="show_zp"
+                                          data-is_no_goto="{{is_no_goto}}"
+                                          data-index="{{item.yh_index}}"
+                                          data-prom="{{bm.prom_id}}" >{{bm.text}}</view>
+
+                                    <!-- 旧礼包 -->
+                                    <view class="tick pdr20 ellipsis-1x lh2 details"  wx:if="{{bm.lb_id}}"
+                                          data-id="{{bm.lb_id}}" bindtap="viewLbDetails">{{bm.text}}</view>
+                                    <!-- 专享礼包 -->
+                                    <view class="tick pdr20 ellipsis-1x lh2 details"  wx:if="{{bm.zxlb_id}}"
+                                          data-id="{{bm.zxlb_id}}" data-flag="1" bindtap="viewLbDetails">{{bm.text}}</view>
+                                    <!-- 月礼包 -->
+                                    <view class="tick pdr20 ellipsis-1x lh2 details"  wx:if="{{bm.monthgiftbag_id}}"
+                                          data-id="{{bm.monthgiftbag_id}}" data-flag="2" bindtap="viewLbDetails">{{bm.text}}</view>
+
+                                </block>
+
+
                             </view>
                         </view>
@@ -37,7 +58,7 @@
                         <view class="r_item_pro">
                             <view style="text-align: center">
                                 <!-- 如果是弹出框进行选择的时候  -->
-                                <block wx:if="{{type==1}}">
+                                <block wx:if="{{type==1 && !item.is_no_sele}}">
                                     <view wx:if="{{item.sele}}" class="circle white xc-hook on">
                                         <text>Γ</text>
                                     </view>
@@ -24,6 +24,8 @@
     display: flex;
     justify-content: center;
     overflow: hidden; */
+    max-height: 580rpx;
+    overflow-y: auto;
 }
 .xc-top-content {
@@ -174,7 +176,7 @@
 }
 .item_pro{
-    background-color: #fceeee;height: 170rpx; position: relative;
+    background-color: #fceeee;min-height: 170rpx; position: relative;padding: 10rpx 0;
 }
 .item_pro~.item_pro{
@@ -199,13 +201,28 @@
     display: inline-block;
     vertical-align: middle;
     margin-top: -4rpx;
-    margin-right: 8rpx;
+    margin-right: 12rpx;
     width: 22rpx;
     height: 22rpx;
     background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAMAAADzapwJAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAABCUExURUdwTPInDPInDPgoDfMnDPYqEvInDPInDPInDP87NPUoDv8vEvMoDPInDPIoDPMnDvInDPInDPInDPIoDPQoDfInDEON4KMAAAAVdFJOUwD45yawG4zz3gQ0DmLOfECQZpPlS54kMQ4AAAC0SURBVBjTbZFREoMgDERDS0xQQNHu/a/alEGtaIYfHrBhs0S1pujVifo40VkhC+BUHSDzQTlBhjHY8bjogXmDZ+orJKwXwMUeUoa/0PeGbH8Q4Y5CJopYOjosiOQxdpRGk1UXOkrBKdkimtN8UrKrJBVXdzsllSYSjR/0J9JaGn81WluWtonYKQ0op51P3M2L2bmZN9n8MKoVqTph/RsseyjfYxAkfgot/82CpuJVLOLSIv4Cd5AJ37BgpFwAAAAASUVORK5CYII=) no-repeat;
     background-size: 22rpx auto;
 }
+.details::after {
+    content: '';
+    position: absolute;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    margin: auto;
+    display: inline-block;
+    width: 40rpx;
+    height: 40rpx;
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoBAMAAAB+0KVeAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAVUExURUdwTIyMjCYmJiYmJi0tLY+PjyYmJidnOsIAAAAGdFJOUwDt6aYcSSEXj/YAAAA8SURBVCjPY2AYBTQBLEbKDhiCTmlpKggeq2AAiDJLS0tGcBkFBUActbS0JAY4F6sgVu1YLcLnpFFAFQAATwgLKVhjC9UAAAAASUVORK5CYII=);
+    background-repeat: no-repeat;
+    background-size: 40rpx auto;
+}
+
 .r_item_pro{
     position: absolute;
     right: 18rpx;
@@ -246,6 +263,18 @@
     background-color: #d60021;
 }
+@import '../../app.wxss';
+.tick:before {
+    content: '';
+    display: inline-block;
+    vertical-align: middle;
+    margin-top: -4rpx;
+    margin-right: 12rpx;
+    width: 22rpx;
+    height: 22rpx;
+    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAMAAADzapwJAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAABCUExURUdwTPInDPInDPgoDfMnDPYqEvInDPInDPInDP87NPUoDv8vEvMoDPInDPIoDPMnDvInDPInDPInDPIoDPQoDfInDEON4KMAAAAVdFJOUwD45yawG4zz3gQ0DmLOfECQZpPlS54kMQ4AAAC0SURBVBjTbZFREoMgDERDS0xQQNHu/a/alEGtaIYfHrBhs0S1pujVifo40VkhC+BUHSDzQTlBhjHY8bjogXmDZ+orJKwXwMUeUoa/0PeGbH8Q4Y5CJopYOjosiOQxdpRGk1UXOkrBKdkimtN8UrKrJBVXdzsllSYSjR/0J9JaGn81WluWtonYKQ0op51P3M2L2bmZN9n8MKoVqTph/RsseyjfYxAkfgot/82CpuJVLOLSIv4Cd5AJ37BgpFwAAAAASUVORK5CYII=) no-repeat;
+    background-size: 22rpx auto;
+}
-@import '../../app.wxss';
+.lh2 { line-height: 2; }
@@ -510,7 +510,7 @@ Page({
         goods_sn: o.goods_sn,
         sku: o.sku,
 		prom_type: 5,
-		prom_id:o.prom_id
+		prom_id:th.data.collocationGoods.id
       };
 		//---是不是从收藏夹出来的---
@@ -648,8 +648,8 @@ Page({
 			}
 		}
-		newd['pick_name'] = th.data.sto_sele_name;
-		newd['pick_dis'] = th.data.sto_sele_distr;
+		//newd['pick_name'] = th.data.sto_sele_name;
+		//newd['pick_dis'] = th.data.sto_sele_distr;
 		this.check_sele_collocation(function (collocationGoods) {
 			var is_ok = 1;
@@ -674,20 +674,84 @@ Page({
 				th.setData({lding:0})
 				return false;
 			}
-
-			newd["collocation_goods"] = collocationGoods;
-			newd["is_coupon"] = th.data.is_coupon;
-			th.buyNow(newd);
+			//newd["collocation_goods"] = collocationGoods;
+			//newd["is_coupon"] = th.data.is_coupon;
+			th.buyNow(newd,collocationGoods);
 		})
 	},
   //----------立即购买-----------
-  buyNow: function(e) {
-    s.set_b_now(e);
-    wx.redirectTo({
-      url: "/packageE/pages/cart/cart2/cart2?is_bnow=1&goods_id=" + e.goods_id,
-    });
+  buyNow:async function(e,collocationGoods) {
+    //s.set_b_now(e);
+    // wx.redirectTo({
+    //   url: "/packageE/pages/cart/cart2/cart2?is_bnow=1&goods_id=" + e.goods_id,
+    // });
+	console.log(1111);
+    console.log(e);
+    console.log(collocationGoods);
+	var th=this;
+
+	  //----其他就按照公众号的购物车立即购买形式来修改，先看会员在购物车中是否加入了该商品,立即购买的-----
+	  var res=await getApp().request.promiseGet("/api/weshop/cart/page", {
+		  data: {
+			  store_id: os.stoid,
+			  user_id: oo.user_id,
+			  state: 1
+		  }
+	  })
+
+	  //-------如果购物车中有相关的数据---------
+	  if (res.data.code == 0 && res.data.data.total > 0) {
+		  for (let j in res.data.data.pageData) {
+			  let item_j = res.data.data.pageData[j];
+			  var url = '/api/weshop/cart/del/' + os.stoid + '/' + item_j.id;
+			  getApp().request.delete(url, {});
+		  }
+	  }
+
+	  //-- 推迟一下，因为删除没有那么快 --
+	  setTimeout(async () => {
+		  e.state = 1;
+		  e.selected=1;
+		  var dp_rs= await getApp().request.promisePost("/api/weshop/cart/save", {
+			  data: e,
+		  });
+
+		  if(!dp_rs || dp_rs.data.code!=0){
+			  return false;
+		  }
+
+		  for (let j = 0; j <collocationGoods.length ; j++) {
+			  var c_gd=collocationGoods[j];
+			  var save_data = {
+				  goods_id: c_gd.goods_id,
+				  goods_num: th.data.goodsInputNum,
+				  pick_id: th.data.sto_sele_id,
+				  user_id: oo.user_id,
+				  store_id: th.data.stoid,
+				  goods_price: c_gd.goods_price,
+				  member_goods_price: c_gd.goods_price,
+				  goods_name: c_gd.goods_name,
+				  goods_sn: c_gd.goods_sn,
+				  sku: c_gd.sku,
+				  prom_type: 5,
+				  prom_id:e.prom_id,
+				  is_collocation:1,
+				  state:1,
+				  selected:1
+			  };
+			  await getApp().request.promisePost("/api/weshop/cart/save", {
+				  data: save_data,
+			  });
+		  }
+		  setTimeout(()=>{ th.setData({lding:0}) },500);
+
+		  getApp().goto("/packageE/pages/cart/cart2/cart2?state=1");
+
+
+
+	  }, 500)
   },
   //----------增加购买数量-----------
@@ -1407,7 +1471,8 @@ Page({
         data: {
           store_id: os.stoid,
           user_id: user_id,
-          goods_id: gd.goods_id
+          goods_id: gd.goods_id,
+		  isnew:1
         },
         success: function(t) {
           if (t.data.code == 0) {
@@ -1420,7 +1485,8 @@ Page({
                   user_id: user_id,
                   goods_id: gd.goods_id,
                   prom_type: gd.prom_type,
-                  prom_id: gd.prom_id
+                  prom_id: gd.prom_id,
+				  isnew:1
                 },
                 //-----获取-----
                 success: function(tt) {
@@ -63,7 +63,31 @@ Page({
     show_card: null,     //显示的等级卡
     card_name: '',       //显示的卡的名称
     card_cut_price: null,//减价多少钱  
-    bconfig: null, 
+    bconfig: null,
+    showFold:true,
+  },
+
+
+
+  onReady() {
+
+    setTimeout(() => {
+      wx.createSelectorQuery().selectAll(".showArea, .hideArea").boundingClientRect(res => {
+        if (res.length != 0) {
+          this.setData({
+            showFold: res[0].height < res[1].height,
+          });
+        };
+
+      }).exec();
+    }, 1000);
+
+  },
+  
+  clickCollapse() {
+    this.setData({
+      flag: !this.data.flag,
+    })
   },
   onLoad: function (t) {
     console.log("onLoad_pt_cart");
@@ -113,12 +113,16 @@
                 </view>
 <!-- 保障服务 -->
-                <view class="bz_view flex bdt16" wx:if="{{bconfig.service_bz}}">
-          <image class="bzfu_img" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image>
-          <view class="flex f1  rel" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}">
-            <view class="bz-content showArea {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view>
+<view class="bz_view22 flex bdt16 ai_c" wx:if="{{bconfig.service_bz}}">
+          <image class="bzfu_img22" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image>
+          <view class="flex f1 ai_c rel22" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}">
+            <view class="bz-content22 showArea22 {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view>
+            <view class="bz-content22 hideArea22">{{bconfig.service_bz}}</view>
+            <view class="cx-obtain-coupon22 wsize22 arrow22" wx:if="{{showFold}}">
+              <text class="bg_jj22 down22 {{flag ? 'up22':''}}"></text>
+            </view>
           </view>
-      </view>
+        </view>
                 <view class="coupon-mes flex-vertical">
                     <view>留言</view>
@@ -301,8 +301,8 @@ Page({
         user_id: user_id,
         goods_id: gd.goods_id,
         prom_type: gd.prom_type,
-        prom_id: gd.prom_id
-
+        prom_id: gd.prom_id,
+        isnew:1
       },
     }).then(res=>{
        var buy_num_data=res.data.data;
@@ -186,9 +186,8 @@ Page({
                     "color": "#333",
                     "width": "250px",
                     "top": "820px",
-                    "fontSize": "26px",
-                    "fontWeight": "normal",
-                    "maxLines": "1",
+                    "fontSize": "22px",
+                    "maxLines": "2",
                     "left": "60px",
                   }
                 },
@@ -430,9 +429,8 @@ Page({
                         "color": "#333",
                         "width": "250px",
                         "top": "820px",
-                        "fontSize": "26px",
-                        "fontWeight": "normal",
-                        "maxLines": "1",
+                        "fontSize": "22px",
+                        "maxLines": "2",
                         "left": "60px",
                       }
                     },
@@ -649,6 +647,7 @@ Page({
           } else {
             //获取头像的分享
             th.get_head_temp(function () {
+              var imgDraw = th.data.imgDraw;
               var txt = th.data.act.zhprice + "元" + th.data.act.zhbuyqty + "件";
               imgDraw.views[0].url = th.data.share_head;
               imgDraw.views[1].text = userInfo.nickname;
@@ -2336,7 +2335,8 @@ Page({
           user_id: user_id,
           goods_id: gd.goods_id,
           prom_type: 7,
-          prom_id: th.data.act.id
+          prom_id: th.data.act.id,
+          isnew:1
         },
       }).then(res2 => {
         var g_buy_num = 0;
@@ -2825,7 +2825,8 @@ Page({
                     user_id: user_id,
                     goods_id: item_j.goods_id,
                     prom_type: 7,
-                    prom_id: th.data.act.id
+                    prom_id: th.data.act.id,
+                    isnew:1
                   },
                 }).then(res2 => {
                   if (res2.data.code == 0) {
@@ -2901,7 +2902,8 @@ Page({
               user_id: oo.user_id,
               goods_id: item_j.goods_id,
               prom_type: 7,
-              prom_id: th.data.act.id
+              prom_id: th.data.act.id,
+              isnew:1
             },
           }).then(res2 => {
             if (res2.data.code == 0) {
@@ -146,7 +146,7 @@
         <view class="t-r pdb20 white2">
             <text class="iconfont icon-close fs40" bindtap="closePoster"></text>
         </view>
-        <image src="{{myimg}}" class="poster" show-menu-by-longpress></image>
+        <image src="{{myimg}}" class="{{act.share_imgurl?'poster333':'poster'}}" show-menu-by-longpress></image>
         <view class="pdt10 fs26 white2">
             <text class="iconfont icon-zhiwen"></text>
             长按图片保存至相册
@@ -194,7 +194,14 @@ page {
 .poster {
 	width: 650rpx;
-	height: 943rpx;
+	height: 843rpx;
+	border-radius: 16rpx;
+	margin: 0 auto;
+}
+
+.poster333 {
+	width: 650rpx;
+	height: 1088rpx;
 	border-radius: 16rpx;
 	margin: 0 auto;
 }
@@ -1744,7 +1744,8 @@ Page({
                     user_id: user_id,
                     goods_id: gd.goods_id,
                     prom_type: 7,
-                    prom_id: th.data.act.id
+                    prom_id: th.data.act.id,
+                    isnew:1
                 },
             }).then(res2 => {
                 var g_buy_num = 0;
@@ -2120,7 +2121,8 @@ Page({
                                         user_id: user_id,
                                         goods_id: item_j.goods_id,
                                         prom_type: 7,
-                                        prom_id: th.data.act.id
+                                        prom_id: th.data.act.id,
+                                        isnew:1
                                     },
                                 }).then(res2 => {
                                     if (res2.data.code == 0) {
@@ -2196,7 +2198,8 @@ Page({
                             user_id: oo.user_id,
                             goods_id: item_j.goods_id,
                             prom_type: 7,
-                            prom_id: th.data.act.id
+                            prom_id: th.data.act.id,
+                            isnew:1
                         },
                     }).then(res2 => {
                         if (res2.data.code == 0) {
@@ -125,8 +125,32 @@ Page({
         hid_inp: 1,
         user_note: {},
         zuhe_map_good: {},
-        bconfig:null
-    },
+        bconfig:null,
+        showFold:true,
+      },
+    
+    
+    
+      onReady() {
+    
+        setTimeout(() => {
+          wx.createSelectorQuery().selectAll(".showArea, .hideArea").boundingClientRect(res => {
+            if (res.length != 0) {
+              this.setData({
+                showFold: res[0].height < res[1].height,
+              });
+            };
+    
+          }).exec();
+        }, 1000);
+    
+      },
+      
+      clickCollapse() {
+        this.setData({
+          flag: !this.data.flag,
+        })
+      },
     onLoad: function (t) {
         wx.setNavigationBarTitle({ title: "填写订单", })
@@ -449,7 +473,8 @@ Page({
                             user_id: getApp().globalData.user_id,
                             goods_id: item1.goods_id,
                             prom_type: item1.prom_type,
-                            prom_id: item1.prom_id
+                            prom_id: item1.prom_id,
+                            isnew:1
                         },
                     }).then(res => {
                         var buy_num_data = res.data.data;
@@ -375,12 +375,16 @@
 			</view>
 <!-- 保障服务 -->
-      <view class="bz_view flex bdt16" wx:if="{{bconfig.service_bz}}">
-          <image class="bzfu_img" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image>
-          <view class="flex f1  rel" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}">
-            <view class="bz-content showArea {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view>
+<view class="bz_view22 flex bdt16 ai_c" wx:if="{{bconfig.service_bz}}">
+          <image class="bzfu_img22" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image>
+          <view class="flex f1 ai_c rel22" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}">
+            <view class="bz-content22 showArea22 {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view>
+            <view class="bz-content22 hideArea22">{{bconfig.service_bz}}</view>
+            <view class="cx-obtain-coupon22 wsize22 arrow22" wx:if="{{showFold}}">
+              <text class="bg_jj22 down22 {{flag ? 'up22':''}}"></text>
+            </view>
           </view>
-      </view>
+        </view>
 			<!-- 留言 -->
 			<view class="coupon-mes flex-vertical">
 				<view>留言</view>
@@ -78,9 +78,32 @@ Page({
     act:null,  //幸运购的活动
     same_ok:1,  //同城配送的控制，默认ok
-    bconfig:null
+    bconfig:null,
+    showFold:true,
   },
+
+
+  onReady() {
+
+    setTimeout(() => {
+      wx.createSelectorQuery().selectAll(".showArea, .hideArea").boundingClientRect(res => {
+        if (res.length != 0) {
+          this.setData({
+            showFold: res[0].height < res[1].height,
+          });
+        };
+
+      }).exec();
+    }, 1000);
+
+  },
+  
+  clickCollapse() {
+    this.setData({
+      flag: !this.data.flag,
+    })
+  },
   onLoad: function (t) {
     // console.log('收到的传参', t);
@@ -124,12 +124,16 @@
       </view>
       <!-- 保障服务 -->
-      <view class="bz_view flex bdt16" wx:if="{{bconfig.service_bz}}">
-          <image class="bzfu_img" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image>
-          <view class="flex f1  rel" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}">
-            <view class="bz-content showArea {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view>
+      <view class="bz_view22 flex bdt16 ai_c" wx:if="{{bconfig.service_bz}}">
+          <image class="bzfu_img22" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image>
+          <view class="flex f1 ai_c rel22" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}">
+            <view class="bz-content22 showArea22 {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view>
+            <view class="bz-content22 hideArea22">{{bconfig.service_bz}}</view>
+            <view class="cx-obtain-coupon22 wsize22 arrow22" wx:if="{{showFold}}">
+              <text class="bg_jj22 down22 {{flag ? 'up22':''}}"></text>
+            </view>
           </view>
-      </view>
+        </view>
       <view class="coupon-mes flex-vertical">
         <view>留言</view>
@@ -4377,7 +4377,8 @@ Page({
         data: {
           store_id: os.stoid,
           user_id: user_id,
-          goods_id: gd.goods_id
+          goods_id: gd.goods_id,
+          isnew:1
         },
         success: function (t) {
           if (t.data.code == 0) {
@@ -4396,7 +4397,8 @@ Page({
                   user_id: user_id,
                   goods_id: gd.goods_id,
                   prom_type: gd.prom_type,
-                  prom_id: gd.prom_id
+                  prom_id: gd.prom_id,
+                  isnew:1
                 },
                 //-----获取-----
                 success: function (tt) {
@@ -446,7 +446,8 @@ Page({
                             user_id: getApp().globalData.user_id,
                             goods_id: item1.goods_id,
                             prom_type: item1.prom_type,
-                            prom_id: item1.prom_id
+                            prom_id: item1.prom_id,
+                            isnew:1
                         },
                     }).then(res => {
                         var buy_num_data = res.data.data;
@@ -120,8 +120,32 @@ Page({
         paying:0,
         same_ok:1 , //同城配送按钮控制
-        bconfig:null
-    },
+        bconfig:null,
+        showFold:true,
+      },
+    
+    
+    
+      onReady() {
+    
+        setTimeout(() => {
+          wx.createSelectorQuery().selectAll(".showArea, .hideArea").boundingClientRect(res => {
+            if (res.length != 0) {
+              this.setData({
+                showFold: res[0].height < res[1].height,
+              });
+            };
+    
+          }).exec();
+        }, 1000);
+    
+      },
+      
+      clickCollapse() {
+        this.setData({
+          flag: !this.data.flag,
+        })
+      },
     onLoad: function (t) {
         if (t.order_id) this.data.order_id = t.order_id;
@@ -2634,7 +2658,8 @@ Page({
                 user_id: getApp().globalData.user_id,
                 goods_id: good.goods_id,
                 prom_type: good.prom_type,
-                prom_id: good.prom_id
+                prom_id: good.prom_id,
+                isnew:1
             },
         }).then(res => {
             var buy_num_data = res.data.data;
@@ -265,12 +265,16 @@
         </view>
          <!-- 保障服务 -->
-         <view class="bz_view flex bdt16" wx:if="{{bconfig.service_bz}}">
-          <image class="bzfu_img" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image>
-          <view class="flex f1  rel" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}">
-            <view class="bz-content showArea {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view>
+         <view class="bz_view22 flex bdt16 ai_c" wx:if="{{bconfig.service_bz}}">
+          <image class="bzfu_img22" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image>
+          <view class="flex f1 ai_c rel22" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}">
+            <view class="bz-content22 showArea22 {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view>
+            <view class="bz-content22 hideArea22">{{bconfig.service_bz}}</view>
+            <view class="cx-obtain-coupon22 wsize22 arrow22" wx:if="{{showFold}}">
+              <text class="bg_jj22 down22 {{flag ? 'up22':''}}"></text>
+            </view>
           </view>
-      </view>
+        </view>
         <!-- 留言 -->
         <view class="coupon-mes flex-vertical">
             <view>留言</view>
@@ -131,9 +131,32 @@ Page({
         same_ok:1,
         appoint_pick_keyid: '',
-        bconfig:null
-
-    },
+        bconfig:null,
+        showFold:true,
+      },
+    
+    
+    
+      onReady() {
+    
+        setTimeout(() => {
+          wx.createSelectorQuery().selectAll(".showArea, .hideArea").boundingClientRect(res => {
+            if (res.length != 0) {
+              this.setData({
+                showFold: res[0].height < res[1].height,
+              });
+            };
+    
+          }).exec();
+        }, 1000);
+    
+      },
+      
+      clickCollapse() {
+        this.setData({
+          flag: !this.data.flag,
+        })
+      },
     onLoad: function (t) {
         wx.setNavigationBarTitle({ title: "填写订单", })
         var th = this;
@@ -178,12 +178,16 @@
 			</view>
             <!-- 保障服务 -->
-            <view class="bz_view flex bdt16" wx:if="{{bconfig.service_bz}}">
-          <image class="bzfu_img" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image>
-          <view class="flex f1  rel" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}">
-            <view class="bz-content showArea {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view>
+            <view class="bz_view22 flex bdt16 ai_c" wx:if="{{bconfig.service_bz}}">
+          <image class="bzfu_img22" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image>
+          <view class="flex f1 ai_c rel22" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}">
+            <view class="bz-content22 showArea22 {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view>
+            <view class="bz-content22 hideArea22">{{bconfig.service_bz}}</view>
+            <view class="cx-obtain-coupon22 wsize22 arrow22" wx:if="{{showFold}}">
+              <text class="bg_jj22 down22 {{flag ? 'up22':''}}"></text>
+            </view>
           </view>
-      </view>
+        </view>
 			<!-- 留言 -->
 			<view class="coupon-mes flex-vertical">
 				<view>留言</view>
@@ -55,7 +55,28 @@ Page({
     yuer: 0,
     agree_no_ref: 0,
     is_pre_cut:0, //是否可以使用预存 0是不可以1的可以
-    bconfig:null
+    bconfig:null,
+    showFold:true,
+  },
+
+  onReady() {
+    setTimeout(() => {
+      wx.createSelectorQuery().selectAll(".showArea, .hideArea").boundingClientRect(res => {
+        if (res.length != 0) {
+          this.setData({
+            showFold: res[0].height < res[1].height,
+          });
+        };
+
+      }).exec();
+    }, 1000);
+
+  },
+  
+  clickCollapse() {
+    this.setData({
+      flag: !this.data.flag,
+    })
   },
   onLoad: function (t) {
     wx.setNavigationBarTitle({
@@ -112,12 +112,16 @@
                 </view>
       <!-- 保障服务 -->
-      <view class="bz_view flex bdt16" wx:if="{{bconfig.service_bz}}">
-          <image class="bzfu_img" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image>
-          <view class="flex f1  rel" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}">
-            <view class="bz-content showArea {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view>
+      <view class="bz_view22 flex bdt16 ai_c" wx:if="{{bconfig.service_bz}}">
+          <image class="bzfu_img22" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image>
+          <view class="flex f1 ai_c rel22" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}">
+            <view class="bz-content22 showArea22 {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view>
+            <view class="bz-content22 hideArea22">{{bconfig.service_bz}}</view>
+            <view class="cx-obtain-coupon22 wsize22 arrow22" wx:if="{{showFold}}">
+              <text class="bg_jj22 down22 {{flag ? 'up22':''}}"></text>
+            </view>
           </view>
-      </view>
+        </view>
                 <view class="coupon-mes flex-vertical">
                     <view>留言</view>
@@ -1095,11 +1095,11 @@ Page({
       //---判断商品是否超出活动限购---
       if (th.data.prom_buy_num != -1 && th.data.prom_buy_limit > 0) {
         if (th.data.goodsInputNum + th.data.prom_buy_num > th.data.prom_buy_limit) {
-          wx.showModal({
-            title: '提示',
-            content: '超出商品活动限购'
-          });
-          return false;
+           wx.showModal({
+             title: '提示',
+             content: '超出商品活动限购'
+           });
+           return false;
         }
       }
@@ -2764,6 +2764,7 @@ Page({
           store_id: os.stoid,
           user_id: user_id,
           goods_id: gd.goods_id,
+          isnew:1
         },
         success: function (t) {
           if (t.data.code == 0) {
@@ -2568,6 +2568,7 @@ Page({
                     store_id: os.stoid,
                     user_id: user_id,
                     goods_id: gd.goods_id,
+                   isnew:1
                 },
                 success: function (t) {
                     if (t.data.code == 0) {
@@ -134,7 +134,6 @@ Page({
     in_zhact_gdmap: {}, //不同门店参与同一活动的限购，这些都是map表，很
     in_zhact:{},        //组合购活动在列表中的显示
     in_yhact:{},        //优惠活动在列表中的显示
-
     in_zh_gd_buy_map:{},  //就是商品在组合购中的
     in_zhact_gdmap_new: {}, //不同门店参与同一活动的限购，这些都是map表，是多促销互动专用，不能和in_zhact_gdmap重叠
@@ -167,9 +166,32 @@ Page({
     same_ok:1,  //同城配送的控制，默认ok
-    bconfig:null
+    bconfig:null,
+    showFold:true,
+  },
+
+
+
+  onReady() {
+
+    setTimeout(() => {
+      wx.createSelectorQuery().selectAll(".showArea, .hideArea").boundingClientRect(res => {
+        if (res.length != 0) {
+          this.setData({
+            showFold: res[0].height < res[1].height,
+          });
+        };
+
+      }).exec();
+    }, 1000);
   },
+  
+  clickCollapse() {
+    this.setData({
+      flag: !this.data.flag,
+    })
+  },
   onLoad: function (t) {
@@ -214,6 +236,27 @@ Page({
   onUnload: function () {
     this.setData({ isclose: 1 })
   },
+
+  onReady() {
+
+    setTimeout(() => {
+      wx.createSelectorQuery().selectAll(".showArea, .hideArea").boundingClientRect(res => {
+        if (res.length != 0) {
+          this.setData({
+            showFold: res[0].height < res[1].height,
+          });
+        };
+
+      }).exec();
+    }, 1000);
+
+  },
+  
+  clickCollapse() {
+    this.setData({
+      flag: !this.data.flag,
+    })
+  },
   onHide: function () {
     this.setData({
       isget_by_quan: {},
@@ -227,6 +270,7 @@ Page({
   //----------子页返回父页触发----------
   onShow: function () {
+
     //富友支付取消支付强行回去
     var fy=ut.fy_back("/pages/user/order_list/order_list",1);
     if(fy) return false;
@@ -240,7 +284,6 @@ Page({
       wx.navigateTo({
         url: "/pages/index/index/index"
       })
-
     } else {
       this.getuser_addr(function (ie) {
         console.log("getuser_addr")
@@ -638,7 +681,7 @@ Page({
   },
-  //-- 获取搭配购商品 --
+  //-- 获取搭配购商品gd是商品  arr是购物车商品列表（某个门店的）   --
   async set_collection(gd, arr, index) {
     var th = this;
     var user_id = getApp().globalData.user_id;
@@ -706,6 +749,17 @@ Page({
     }
     if (arr) {
+
+      //-- 看一下增品是不是已经在购物车列表中 --
+      for(var ig=0;ig<new_arr.length;ig++){
+          var f_coll=arr.find(function (em){
+              return em.goods_id==new_arr[ig].goods_id && em.is_collocation==1 && new_arr[ig].prom_id==em.prom_id
+          })
+          if(f_coll){
+            new_arr[ig].selected=1;
+          }
+      }
+
       arr[index].collocationList = new_arr;
     }
     else th.setData({
@@ -754,7 +808,8 @@ Page({
     a.get("/api/weshop/cart/list", {
       data: {
         user_id: to.globalData.user_id, selected: 1, state: state,
-        store_id: oo.stoid, pageSize: 600
+        store_id: oo.stoid, pageSize: 600,
+        isorder:1
       },
       success: async function (su) {
@@ -777,7 +832,7 @@ Page({
           }
         })
-        th.data.cartlist_y = carr;  //存储原始购物车列表
+        th.data.cartlist_y =JSON.parse(JSON.stringify(carr));  //存储原始购物车列表
         wx.showLoading();
@@ -789,16 +844,23 @@ Page({
   //-- is_change是有没有切换活动的意思 --
-  async get_cart_next(carr,is_change){
+  async get_cart_next(carr,is_change,old_prom){
     //--- 切换的时候一定要把赠品去掉 ---
     if(is_change){
-      carr=this.data.cartlist_y;
+      carr=JSON.parse(JSON.stringify(this.data.cartlist_y));
       //-- 剔除赠品的数据，等到确定活动是优惠促销的时候，在显示赠品, 赠品直接删除 --
       var new_arr=[];
       for (var ir = 0; ir < carr.length; ir++) {
-        if(carr[ir].is_gift && carr[ir].id) {
+
+        var c_ok=1;
+        if(old_prom && (carr[ir].prom_type!=old_prom.prom_type || carr[ir].prom_id!=old_prom.prom_id) ){
+           c_ok=0;
+        }
+
+        if(carr[ir].is_gift && carr[ir].id && c_ok) {
+
           var url = '/api/weshop/cart/del/' + oo.stoid + '/' + carr[ir].id;
           getApp().request.delete(url, {
             success: function (t) {}
@@ -808,6 +870,8 @@ Page({
         }
         new_arr.push(carr[ir]);
       }
+
+      this.data.cartlist_y=JSON.parse(JSON.stringify(new_arr));
       carr=new_arr;
       //-- map cy_cx属性要删除 --
@@ -852,7 +916,8 @@ Page({
           user_id: getApp().globalData.user_id,
           goods_id: item1.goods_id,
           prom_type: item1.prom_type,
-          prom_id: item1.prom_id
+          prom_id: item1.prom_id,
+          isnew:1
         },
       }).then(res => {
         var buy_num_data = res.data.data;
@@ -869,7 +934,7 @@ Page({
       item1.is_post_temp=1;
       //如果是秒杀,团购的时候
-      if([1,2,6].indexOf(item1.prom_type)>-1){
+      if([1,2,3,6].indexOf(item1.prom_type)>-1){
         var url= "/api/weshop/activitylist/getSJGoodsPriceNew/" + os.stoid
             + "/" + item1.goods_id + "/"+item1.prom_type+"/" + item1.prom_id + "/" + app.globalData.user_id;
         await app.request.promiseGet(url,{}).then(res=>{
@@ -1109,7 +1174,8 @@ Page({
       var c_item = arr[k];
       if(!is_change){
         //-- 要进行归类一下活动 --
-        await m_cx.cart_cx_group(th,arr[k].goods,c_item,0,1,(show_can_cx)=>{
+        await m_cx.cart_cx_group(th,arr[k].goods,c_item,0,0,(show_can_cx)=>{
+
           arr[k].show_can_cx=show_can_cx;
         })
       }else{
@@ -1145,12 +1211,13 @@ Page({
             }
           }
           //-- 如果组合购的总数量不足的处理 --
-          if(no_zh_num[item1.prom_id] && item1.prom_type == 7){
-            item1.prom_type = 0;
-            item1.prom_type1 = 0;
-            item1.prom_id = 0;
-            item1.prom_id1 = 0
-          }
+          // if(no_zh_num[item1.prom_id] && item1.prom_type == 7){
+          //   item1.prom_type = 0;
+          //   item1.prom_type1 = 0;
+          //   item1.prom_id = 0;
+          //   item1.prom_id1 = 0
+          // }
+
           //要把组合购的东西拿出来算一下,同时组合购的总数量要有存在
           if (item1.prom_type == 7) {
             if (!th.data.zuhe_map_good[item1.prom_id]) {
@@ -1175,10 +1242,10 @@ Page({
                     store_count_ok = 0;
                     no_zh_num[item1.prom_id]=1;
                     //-- 清理一下活动的状态 --
-                    item1.prom_type = 0;
-                    item1.prom_type1 = 0;
-                    item1.prom_id = 0;
-                    item1.prom_id1 = 0
+                    // item1.prom_type = 0;
+                    // item1.prom_type1 = 0;
+                    // item1.prom_id = 0;
+                    // item1.prom_id1 = 0
                   }else{
                     th.data.zhhe_act_map[item1.prom_id] = res.data.data;
@@ -1953,6 +2020,11 @@ Page({
   async buy_pro_group(item1, is_state) {
     //-- 代发商品不参与任何活动 --
     if (item1.whsle_id) return false;
+    if (item1.is_gift) return false;
+    if (item1.is_collocation) return false;
+    if (item1.is_ld_split) return false;  //是阶梯
+    if (item1.is_zh_split) return false;
+
     //-- 购物车的秒杀和团购不计算 --
     var p_type=parseInt(item1.prom_type);
     if([1,2].indexOf(p_type)>-1) return false;
@@ -2072,42 +2144,67 @@ Page({
   cart_add_gift(item_map,pickid,i,ord_goods,get_data){
       var th=this;
-      var pos=this.find_pro_last(ord_goods,3,item_map.prom_id);
       var is_has_gift=this.is_has_gift(ord_goods,item_map.prom_id)
-      //-- 没有赠品的时候才添加，避免购物车重复出现 --
-      if(pos>-1 && !is_has_gift){
-          var newd = {
-            goods_id: get_data.goods_id,
-            goods_num: get_data.bs * get_data.zp_num, //是赠品的翻倍
-            pick_id: pickid,
-            user_id: app.globalData.user_id,
-            store_id: os.stoid,
-            goods_price: 0,
-            member_goods_price: 0,
-            goods_name: get_data.goods_name,
-            goods_sn: get_data.goodsinfo.goods_sn,
-            sku: get_data.goodsinfo.sku,
-            is_gift: 1,
-            prom_id: item_map.prom_id,
-            prom_type: 3,
-            selected: 1,
-            gift_id: get_data.gift_id,
-            original_img: th.data.imgUrl + get_data.goodsinfo.original_img
-          };
-          var fd_gd=ord_goods[pos]
-
-          newd.guide_id=fd_gd.guide_id;
-          newd.guide_type=fd_gd.guide_type;
-          newd.distr_type=fd_gd.distr_type;
+      //-- 没有赠品的时候才添加，避免购物车重复出现 --
+      if(!is_has_gift){
+
+          //看一下要插入的位置
+          var pos=this.find_pro_last(ord_goods,3,item_map.prom_id);
+          var pos2=this.find_pro_last(th.data.old_cartlist[i].goods,3,item_map.prom_id);
+
+          if(pos>-1){
+              var newd = {
+                goods_id: get_data.goods_id,
+                goods_num: get_data.bs * get_data.zp_num, //是赠品的翻倍
+                pick_id: pickid,
+                user_id: app.globalData.user_id,
+                store_id: os.stoid,
+                goods_price: 0,
+                member_goods_price: 0,
+                goods_name: get_data.goods_name,
+                goods_sn: get_data.goodsinfo.goods_sn,
+                sku: get_data.goodsinfo.sku,
+                is_gift: 1,
+                prom_id: item_map.prom_id,
+                prom_type: 3,
+                selected: 1,
+                gift_id: get_data.gift_id,
+                original_img: th.data.imgUrl + get_data.goodsinfo.original_img
+              };
+              var fd_gd=ord_goods[pos]
-          ord_goods.splice(1,0,newd);
+              newd.guide_id=fd_gd.guide_id;
+              newd.guide_type=fd_gd.guide_type;
+              newd.distr_type=fd_gd.distr_type;
+              ord_goods.splice(pos+1,0,newd);
+              th.data.old_cartlist[i].goods.splice(pos2+1,0,newd);
+          }
       }
   },
+  //-- 其他门店赠品的总和 --
+  get_other_gift(c_arr,gift_id,pickid){
+    var num=0;
+    for (var i in c_arr) {
+        var cart_item = c_arr[i];      //就是每一单的意思
+        var pickid0 = cart_item.pickup_id;
+        //相同门店不用统计
+        if(pickid0==pickid) continue;
+        var ord_goods = cart_item.goods;   //就是每一单的从表的意思
+        var fd=ord_goods.find(function (er){
+            return er.is_gift && er.gift_id==gift_id
+        })
+        if(fd){
+          num+=fd.goods_num;
+        }
+    }
+    return num;
+  },
+
   calc_per: async function (c_arr) {
     var send_gf = {};
@@ -2124,7 +2221,6 @@ Page({
       var o_price = 0, q_conditin = 0;
       //--------循环计算总价-----------
       for (var j = 0; j < ord_goods.length; j++) {
-
         if (ord_goods[j].whsle_id) continue;
         o_price += ord_goods[j].goods_price * ord_goods[j].goods_num;
       }
@@ -2159,11 +2255,20 @@ Page({
                 item_map.s_coupon_num = get_data.coupon_num;
                 item_map.lbtitle = get_data.lbtitle;
                 item_map.zxlbtitle = get_data.zxlbtitle;
-                //每月礼包
-                item_map.monthlbtitle = get_data.monthlbtitle;
+
+                var rule=JSON.parse(get_data.rule);
+                if(rule.is_monthgiftbag &&  parseFloat(rule.is_monthgiftbag )>0){
+                  //每月礼包
+                  item_map.monthlbtitle = get_data.monthlbtitle;
+                }
+
+                //-- 其他门店赠品的总和 --
+                var other_gift=0;
+                other_gift=th.get_other_gift(c_arr,get_data.gift_id,pickid);
+
                 //------end-------
                 if (get_data.gift_id && parseInt(get_data.zp_mode) != 1
-                    && get_data.zp_num * item_map.bs <= get_data.limit_num
+                    && get_data.zp_num * item_map.bs <= get_data.limit_num-other_gift
                     && get_data.zp_num * item_map.bs <= get_data.gift_storecount
                 ) {
@@ -2191,8 +2296,10 @@ Page({
                 item_map.zx_libao = get_data.zxlibao;
                 item_map.zx_lb_num = get_data.zxlb_num;
                 //每月礼包
-                item_map.monthlibao = get_data.monthlibao;
-                item_map.monthlb_num = get_data.monthlb_num;
+                if(rule.is_monthgiftbag &&  parseFloat(rule.is_monthgiftbag )>0) {
+                   item_map.monthlibao = get_data.monthlibao;
+                   item_map.monthlb_num = get_data.monthlb_num;
+                }
                 //------end-------
                 if (parseInt(get_data.zp_mode) == 1) {
@@ -2836,12 +2943,7 @@ Page({
           })
         }
-
-
-
-
-
-
+        
         //-- 如果没有订单优惠，或者订单优惠中有勾选包邮模板 --
         if (!ord_prom || ord_prom.is_post_temp) {
           var user_addr = th.data.user_addr;
@@ -4716,6 +4818,8 @@ Page({
             'store_id': oo.stoid,
           };
+
+
           if (getApp().globalData.skinface_id) {
             goods.skinface_id = getApp().globalData.skinface_id;
           }
@@ -4731,6 +4835,21 @@ Page({
             goods.quan_num = g_item.quan_num;
             goods.quan_no = g_item.quan_no;
           }
+
+          //如果活动一样，那么商品的活动就要清理成0
+          var sh_can_cx=t_item.show_can_cx;
+          if(sh_can_cx && !g_item.is_zh_split){
+              for (let kh in sh_can_cx) {
+                 var cur=sh_can_cx[kh]?sh_can_cx[kh].cur_act:null;
+                 if(cur && cur.is_no_ok){
+                      //如果活动一样，那么商品的活动就要清理成0
+                      if(g_item.prom_type==cur.prom_type && g_item.prom_id==cur.prom_id){
+                          g_item.prom_type=0;
+                      }
+                 }
+              }
+          }
+
           //--判断活动的类型--
           switch (g_item.prom_type) {
             case 1:
@@ -4762,10 +4881,11 @@ Page({
             default:
               goods.prom_type = 0;
               goods.prom_id = 0;
+
           }
           var txt = goods.prom_id + ',' + goods.prom_type + ',' + goods.goods_id + ',' + goods.is_gift;
-          //--赠品的时候,阶梯促销会右重复的情况 --
+          //--赠品的时候,阶梯促销会右重复的情况,还有组合购的时候拆分出去的 --
           if (check_map[txt] && goods.prom_type != 10) {
             getApp().confirmBox(goods.goods_name + "计算金额错误，请重新刷新");
             return false;
@@ -4881,7 +5001,6 @@ Page({
             zhlist.push(ite);
           }
-
           item.zhlist=zhlist;
         }
@@ -4984,7 +5103,7 @@ Page({
     // debugger
     var str = JSON.stringify(pdata);
     console.log(str,'aaaaaaaaaaaaaaa');
-    // return false;
+    //return false;
     wx.showLoading({ title: "加载中" });
     th.setData({ submit: 1, })
@@ -5005,7 +5124,7 @@ Page({
             //如果是购物车结算，还要删除购物车
             if (th.data.is_b_now == 0) {
               console.log(th.data.cartlist_y);
-              var list = th.data.cartlist_y;
+              var list =JSON.parse(JSON.stringify(th.data.cartlist_y));
               for (var i = 0; i < list.length; i++) {
                 //删除购物车
                 a.delete("/api/weshop/cart/del/" + oo.stoid + "/" + list[i].id, {});
@@ -7652,17 +7771,28 @@ Page({
   //--- 选择回来时候的选择 ---
   sure_cx_group:function(e){
     var th=this;
-    var sele_idx=e.detail.sele_idx;
+    //选中的活动类型
+    var sele_prom_type=e.detail.sele_prom_type;
+    //-- 获取到当前的show_can_cx--
     var idx=this.data.sele_cx_group_cidx;
     var gd_key= this.data.cx_group_gd_key;
-    //-- 获取到--
     var cx_prom_group=this.data.cartlist[idx].show_can_cx[gd_key].act_arr;
     var pk=this.data.cartlist[idx].pickup_id;
+    th.setData({
+      send_lb:{},
+      month_lb:{},
+      send_gf:{}
+    })
+
+    th.data.prom_goods_map={};
+
+    //-- 获取第一次选中的 --
     var fir_sele=0;
     for(var dx=0;dx<cx_prom_group.length;dx++){
       if(cx_prom_group[dx].sele) fir_sele=dx;
-      if(dx!=sele_idx) cx_prom_group[dx].sele=0;
+      //如果活动不是选择的
+      if(cx_prom_group[dx].prom_type!=sele_prom_type) cx_prom_group[dx].sele=0;
       else cx_prom_group[dx].sele=1;
     }
     //选择后就要把活动确定下来
@@ -7671,12 +7801,21 @@ Page({
       return el.sele;
     })
-
     this.cx_check_ok2(function (ck_res){
       if(ck_res.code==0){
         th.data.cartlist[idx].show_can_cx[gd_key].sele_prom_type=ck_prom_type.prom_type;
-        var goods= th.data.cartlist_y
+        th.data.cartlist[idx].show_can_cx[gd_key].cur_act=ck_prom_type;
+
+
+        var goods0= JSON.parse(JSON.stringify(th.data.cartlist_y));
+        var goods=[];
+        for(var ik=0;ik<goods0.length;ik++){
+           var item_c=goods0[ik];
+           if(item_c.pick_id==pk && item_c.is_collocation) continue;
+           goods.push(item_c);
+        }
+
         //-- 此时要把购物车中的商品确定活动 --
         for (var b=0; b<ck_prom_type.goods.length;b++){
           //-- 开始查找 --
@@ -7695,6 +7834,9 @@ Page({
                   th.data.cartlist[idx].goods[ik].prom_id= goods[fg].prom_id;
                 }
             }
+
+            //原始数据要有深拷贝不能有地址的牵连
+            th.data.cartlist_y=JSON.parse(JSON.stringify(goods))
           }
         }
@@ -7703,7 +7845,7 @@ Page({
           mask: true
         })
         //-- 重新计算一下价格 --
-        th.get_cart_next(null,1);
+        th.get_cart_next(null,1,cx_prom_group[fir_sele]);
       }else{
         wx.showToast({
           title: ck_res.msg,
@@ -7791,6 +7933,12 @@ Page({
           func({'code': -1, 'msg': '超出组合购活动总数量'});
           return false;
         }
+
+        if (zh && zh['buy_limit'] > 0 && num0+buyed > zh['buy_limit']) {
+          func({'code': -1, 'msg': '超出超出组合购活动的限购'});
+          return false;
+        }
+
       }
     }
@@ -7807,7 +7955,7 @@ Page({
         var promgoodsbuynum = 0;
         var rq = {
           'store_id': os.stoid, 'user_id': getApp().globalData.user_id, 'goods_id': gid,
-          'prom_type': 7, 'prom_id': pid
+          'prom_type': 7, 'prom_id': pid, isnew:1
         };
         var res = await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {data: rq});
@@ -114,11 +114,13 @@
                 </view>
               </navigator>
             </view>
-            <!-- 验证活动是不是多个，要不要显示切换 -->
-            <!-- 新增促销多活动的排版 -->
+
+             <!-- 验证活动是不是多个，要不要显示切换 -->
+             <!-- 新增促销多活动的排版,单商品的时候 -->
              <block  wx:if="{{(util.is_more_act(items,item.show_can_cx) && item.show_can_cx[items.goods_id] && item.show_can_cx[items.goods_id].act_arr.length>1)}}">
-               <view class="bdb16" wx:if="{{util.check_show(items,item.show_can_cx[items.goods_id].sele_prom_type)}}">
+               <view class="bdb16" wx:if="{{util.check_show(items,item.show_can_cx[items.goods_id].cur_act.prom_type)}}">
+                 
                  <view bindtap="switch_cx_group"
                        data-index="{{pidx}}"
                        data-gd_key="{{items.goods_id}}"
@@ -126,10 +128,10 @@
                    <view class="cx-sizs fs30">促销</view>
                    <view class="flex ai_c f1 pdh20">
                      <view class="xc-coupon-fram" wx:for="{{item.show_can_cx[items.goods_id].act_arr}}" >
-                       <view wx:if="{{item.prom_type==3}}" class="xc-coupon t-c four-level-word">优惠促销</view>
-                       <view wx:if="{{item.prom_type==5}}" class="xc-coupon t-c four-level-word">搭配促销</view>
-                       <view wx:if="{{item.prom_type==7}}" class="xc-coupon t-c four-level-word">组合购</view>
-                       <view wx:if="{{item.prom_type==10}}" class="xc-coupon t-c four-level-word">阶梯促销</view>
+                       <view wx:if="{{item.prom_type==3}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">优惠促销</view>
+                       <view wx:if="{{item.prom_type==5}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">搭配促销</view>
+                       <view wx:if="{{item.prom_type==7}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">组合购</view>
+                       <view wx:if="{{item.prom_type==10}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">阶梯促销</view>
                      </view>
                    </view>
                    <view class="cx-obtain-coupon wsize">
@@ -139,34 +141,89 @@
                </view>
              </block>
+             <!--此时是多个商品参与活动的切换 验证活动是不是多个，要不要显示切换，同时要最后一个商品显示 -->
+             <!-- 新增促销多活动的排版，多商品的时候 -->
+             <block wx:if="{{item.show_can_cx}}">
+                    <block  wx:for="{{item.show_can_cx}}" wx:for-item="pitem">
+
+                      <block wx:if="{{ pitem.sele_prom_type==7 || pitem.sele_prom_type==10 }}">
+
+
+                        <view class="bdb16" wx:if="{{pitem.is_duo_gd && pitem.act_arr.length>1 && items.is_act_last}}" >
+
+                          <view bindtap="switch_cx_group"
+                                data-index="{{pidx}}"
+                                data-gd_key="{{index}}"
+                                class="cx-frame flex" style="position: relative">
+                            <view class="cx-sizs fs30">促销</view>
+                            <view class="flex ai_c f1 pdh20">
+                              <view class="xc-coupon-fram" wx:for="{{pitem.act_arr}}" >
+                                <view wx:if="{{item.prom_type==3}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">优惠促销</view>
+                                <view wx:if="{{item.prom_type==5}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">搭配促销</view>
+                                <view wx:if="{{item.prom_type==7}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">组合购</view>
+                                <view wx:if="{{item.prom_type==10}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">阶梯促销</view>
+                              </view>
+                            </view>
+                            <view class="cx-obtain-coupon wsize">
+                              <text class="bg_jj"></text>
+                            </view>
+                          </view>
+                        </view>
+                      </block>
+                      <block wx:else>
+                        <view class="bdb16" wx:if="{{pitem.is_duo_gd && pitem.act_arr.length>1 && util.check_is_last(index,items.goods_id,items.is_act_last) }}" >
+                          <view bindtap="switch_cx_group"
+                                data-index="{{pidx}}"
+                                data-gd_key="{{index}}"
+                                class="cx-frame flex" style="position: relative">
+                            <view class="cx-sizs fs30">促销</view>
+                            <view class="flex ai_c f1 pdh20">
+                              <view class="xc-coupon-fram" wx:for="{{pitem.act_arr}}" >
+                                <view wx:if="{{item.prom_type==3}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">优惠促销</view>
+                                <view wx:if="{{item.prom_type==5}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">搭配促销</view>
+                                <view wx:if="{{item.prom_type==7}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">组合购</view>
+                                <view wx:if="{{item.prom_type==10}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">阶梯促销</view>
+                              </view>
+                            </view>
+                            <view class="cx-obtain-coupon wsize">
+                              <text class="bg_jj"></text>
+                            </view>
+                          </view>
+                        </view>
+                      </block>
+
+                    </block>
+                  </block>
         </block>
         <!--此时是多个商品参与活动的切换 验证活动是不是多个，要不要显示切换 -->
         <!-- 新增促销多活动的排版 -->
-        <block wx:if="{{item.show_can_cx}}">
-          <block  wx:for="{{item.show_can_cx}}" wx:for-item="pitem">
-            <view class="bdb16" wx:if="{{pitem.is_duo_gd && pitem.act_arr.length>1}}" >
-              <view bindtap="switch_cx_group"
-                    data-index="{{pidx}}"
-                    data-gd_key="{{index}}"
-                    class="cx-frame flex" style="position: relative">
-                <view class="cx-sizs fs30">促销</view>
-                <view class="flex ai_c f1 pdh20">
-                  <view class="xc-coupon-fram" wx:for="{{pitem.act_arr}}" >
-                    <view wx:if="{{item.prom_type==3}}" class="xc-coupon t-c four-level-word">优惠促销</view>
-                    <view wx:if="{{item.prom_type==5}}" class="xc-coupon t-c four-level-word">搭配促销</view>
-                    <view wx:if="{{item.prom_type==7}}" class="xc-coupon t-c four-level-word">组合购</view>
-                    <view wx:if="{{item.prom_type==10}}" class="xc-coupon t-c four-level-word">阶梯促销</view>
-                  </view>
-                </view>
-                <view class="cx-obtain-coupon wsize">
-                  <text class="bg_jj"></text>
-                </view>
-              </view>
-            </view>
-          </block>
-        </block>
+<!--        <block wx:if="{{item.show_can_cx}}">-->
+<!--          <block  wx:for="{{item.show_can_cx}}" wx:for-item="pitem">-->
+<!--            <view class="bdb16" wx:if="{{pitem.is_duo_gd && pitem.act_arr.length>1}}" >-->
+<!--              <view bindtap="switch_cx_group"-->
+<!--                    data-index="{{pidx}}"-->
+<!--                    data-gd_key="{{index}}"-->
+<!--                    class="cx-frame flex" style="position: relative">-->
+<!--                <view class="cx-sizs fs30">促销</view>-->
+<!--                <view class="flex ai_c f1 pdh20">-->
+<!--                  <view class="xc-coupon-fram" wx:for="{{pitem.act_arr}}" >-->
+<!--                    <view wx:if="{{item.prom_type==3}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">优惠促销</view>-->
+<!--                    <view wx:if="{{item.prom_type==5}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">搭配促销</view>-->
+<!--                    <view wx:if="{{item.prom_type==7}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">组合购</view>-->
+<!--                    <view wx:if="{{item.prom_type==10}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">阶梯促销</view>-->
+<!--                  </view>-->
+<!--                </view>-->
+<!--                <view class="cx-obtain-coupon wsize">-->
+<!--                  <text class="bg_jj"></text>-->
+<!--                </view>-->
+<!--              </view>-->
+<!--            </view>-->
+<!--          </block>-->
+<!--        </block>-->
+
+
         <!-- 使用搭配 -->
         <cart_collect_temp id="col{{pidx}}"
@@ -327,12 +384,16 @@
         </view>
               <!-- 保障服务 -->
-      <view class="bz_view flex bdt16" wx:if="{{bconfig.service_bz}}">
-          <image class="bzfu_img" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image>
-          <view class="flex f1  rel" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}">
-            <view class="bz-content showArea {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view>
+         <view class="bz_view22 flex bdt16 ai_c" wx:if="{{bconfig.service_bz}}">
+          <image class="bzfu_img22" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image>
+          <view class="flex f1 ai_c rel22" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}">
+            <view class="bz-content22 showArea22 {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view>
+            <view class="bz-content22 hideArea22">{{bconfig.service_bz}}</view>
+            <view class="cx-obtain-coupon22 wsize22 arrow22" wx:if="{{showFold}}">
+              <text class="bg_jj22 down22 {{flag ? 'up22':''}}"></text>
+            </view>
           </view>
-      </view>
+        </view>
@@ -588,12 +649,16 @@
       </view>
               <!-- 保障服务 -->
-      <view class="bz_view flex bdt16" wx:if="{{bconfig.service_bz}}">
-          <image class="bzfu_img" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image>
-          <view class="flex f1  rel" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}">
-            <view class="bz-content showArea {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view>
+              <view class="bz_view22 flex bdt16 ai_c" wx:if="{{bconfig.service_bz}}">
+          <image class="bzfu_img22" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image>
+          <view class="flex f1 ai_c rel22" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}">
+            <view class="bz-content22 showArea22 {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view>
+            <view class="bz-content22 hideArea22">{{bconfig.service_bz}}</view>
+            <view class="cx-obtain-coupon22 wsize22 arrow22" wx:if="{{showFold}}">
+              <text class="bg_jj22 down22 {{flag ? 'up22':''}}"></text>
+            </view>
           </view>
-      </view>
+        </view>
       <!-- 留言 -->
       <view class="coupon-mes flex-vertical">
@@ -1180,6 +1180,9 @@ margin-left: 20rpx;
     padding: 6rpx 16rpx;
 }
+.xc-coupon-fram .xc-coupon.gray{
+    background-color: #bbb;
+}
 .xc-coupon-fram .xc-circular {
     width: 16rpx;
@@ -16,13 +16,43 @@ function is_more_act(items,show_can_cx){
 function check_show(items,sele_prom_type){
    if([7,10].indexOf(sele_prom_type)>-1){
-       if(!items.is_act_last) return false;
+       if(items.is_act_last==0) return false;
    }
    return true;
 }
+
+//goods_id 商品的id
+//index多活动的索引
+//is_act_last 是不是最后一个
+
+function check_is_last(index,goods_id,is_act_last){
+    var gd_arr=index.split(',');
+    var idx=-1;
+    //-- 判断有没有包含商品 --
+    for(var i=0;i<gd_arr.length;i++){
+        var ch=gd_arr[i];
+        if(parseFloat(ch)==parseFloat(goods_id)){
+            idx=i;
+            break
+        }
+    }
+    if(idx<0){
+        return false;
+    }
+    //-- 判断是不是活动的最后一个商品 --
+    if(idx==gd_arr.length-1){
+        return true;
+    }
+    return false;
+
+}
+
+
+
 module.exports = {
   format: format,
   is_more_act:is_more_act,
-  check_show:check_show
+  check_show:check_show,
+  check_is_last:check_is_last
 }
@@ -115,6 +115,7 @@ module.exports = {
                     new_g.goods_num = num;
                     new_g.prom_type = 0;
                     new_g.prom_id = 0;
+                    new_g.is_ld_split=1;
                     goods.push(new_g);
                     //goods.splice(idx, 1);
                 }
@@ -253,6 +253,10 @@ module.exports = {
                     }
                 }
+
+
+                //-- 暂存的数组 --
+                var temp_arr=[];
                 if (Object.keys(goods_map).length) {
                     //这里就开始拆分提交订单时的列表
                     for (let j in goods_map) {
@@ -264,11 +268,14 @@ module.exports = {
                         })
                         goods[idx].goods_num -= num;
                         let new_g = JSON.parse(JSON.stringify(goods[idx]));
+
+                        if(new_g.more_cx) delete new_g.more_cx;
                         new_g.goods_num = num;
                         new_g.prom_type = 0;
                         new_g.prom_id = 0;
-                        goods.push(new_g);
-
+                        new_g.is_zh_split = 1;  //-- 是组合购拆分出去的 --
+                        //暂时存储一下
+                        temp_arr.push(new_g);
                         //如果商品的数量已经为空了
                         if (goods[idx].goods_num <= 0) {
                             goods.splice(idx, 1);
@@ -276,18 +283,26 @@ module.exports = {
                     }
                 }
-
+                var ls=-1;
                 //-- 只统计是参与活动的商品 --
                 for (var ij in goods) {
-                    goods[ij].is_act_last=0;
                     var iter = goods[ij];
                     if (iter.prom_type != 7 || iter.prom_id != act.id) {
                         continue;
                     }
+                    goods[ij].is_act_last=0;
                     all_price0 += iter.goods_num * iter.goods_price;
+                    ls= parseInt(ij);
                 }
-
-                goods[goods.length-1].is_act_last=1;
+                //-- 要在特定的位置插入商品 --
+                if(temp_arr){
+                    for(var gh=0;gh<temp_arr.length;gh++){
+                        var idx=gh+ls+1;
+                        goods.splice(idx, 0,temp_arr[gh]);
+                    }
+                    ls+=temp_arr.length;
+                }
+                goods[ls].is_act_last=1;
                 //-- 活动的条件已经满足 --
                 c_item.zh_prom_goods[act.id].is_has_zh = 1;
@@ -305,6 +320,9 @@ module.exports = {
             } else {
+
+                goods[goods.length-1].is_act_last=1;
+
                 for (let ii in goods) {
                     let item = goods[ii];
                     if (item.prom_type != 7) continue;
@@ -83,7 +83,31 @@ Page({
     is_pre_cut:0, //是否可以使用预存 0是不可以1的可以
     same_ok:1,  //同城配送的控制，默认ok
-    bconfig:null
+    bconfig:null,
+    showFold:true,
+  },
+
+
+
+  onReady() {
+
+    setTimeout(() => {
+      wx.createSelectorQuery().selectAll(".showArea, .hideArea").boundingClientRect(res => {
+        if (res.length != 0) {
+          this.setData({
+            showFold: res[0].height < res[1].height,
+          });
+        };
+
+      }).exec();
+    }, 1000);
+
+  },
+  
+  clickCollapse() {
+    this.setData({
+      flag: !this.data.flag,
+    })
   },
   onLoad: function (t) {
     wx.setNavigationBarTitle({ title: "填写订单", })
@@ -125,12 +125,16 @@
 			</view>
             <!-- 保障服务 -->
-            <view class="bz_view flex bdt16" wx:if="{{bconfig.service_bz}}">
-          <image class="bzfu_img" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image>
-          <view class="flex f1  rel" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}">
-            <view class="bz-content showArea {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view>
+            <view class="bz_view22 flex bdt16 ai_c" wx:if="{{bconfig.service_bz}}">
+          <image class="bzfu_img22" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image>
+          <view class="flex f1 ai_c rel22" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}">
+            <view class="bz-content22 showArea22 {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view>
+            <view class="bz-content22 hideArea22">{{bconfig.service_bz}}</view>
+            <view class="cx-obtain-coupon22 wsize22 arrow22" wx:if="{{showFold}}">
+              <text class="bg_jj22 down22 {{flag ? 'up22':''}}"></text>
+            </view>
           </view>
-      </view>
+        </view>
 			<view class="coupon-mes flex-vertical">
 				<view>留言</view>
@@ -492,7 +492,7 @@ Page({
     }
     pagePath += "?first_leader=" + this.data.getUserID;
     return {
-      title: "专享礼包",
+      title: "每月礼包",
       path: pagePath,
     }
   },
@@ -505,7 +505,7 @@ Page({
         if(!user_id) user_id=0;
         return {
-            title: '专享礼包',
+            title: '每月礼包',
             imageUrl: this.data.ad_data.ad_code,
             query: 'first_leader='+user_id
         }
@@ -203,7 +203,7 @@ Page({
     }
     pagePath += "?first_leader=" + this.data.getUserID;
     return {
-      title: "专享礼包",
+      title: "每月礼包",
       path: pagePath,
     }
   },
@@ -211,7 +211,7 @@ Page({
     onShareTimeline() {
         getApp().globalData.no_clear=1;
         return {
-            title: '专享礼包',
+            title: '每月礼包',
             imageUrl: this.data.ad_data.ad_code,
             query: "first_leader=" + this.data.getUserID
         }
@@ -67,6 +67,7 @@ Page({
   async buy_pro_group(item1, is_state) {
     //-- 代发商品不参与任何活动 --
     if (item1.whsle_id) return false;
+    if (item1.is_gift) return false;
     var th = this;
     var req_d = {
@@ -1151,7 +1152,7 @@ Page({
     var th = this;
     if (a = isNaN(t.detail.value) || t.detail.value < 1 ? 1 : parseInt(t.detail.value)) {
-      this.clear_req();
+      //this.clear_req();
       var s = {
         goods_num: a,
@@ -1163,7 +1164,9 @@ Page({
     }
   },
-  //-------------加数量---------------------
+  //-------------加减数量的时候，要把show_can_cx清理掉，
+  // 同时应该记录一下当前是什么活动那个，如果切换后的活动有跟切换前的活动一样是，就要让切换后的活动的值匹配选中-------------
+
   clear_req: function () {
     var carr = this.data.requestData;
     for (var i = 0; i < carr.length; i++) {
@@ -1215,7 +1218,7 @@ Page({
       }
     }
-    this.clear_req();
+    //this.clear_req();
     var e = {
       goods_num: a.goods_num + add_num,
@@ -1244,7 +1247,7 @@ Page({
     }
     if (1 != a.goods_num) {
-      this.clear_req();
+      //this.clear_req();
       var add_num = 1;
       if ([0, 3, 5, 7, 10].indexOf(a.prom_type) > -1) {
         var cx_arr = await getApp().get_has_cx_act(a.goods_id);
@@ -1437,7 +1440,6 @@ Page({
           [txt0]: {},
         });
-
         if (e.data.checkAllToggle) {
           var txt = "requestData[" + i + "].selected";
           e.setData({
@@ -1678,6 +1680,12 @@ Page({
       fir = 0,
       iarr = item;
+    //清空-- 多个促销的切换 --
+    var txt0 = "requestData[" + pitems + "].show_can_cx";
+    e.setData({
+      [txt0]: {},
+    });
+
     if (!sele) {
       var check_is_service_selected = 0;
       for (var ii in garr) {
@@ -1809,11 +1817,15 @@ Page({
       sele_arr[i] = !sele;
     }
+    th.data.pitems=-1;
+    if (!sele) {
+      th.data.pitems=pitems;
+    }
+
+
     //-- 回调判断活动有没有冲突 --
     this.cx_check_ok(pitems, sele_arr, function (the_res) {
       if (the_res.code == 0) {
-
-
         //-- 门店是所有的商品都要选择 --
         for (var i = 0; i < item.length; i++) {
           var txt0 = "requestData[" + pitems + "].goods[" + i + "].selected";
@@ -1830,8 +1842,6 @@ Page({
         th.doCheckAll(async function () {
-
-
           e.data.duo_zp_num_arr = {};
           if (sele) {
             await e.check_prom_activity(pitems);
@@ -2038,17 +2048,11 @@ Page({
           });
           //要先处理了，再来判断要不要显示凑单
           th.doCheckAll(async function () {
-            if (a.prom_type == 3) {
-              e.data.duo_zp_num_arr = {};
-              if (!a.selected) {
-                await e.check_prom_activity(pitems);
-              }
+              th.data.duo_zp_num_arr={};
               //判断商品是不是优惠活动
               for (var i in e.data.requestData) {
-                if (!a.selected && i == pitems) continue;
                 await e.check_prom_activity(i);
               }
-            }
           });
         } else {
@@ -2148,7 +2152,7 @@ Page({
     this.doCheckAll();
   },
-  //----------检查是否全选---------
+  //----------检查是否全选，同时检验各种活动---------
   doCheckAll: async function (func, n_ok) {
     var th = this,
       tfeel = 0,
@@ -2191,6 +2195,7 @@ Page({
       if(car.length>1 && c_ind>-1){
           var ite2 = car[c_ind].goods;
+          //检验和设置商品的最终是以 取用什么活动，因为多促销
           await m_cx.cart_cx_group(th, ite2, car[c_ind], 0, n_ok, (show_can_cx) => {
             rd_arr[c_ind]=show_can_cx;
           })
@@ -2203,15 +2208,37 @@ Page({
         car[a].zh_map = null;
         car[a].ladder_map = null;
+        //-- 这里是清理了组合购的去凑单 --
+        var txt = "requestData[" + a + "].need_list";
+        //car[a].need_list = [];
+        th.setData({[txt]:[]});
+        //-- 这里清理赠品 --
+        var txt2 = "requestData[" + a + "].send_gift_arr";
+        //car[a].need_list = [];
+        th.setData({[txt2]:[]});
+        //-- 这里是清理了优惠的去凑单 --
+        var rq_text2 = "requestData[" + a + "].make_up_arr";
+        this.setData({
+          [rq_text2]: null,
+        })
+
+        var item = car[a].goods,is_s_sele = 1;
-        var item = car[a].goods,
-          is_s_sele = 1;
         //-- 先批量判断一下活动的类型，同时要同步跟新 --
-
         var offline_price = 0;
         var offline_num = 0;
         for (var c = 0; c < item.length; c++) {
-          if (item[c].is_gift) continue;
+          //清理一下赠品
+          if (item[c].is_gift) {
+            var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item[c].id;
+            //getApp().request.delete(url, {});
+            await getApp().request.promiseDelete(url, {}) // 要用同步让赠品删除
+            item.splice(c, 1);
+            //索引要回退一下
+            --c;
+            continue;
+          }
+
           all_num += item[c].goods_num;
           if (item[c].prom_type == 7) {
@@ -2242,7 +2269,6 @@ Page({
           } else {
-
             if (item[c].prom_type == 7) {
               //先把商品放入组合计算的专用的区域
               console.log('是组合商品---')
@@ -2287,8 +2313,10 @@ Page({
         });
         var txt1 = "requestData[" + a + "].show_can_cx";
+        var txt_g = "requestData[" + a + "].goods";
         th.setData({
-          [txt1]: show_can_cx
+          [txt1]: show_can_cx,
+          [txt_g]:item
         });
         //-- var et={show_can_cx:show_can_cx};
@@ -2385,7 +2413,8 @@ Page({
             user_id: user_id,
             goods_id: goodsinfo.goods_id,
             prom_type: goodsinfo.prom_type,
-            prom_id: goodsinfo.prom_id
+            prom_id: goodsinfo.prom_id,
+            isnew:1
           },
         }).then(res => {
           var buy_num_data = res.data.data;
@@ -3081,18 +3110,20 @@ Page({
     getApp().request.put("/api/weshop/cart/update", {
       data: t,
       success: async function (ee) {
-        var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num";
+        //-- 要先跟新一下商品的数量，在来计算商品价格  --
+        var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num";
         e.setData({
           [txt]: t.goods_num,
         });
-        e.data.duo_zp_num_arr = {};
-        //await e.check_prom_activity(pitem)
-        for (var i in e.data.requestData) {
-          await e.check_prom_activity(i)
-        }
-        e.doCheckAll();
+        e.doCheckAll(async function (){
+            e.data.duo_zp_num_arr = {};
+            //await e.check_prom_activity(pitem)
+            for (var i in e.data.requestData) {
+              await e.check_prom_activity(i)
+            }
+        });
         getApp().requestCardNum(e);
       }
     });
@@ -3141,6 +3172,9 @@ Page({
     }
     var garr = this.data.requestData;
     var check_is_goods_selected = 0;
+
+    var th=this;
+
     if (garr) {
       for (var ii in garr) {
         for (var ij in garr[ii].goods) {
@@ -3153,25 +3187,23 @@ Page({
     }
     //-- 如果是商品的结算 --
     if (check_is_goods_selected) {
-      var glist = ""; //用逗号隔开的
+      var glist = []; //商品数组
       var map = new Map(); //使用map值键进行运算
-      var map_limit = new Map(); //使用map值键进行存储限购
+
       var g_arr = new Array(); //已选的商品列表
       var user_id = getApp().globalData.user_id;
-      var th = this;
+
       //用于判断是不是积分购的普通购买
       var normal_arr = {};
       var ab = 0; //选中
       wx.showLoading();
       let checkArr7 = []; //组合购选中的数据
-
       let checkObj3 = {}; //优惠促销次数判断
       var zh_buyed_m={};
       var zh_limit_m={}
       var zh_all_ck={};
-
       // let checkOff=false
       for (var i = 0; i < this.data.requestData.length; i++) {
         var i_arr = this.data.requestData[i].goods;
@@ -3239,6 +3271,16 @@ Page({
                 checkObj3[i_arr[j].prom_id] = [i];
               }
             }
+
+            //如果是普通购买的时候。
+            if(i_arr[j].is_integral_normal || i_arr[j].is_pd_normal ){
+               //-- 四大促销 --
+               if([3,5,7,10].indexOf(i_arr[j].prom_tyoe)==-1){
+                   i_arr[j].prom_id=0;
+                   i_arr[j].prom_type=0;
+               }
+            }
+
             //map 的key是不会重复，会覆盖，，
             var ie = {
               goods_id: i_arr[j].goods_id,
@@ -3262,7 +3304,12 @@ Page({
             } else {
               map.set(i_arr[j].goods_id + "", i_arr[j].goods_num);
             }
-            glist += i_arr[j].goods_id + ",";
+            //glist += i_arr[j].goods_id + ",";
+
+            if(!i_arr[j].is_gift){
+               var et= {"prom_type":i_arr[j].prom_type,"prom_id":i_arr[j].prom_id,"goods_id":i_arr[j].goods_id};
+               glist.push(et);
+            }
             ab = 1;
             //-- 获取促销活动是不是有参与 --
@@ -3416,7 +3463,7 @@ Page({
               var ky=zh_ck_arr[xg];
               var zh_buyed=zh_buyed_m[ky]?zh_buyed_m[ky]:0;
               var zh_limit=zh_limit_m[ky]?zh_limit_m[ky]:0;
-              var zh_all=zh_all_ck[ky]?zh_all_ck[ky]:0;
+              var zh_all=zh_all_ck[ky]?zh_all_ck[ky].length:0;
               if(zh_limit<=0) continue;
               if(zh_all+zh_buyed>zh_limit){
@@ -3469,172 +3516,10 @@ Page({
                 return false;
               }
-              glist = glist.substring(0, glist.length - 1);
-              //--取一下商品的限购  以及活动的限购，redis数量--
-              rq.get("/api/weshop/goods/getGoodsListNum", {
-                data: {
-                  goodsidlist: glist,
-                  store_id: oo.stoid
-                },
-                async success(ee) {
-                  console.log(ee);
-                  if (ee.data.code == 0) {
-                    var ddata = ee.data.data,
-                      isok = 1,
-                      gname = "",
-                      err = "";
-                    //--组装--
-                    for (var ij = 0; ij < ddata.length; ij++) {
-                      var val = ddata[ij];
-                      var obj = map_limit.get(val.goods_id + "");
-                      if (obj) continue;
-
-                      var promgoodsbuynum = 0;
-                      var goodsbuynum = 0;
-
-                      //--要获得商品，该用户买了多少件,同步应用--
-                      await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
-                        data: {
-                          store_id: oo.stoid,
-                          user_id: user_id,
-                          goods_id: val.goods_id,
-                          prom_type: val.prom_type,
-                          prom_id: val.prom_id
-                        },
-                      }).then(res => {
-                        var buy_num_data = res.data.data;
-                        if (buy_num_data.promgoodsbuynum) promgoodsbuynum = buy_num_data.promgoodsbuynum;
-                        goodsbuynum = buy_num_data.goodsbuynum;
-                      })
-                      var ie = {
-                        promgoodsbuynum: promgoodsbuynum,
-                        goodsbuynum: goodsbuynum
-                      };
-                      map_limit.set(val.goods_id + "", ie);
-                    }
+              //进行到下一步
+              th.cart_buy_next(glist,map,g_arr,checkArr7)
-                    try {
-                      for (var ind in ddata) {
-                        var val = ddata[ind];
-                        var num = map.get(val.goods_id + "");
-                        if (num <= 0) {
-                          isok = 0;
-                          gname = val.goods_name;
-                          throw "购买数量不能为0";
-                          return false;
-                        }
-
-                        if (val.prom_type == 1 || val.prom_type == 6) {
-                          if (num > val.store_count) {
-                            isok = 0;
-                            gname = val.goods_name;
-                            throw "超出库存";
-                            return false;
-                          }
-                        }
-
-                        if (th.data.sales_rules == 1) {
-                          if (num > val.store_count) {
-                            isok = 0;
-                            gname = val.goods_name;
-                            throw "超出库存";
-                            return false;
-                          }
-                        }
-                        if (num > val.redisnum && val.redisnum && !normal_arr[val.goods_id]) {
-                          isok = 0;
-                          gname = val.goods_name;
-                          throw "超出活动库存";
-                          return false;
-                        }
-                        if (num > val.goods_num - val.buy_num && val.goods_num && !normal_arr[val.goods_id]) {
-                          isok = 0;
-                          gname = val.goods_name;
-                          throw "超出活动库存";
-                          return false;
-                        }
-
-                        var buyed = map_limit.get(val.goods_id + "");
-                        if (num + buyed.goodsbuynum > val.viplimited && val.viplimited > 0) {
-                          isok = 0;
-                          gname = val.goods_name;
-                          throw "超出商品限购";
-                          return false;
-                        }
-
-                        if (num + buyed.promgoodsbuynum > val.buy_limit && val.buy_limit > 0 && !normal_arr[val.goods_id]) {
-                          isok = 0;
-                          gname = val.goods_name;
-                          throw "超出活动限购";
-                          return false;
-                        }
-
-                        var card_field = th.data.card_field;
-                        for (var i = 0; i < g_arr.length; i++) {
-
-                          if (g_arr[i].goods_id == val.goods_id) {
-
-                            //如果会员是等级会员,商品有等级价,且不是活动商品
-                            if (card_field && val[card_field] > 0 &&
-                              ((val.prom_type == 0 && g_arr[i].prom_type == 0) || val.prom_type == 3 || val.prom_type == 4 || val.prom_type == 5 || val.prom_type == 7 || val.prom_type == 10 || normal_arr[val.goods_id])) {
-                              if (g_arr[i].goods_price != val[card_field]) {
-                                isok = 0;
-                                gname = val.goods_name;
-                                throw "商品价格已经变化";
-                              }
-                            } else {
-                              if (g_arr[i].goods_price != val.shop_price && g_arr[i].goods_price != val.prom_price && val.prom_price > 0) {
-                                isok = 0;
-                                gname = val.goods_name;
-                                throw "商品价格已经变化";
-                              }
-                            }
-
-                            //-- 数据的更新 --
-                            var data = {
-                              id: g_arr[i].id,
-                              selected: 1,
-                              store_id: oo.stoid,
-                              prom_type: g_arr[i].prom_type,
-                              prom_id: g_arr[i].prom_id,
-                            };
-                            let gitem = checkArr7.find(item => item.goods_id == g_arr[i].goods_id)
-                            if (gitem) {
-                              data.prom_type = 0
-                              data.prom_id = 0
-                            }
-                            //-- 如果有线下取价的时候 --
-                            if (g_arr[i].is_offline) {
-                              data.pricing_type = g_arr[i].pricing_type;
-                              data.offline_price = g_arr[i].offline_price;
-                            }
-                            rq.put("/api/weshop/cart/update", {
-                              data: data,
-                              success: function (ee) {
-                                console.log(ee);
-                              }
-                            });
-                          }
-                        }
-
-                      }
-                    } catch (e) {
-                      err = e;
-                    }
-                    if (isok == 0) {
-                      t.confirmBox(gname + ":" + err);
-                      wx.hideLoading();
-                      return false;
-                    }
-
-                    wx.hideLoading();
-                    wx.navigateTo({
-                      url: "/packageE/pages/cart/cart2/cart2"
-                    });
-                  }
-                }
-              });
             } else if (res.cancel) {
               wx.hideLoading();
               console.log('用户点击取消')
@@ -3663,166 +3548,9 @@ Page({
           return false;
         }
-        glist = glist.substring(0, glist.length - 1);
-        //--取一下商品的限购  以及活动的限购，redis数量--
-        rq.get("/api/weshop/goods/getGoodsListNum", {
-          data: {
-            goodsidlist: glist,
-            store_id: oo.stoid
-          },
-          async success(ee) {
-            console.log(ee);
-            if (ee.data.code == 0) {
-              var ddata = ee.data.data,
-                isok = 1,
-                gname = "",
-                err = "";
-              //--组装--
-              for (var ij = 0; ij < ddata.length; ij++) {
-                var val = ddata[ij];
-                var obj = map_limit.get(val.goods_id + "");
-                if (obj) continue;
-
-                var promgoodsbuynum = 0;
-                var goodsbuynum = 0;
-
-                //--要获得商品，该用户买了多少件,同步应用--
-                await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
-                  data: {
-                    store_id: oo.stoid,
-                    user_id: user_id,
-                    goods_id: val.goods_id,
-                    prom_type: val.prom_type,
-                    prom_id: val.prom_id
-                  },
-                }).then(res => {
-                  var buy_num_data = res.data.data;
-                  if (buy_num_data.promgoodsbuynum) promgoodsbuynum = buy_num_data.promgoodsbuynum;
-                  goodsbuynum = buy_num_data.goodsbuynum;
-                })
-                var ie = {
-                  promgoodsbuynum: promgoodsbuynum,
-                  goodsbuynum: goodsbuynum
-                };
-                map_limit.set(val.goods_id + "", ie);
-              }
+        //进行到下一步
+        th.cart_buy_next(glist,map,g_arr,checkArr7)
-              try {
-                for (var ind in ddata) {
-                  var val = ddata[ind];
-                  var num = map.get(val.goods_id + "");
-                  if (num <= 0) {
-                    isok = 0;
-                    gname = val.goods_name;
-                    throw "购买数量不能为0";
-                    return false;
-                  }
-
-                  if (val.prom_type == 1 || val.prom_type == 6) {
-                    if (num > val.store_count) {
-                      isok = 0;
-                      gname = val.goods_name;
-                      throw "超出库存";
-                      return false;
-                    }
-                  }
-
-                  if (th.data.sales_rules == 1) {
-                    if (num > val.store_count) {
-                      isok = 0;
-                      gname = val.goods_name;
-                      throw "超出库存";
-                      return false;
-                    }
-                  }
-                  if (num > val.redisnum && val.redisnum && !normal_arr[val.goods_id]) {
-                    isok = 0;
-                    gname = val.goods_name;
-                    throw "超出活动库存";
-                    return false;
-                  }
-                  if (num > val.goods_num - val.buy_num && val.goods_num && !normal_arr[val.goods_id]) {
-                    isok = 0;
-                    gname = val.goods_name;
-                    throw "超出活动库存";
-                    return false;
-                  }
-
-                  var buyed = map_limit.get(val.goods_id + "");
-                  if (num + buyed.goodsbuynum > val.viplimited && val.viplimited > 0) {
-                    isok = 0;
-                    gname = val.goods_name;
-                    throw "超出商品限购";
-                    return false;
-                  }
-
-                  if (num + buyed.promgoodsbuynum > val.buy_limit && val.buy_limit > 0 && !normal_arr[val.goods_id]) {
-                    isok = 0;
-                    gname = val.goods_name;
-                    throw "超出活动限购";
-                    return false;
-                  }
-
-                  var card_field = th.data.card_field;
-                  for (var i = 0; i < g_arr.length; i++) {
-
-                    if (g_arr[i].goods_id == val.goods_id) {
-
-                      //如果会员是等级会员,商品有等级价,且不是活动商品
-                      if (card_field && val[card_field] > 0 &&
-                        ((val.prom_type == 0 && g_arr[i].prom_type == 0) || val.prom_type == 3 || val.prom_type == 4 || val.prom_type == 5 || val.prom_type == 7 || val.prom_type == 10 || normal_arr[val.goods_id])) {
-                        if (g_arr[i].goods_price != val[card_field]) {
-                          isok = 0;
-                          gname = val.goods_name;
-                          throw "商品价格已经变化";
-                        }
-                      } else {
-                        if (g_arr[i].goods_price != val.shop_price && g_arr[i].goods_price != val.prom_price && val.prom_price > 0) {
-                          isok = 0;
-                          gname = val.goods_name;
-                          throw "商品价格已经变化";
-                        }
-                      }
-
-                      //-- 数据的更新 --
-                      var data = {
-                        id: g_arr[i].id,
-                        selected: 1,
-                        store_id: oo.stoid,
-                        prom_type: g_arr[i].prom_type,
-                        prom_id: g_arr[i].prom_id,
-                      };
-
-                      //-- 如果有线下取价的时候 --
-                      if (g_arr[i].is_offline) {
-                        data.pricing_type = g_arr[i].pricing_type;
-                        data.offline_price = g_arr[i].offline_price;
-                      }
-                      rq.put("/api/weshop/cart/update", {
-                        data: data,
-                        success: function (ee) {
-                          console.log(ee);
-                        }
-                      });
-                    }
-                  }
-
-                }
-              } catch (e) {
-                err = e;
-              }
-              if (isok == 0) {
-                t.confirmBox(gname + ":" + err);
-                wx.hideLoading();
-                return false;
-              }
-              wx.hideLoading();
-              wx.navigateTo({
-                url: "/packageE/pages/cart/cart2/cart2"
-              });
-            }
-          }
-        });
       }
     } else {
@@ -3858,6 +3586,192 @@ Page({
     }
   },
+
+  cart_buy_next(glist,map,g_arr,checkArr7){
+    var th=this;
+    var map_limit = new Map(); //使用map值键进行存储限购
+    //--取一下商品的限购  以及活动的限购，redis数量--
+    getApp().request.promisePost("/api/weshop/goods/listGoodsListNumNew", {
+      is_json:1,
+      data: {
+        listNumNewDtos: glist,
+        store_id: oo.stoid
+      }
+    }).then(async ee=>{
+        if (ee.data.code == 0) {
+          var ddata = ee.data.data,
+              isok = 1,
+              gname = "",
+              err = "";
+          //--组装--
+          for (var ij = 0; ij < ddata.length; ij++) {
+            var val = ddata[ij];
+
+            var ky=val.goods_id + "-"+val.prom_type + "-"+val.prom_id;
+            var obj = map_limit.get(ky);
+            if (obj) continue;
+
+            var promgoodsbuynum = 0;
+            var goodsbuynum = 0;
+
+            //--要获得商品，该用户买了多少件,同步应用--
+            await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
+              data: {
+                store_id: oo.stoid,
+                user_id:getApp().globalData.user_id,
+                goods_id: val.goods_id,
+                prom_type: val.prom_type,
+                prom_id: val.prom_id,
+                isnew:1
+              },
+            }).then(res => {
+              var buy_num_data = res.data.data;
+              if (buy_num_data.promgoodsbuynum) promgoodsbuynum = buy_num_data.promgoodsbuynum;
+              goodsbuynum = buy_num_data.goodsbuynum;
+            })
+            var ie = {
+              promgoodsbuynum: promgoodsbuynum,
+              goodsbuynum: goodsbuynum
+            };
+            map_limit.set(ky, ie);
+          }
+
+          //try {
+            for (var ind in ddata) {
+              var val = ddata[ind];
+              var num = map.get(val.goods_id + "");
+
+              var ky=val.goods_id + "-"+val.prom_type + "-"+val.prom_id;
+              var buyed = map_limit.get(ky);
+
+              if (num <= 0) {
+                isok = 0;
+                gname = val.goods_name;
+                throw "购买数量不能为0";
+                return false;
+              }
+
+              if (val.prom_type == 1 || val.prom_type == 2) {
+
+                 var s_num=num;
+                 if(th.data.sales_rules> 1) s_num=buyed;
+                  if (s_num > val.store_count) {
+                    isok = 0;
+                    gname = val.goods_name;
+                    throw "超出库存";
+                    return false;
+                  }
+
+                  if (buyed > val.redisnum && val.redisnum) {
+                    isok = 0;
+                    gname = val.goods_name;
+                    err="超出活动库存";
+                    break;
+                  }
+                  if (buyed > val.goods_num - val.buy_num && val.goods_num) {
+                    isok = 0;
+                    gname = val.goods_name;
+                    err="超出活动库存";
+                    break;
+                  }
+
+              }
+
+              if (th.data.sales_rules == 1) {
+                if (num > val.store_count) {
+                  isok = 0;
+                  gname = val.goods_name;
+                  err="超出库存";
+                  break;
+                }
+              }
+
+
+
+              if (num + buyed.goodsbuynum > val.viplimited && val.viplimited > 0) {
+                isok = 0;
+                gname = val.goods_name;
+                err="超出商品限购";
+                break;
+              }
+
+              if (num + buyed.promgoodsbuynum > val.buy_limit && val.buy_limit > 0) {
+                isok = 0;
+                gname = val.goods_name;
+                err="超出活动限购";
+                break;
+              }
+
+              var card_field = th.data.card_field;
+              for (var i = 0; i < g_arr.length; i++) {
+                if (g_arr[i].goods_id == val.goods_id) {
+
+                  //如果会员是等级会员,商品有等级价,且不是活动商品
+                  if (card_field && val[card_field] > 0 &&
+                      ((val.prom_type == 0 && g_arr[i].prom_type == 0) || g_arr[i].prom_type == 3 || g_arr[i].prom_type == 5 || g_arr[i].prom_type == 7 || g_arr[i].prom_type == 10)) {
+                    if (g_arr[i].goods_price != val[card_field]) {
+                      isok = 0;
+                      gname = val.goods_name;
+                      err="商品价格已经变化";
+                      break;
+                    }
+                  } else {
+                    if (g_arr[i].goods_price != val.shop_price && g_arr[i].goods_price != val.prom_price && val.prom_price > 0) {
+                       isok = 0;
+                       gname = val.goods_name;
+                       err="商品价格已经变化";
+                       break;
+                    }
+                  }
+
+                  //-- 数据的更新 --
+                  var data = {
+                    id: g_arr[i].id,
+                    selected: 1,
+                    store_id: oo.stoid,
+                    prom_type: g_arr[i].prom_type,
+                    prom_id: g_arr[i].prom_id,
+                  };
+                  let gitem = checkArr7.find(item => item.goods_id == g_arr[i].goods_id)
+                  if (gitem) {
+                    data.prom_type = 0
+                    data.prom_id = 0
+                  }
+                  //-- 如果有线下取价的时候 --
+                  if (g_arr[i].is_offline) {
+                    data.pricing_type = g_arr[i].pricing_type;
+                    data.offline_price = g_arr[i].offline_price;
+                  }
+                  rq.put("/api/weshop/cart/update", {
+                    data: data,
+                    success: function (ee) {
+                      console.log(ee);
+                    }
+                  });
+                }
+              }
+
+              if(!isok) break;
+
+            }
+          // } catch (e) {
+          //   err = e;
+          // }
+          if (isok == 0) {
+            t.confirmBox(gname + ":" + err);
+            wx.hideLoading();
+            return false;
+          }
+
+
+          wx.hideLoading();
+          wx.navigateTo({
+            url: "/packageE/pages/cart/cart2/cart2"
+          });
+        }
+    })
+  },
+
   //结算到最后一个商品
   set_last: function (ab, isok, gname) {
     if (isok == 0) {
@@ -4056,6 +3970,7 @@ Page({
       this.setData({
         [gift_text]: null,
       })
+
       return false;
     }
     //-- 循环判断活动 --
@@ -4148,7 +4063,6 @@ Page({
         continue;
       }
-
       //-- 只有在单赠品的时候，才要进行计算 --
       await getApp().request.promiseGet("/api/weshop/goods/getDiscount", {
         data: {
@@ -4163,7 +4077,6 @@ Page({
       })
       if (discount) {
-
         if (!discount.zp_num || parseInt(discount.zp_num) == 0) discount.zp_num = 1;
         //判断一下赠品的模式
         if (parseInt(discount.zp_mode) == 1) {
@@ -4176,7 +4089,7 @@ Page({
           }
           var t_zp_num = parseInt(discount.zp_num) * parseInt(discount.bs);
-          if (th.data.duo_zp_num_arr[prom.id]) {
+          if (th.data.duo_zp_num_arr && th.data.duo_zp_num_arr[prom.id]) {
             t_zp_num += th.data.duo_zp_num_arr[prom.id];
           }
@@ -4185,6 +4098,7 @@ Page({
             json.prom_id = prom.id;
             json.prom_name = prom.name;
             send_gift_arr.push(json);
+            if(!th.data.duo_zp_num_arr) th.data.duo_zp_num_arr={};
             th.data.duo_zp_num_arr[prom.id] = t_zp_num;
           }
@@ -4309,6 +4223,7 @@ Page({
     }
     return user_pre_buynum
   },
+
   async all_check_prom_activity() {
     this.data.duo_zp_num_arr = {};
     for (var i in this.data.requestData) {
@@ -4675,21 +4590,34 @@ Page({
       return false;
     }
-    var url = "/api/weshop/activitylist/getGoodActInfo";
-    var req_data = {
-      store_id: os.stoid,
-      goodsidlist: gd,
-      is_detail: 1,
-      user_id: user_id
-    };
+    // var url = "/api/weshop/activitylist/getGoodActInfo";
+    // var req_data = {
+    //   store_id: os.stoid,
+    //   goodsidlist: gd,
+    //   is_detail: 1,
+    //   user_id: user_id
+    // };
+    var url = '/api/weshop/activitylist/listGoodActInfo2New';
+    var req_d = {
+      "store_id": os.stoid,
+      "goods_id": gd,
+      "user_id": user_id,
+    }
-    //获取秒杀的多规格 
+    //获取秒杀的多规格
     getApp().request.promiseGet(url, {
-      data: req_data
+      data: req_d
     }).then(res => {
       if (res.data.code == 0 && res.data.data) {
-        if (res.data.data.length == 1) {
-          var item = res.data.data[0];
+
+        var arr = res.data.data;
+        //-- 预热也要计算 --
+        var arr2 = arr.filter(function (e) {
+          return e.s_time < ut.gettimestamp() || (e.warm_uptime && e.warm_uptime < ut.gettimestamp())
+        })
+
+        if (arr2.length == 1) {
+          var item =arr2[0];
           switch (item.prom_type) {
             case 9:
               good_url = '/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + gd + '&group_id=' + item.act_id;
@@ -4752,26 +4680,26 @@ Page({
   //--- 选择回来时候的选择 ---
   sure_cx_group: function (e) {
     var th = this;
-    var sele_idx = e.detail.sele_idx;
+    var sele_prom_type=e.detail.sele_prom_type;
+    //-- 获取到当前的 show_can_cx--
     var idx = this.data.sele_cx_group_cidx;
     var gd_key = this.data.cx_group_gd_key;
-    //-- 获取到--
     var cx_prom_group = this.data.requestData[idx].show_can_cx[gd_key].act_arr;
     var fir_sele = 0;
-
     for (var dx = 0; dx < cx_prom_group.length; dx++) {
       if (cx_prom_group[dx].sele) fir_sele = dx;
-      if (dx != sele_idx) cx_prom_group[dx].sele = 0;
+      if (cx_prom_group[dx].prom_type!= sele_prom_type) cx_prom_group[dx].sele = 0;
       else cx_prom_group[dx].sele = 1;
     }
+    // -- 判断 --
     this.cx_check_ok2(async function (the_rs) {
       if (the_rs.code == 0) {
         th.data.change_act = 1;
-
         th.doCheckAll(async function () {
+          th.data.duo_zp_num_arr={};
           for (var i in th.data.requestData) {
             await th.check_prom_activity(i)
           }
@@ -4929,7 +4857,7 @@ Page({
           'user_id': getApp().globalData.user_id,
           'goods_id': gid,
           'prom_type': 7,
-          'prom_id': pid
+          'prom_id': pid, isnew:1
         };
         var res = await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
@@ -141,10 +141,10 @@
                         <view class="cx-sizs fs30">可参促销</view>
                         <view class="flex ai_c f1 pdh20">
                             <view class="xc-coupon-fram" wx:for="{{item.show_can_cx[items.goods_id].act_arr}}" >
-                                <view wx:if="{{item.prom_type==3}}" class="xc-coupon t-c four-level-word">优惠促销</view>
-                                <view wx:if="{{item.prom_type==5}}" class="xc-coupon t-c four-level-word">搭配促销</view>
-                                <view wx:if="{{item.prom_type==7}}" class="xc-coupon t-c four-level-word">组合购</view>
-                                <view wx:if="{{item.prom_type==10}}" class="xc-coupon t-c four-level-word">阶梯促销</view>
+                                <view wx:if="{{item.prom_type==3}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }}">优惠促销</view>
+                                <view wx:if="{{item.prom_type==5}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">搭配促销</view>
+                                <view wx:if="{{item.prom_type==7}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }} ">组合购</view>
+                                <view wx:if="{{item.prom_type==10}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }}">阶梯促销</view>
                             </view>
                         </view>
                         <view class="cx-obtain-coupon wsize">
@@ -170,10 +170,10 @@
                               <view class="cx-sizs fs30">可参促销</view>
                               <view class="flex ai_c f1 pdh20">
                                   <view class="xc-coupon-fram" wx:for="{{pitem.act_arr}}" >
-                                      <view wx:if="{{item.prom_type==3}}" class="xc-coupon t-c four-level-word">优惠促销</view>
-                                      <view wx:if="{{item.prom_type==5}}" class="xc-coupon t-c four-level-word">搭配促销</view>
-                                      <view wx:if="{{item.prom_type==7}}" class="xc-coupon t-c four-level-word">组合购</view>
-                                      <view wx:if="{{item.prom_type==10}}" class="xc-coupon t-c four-level-word">阶梯促销</view>
+                                      <view wx:if="{{item.prom_type==3}}" class="xc-coupon t-c four-level-word  {{!item.sele?'gray':'' }} ">优惠促销</view>
+                                      <view wx:if="{{item.prom_type==5}}" class="xc-coupon t-c four-level-word  {{!item.sele?'gray':'' }} ">搭配促销</view>
+                                      <view wx:if="{{item.prom_type==7}}" class="xc-coupon t-c four-level-word  {{!item.sele?'gray':'' }}">组合购</view>
+                                      <view wx:if="{{item.prom_type==10}}" class="xc-coupon t-c four-level-word {{!item.sele?'gray':'' }}">阶梯促销</view>
                                   </view>
                               </view>
                               <view class="cx-obtain-coupon wsize">
@@ -435,9 +435,13 @@ page {
   /* margin:0 auto; */
   color: #fff;
   padding: 6rpx 20rpx;
+}
+.xc-coupon-fram .xc-coupon.gray{
+  background-color: #bbb;
 }
+
 .xc-coupon-fram .xc-circular {
   width: 16rpx;
   height: 16rpx;
@@ -75,7 +75,31 @@ Page({
     same_ok:1,  //同城配送的控制，默认ok
-    bconfig:null
+    bconfig:null,
+    showFold:true,
+  },
+
+
+
+  onReady() {
+
+    setTimeout(() => {
+      wx.createSelectorQuery().selectAll(".showArea, .hideArea").boundingClientRect(res => {
+        if (res.length != 0) {
+          this.setData({
+            showFold: res[0].height < res[1].height,
+          });
+        };
+
+      }).exec();
+    }, 1000);
+
+  },
+  
+  clickCollapse() {
+    this.setData({
+      flag: !this.data.flag,
+    })
   },
   onLoad: function (t) {
     console.log("onLoad_pt_cart");
@@ -125,12 +125,16 @@
       </view>
             <!-- 保障服务 -->
-            <view class="bz_view flex bdt16" wx:if="{{bconfig.service_bz}}">
-          <image class="bzfu_img" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image>
-          <view class="flex f1  rel" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}">
-            <view class="bz-content showArea {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view>
+            <view class="bz_view22 flex bdt16 ai_c" wx:if="{{bconfig.service_bz}}">
+          <image class="bzfu_img22" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image>
+          <view class="flex f1 ai_c rel22" style="position: relative;" bindtap="{{showFold ? 'clickCollapse':''}}">
+            <view class="bz-content22 showArea22 {{flag ? '':'ellipsis-1x'}}">{{bconfig.service_bz}}</view>
+            <view class="bz-content22 hideArea22">{{bconfig.service_bz}}</view>
+            <view class="cx-obtain-coupon22 wsize22 arrow22" wx:if="{{showFold}}">
+              <text class="bg_jj22 down22 {{flag ? 'up22':''}}"></text>
+            </view>
           </view>
-      </view>
+        </view>
       <view class="coupon-mes flex-vertical">
@@ -267,10 +267,11 @@ Page({
         base_nor_prom_type: 0,
         base_nor_prom_id: 0,
         base_nor_goods_id: 0,
-        user_pre_buynum: 0, //用户优惠促销参与次数
+        user_pre_buynum: 0, //用户优惠促销参与次数,这个字段只针对优惠促销
         keyword: '', //门店搜索
         sec_i: -1, //选中分类门店 下标
         cx_prom_group: [], //促销活动，用于显示和判断默认要用什么促销活动
+        showFold:true,
       },
       //------初始化加载----------
@@ -908,6 +909,10 @@ Page({
         getApp().check_can_share(this);
+        //-- 要清空，因为有回退。优惠促的数组,购买数量要清理成1 --
+        this.data.cx_prom_group=[];
+        this.data.goodsInputNum=1;
+
         var goods_list = null,
           th = this,
           that = this;
@@ -1822,8 +1827,8 @@ Page({
               })
           }
-          //要包含积分购的普通购买0 3,5,7,10
-          else if ([0, 3, 5, 7, 10].indexOf(th.data.prom_type) > -1 || prom.prom_type == 7) {
+          //要包含积分购的普通购买0 3,5,7,10,  is_integral_normal积分普通购买字段
+          else if ([0, 3, 5, 7, 10].indexOf(th.data.prom_type) > -1 || newd.is_integral_normal) {
             newd.prom_type = 0;
             newd.prom_id = 0;
@@ -2061,152 +2066,14 @@ Page({
           });
         } else {
-
-          //-- 这一步主要是要让立即购买 走 购物车的逻辑 参与活动，如果有zh_act就强制组合购购买 --
-          if (th.data.zh_act &&
-            th.data.zh_act.zhbuyqty <= th.data.goodsInputNum && (!th.data.zh_act.zh_num || th.data.zh_act.zh_buy_num < th.data.zh_act.zh_num)) {
-            wx.hideLoading();
-
-            if ((th.data.zh_act.buy_limit != 0 && th.data.zh_act.buy_limit <= th.data.userbuynum)) {
-              wx.showModal({
-                title: '提示',
-                // content: `商品${str},组合购活动，购买次数已超，将以普通商品购买？`,
-                content: `${th.data.data.goods_name}超出组合购限购次数，将以普通商品购买`,
-                success: res => {
-                  if (res.confirm) {
-                    console.log('用户点击确定')
-                    //----先看会员在购物车中是否加入了该商品,立即购买的-----
-                    getApp().request.get("/api/weshop/cart/page", {
-                      data: {
-                        store_id: os.stoid,
-                        user_id: oo.user_id,
-                        state: 1
-                      },
-                      success: function (res) {
-                        //-------如果购物车中有相关的数据---------
-                        if (res.data.code == 0 && res.data.data.total > 0) {
-                          for (let j in res.data.data.pageData) {
-                            let item_j = res.data.data.pageData[j];
-                            var url = '/api/weshop/cart/del/' + e.data.stoid + '/' + item_j.id;
-                            getApp().request.delete(url, {});
-                          }
-                        }
-                        newd.state = 1;
-                        newd.prom_type = 0;
-                        newd.prom_id = 0
-                        getApp().request.post("/api/weshop/cart/save", {
-                          data: newd,
-                          success: function (t) {
-                            th.closeSpecModal();
-                            getApp().goto("/packageE/pages/cart/cart2/cart2?state=1");
-                          }
-                        });
-                      }
-                    })
-                  } else if (res.cancel) {
-
-                    console.log('用户点击取消')
-                  }
-                }
-              })
-            } else {
-
-
-              //----先看会员在购物车中是否加入了该商品,立即购买的-----
-              getApp().request.get("/api/weshop/cart/page", {
-                data: {
-                  store_id: os.stoid,
-                  user_id: oo.user_id,
-                  state: 1
-                },
-                success: function (res) {
-                  //-------如果购物车中有相关的数据,先清理掉---------
-                  if (res.data.code == 0 && res.data.data.total > 0) {
-                    for (let j in res.data.data.pageData) {
-                      let item_j = res.data.data.pageData[j];
-                      var url = '/api/weshop/cart/del/' + e.data.stoid + '/' + item_j.id;
-                      getApp().request.delete(url, {});
-                    }
-                  }
-
-                  newd.state = 1;
-                  newd.prom_type = 7;
-                  newd.prom_id = th.data.zh_act.id;
-                  getApp().request.post("/api/weshop/cart/save", {
-                    data: newd,
-                    success: function (t) {
-                      th.closeSpecModal();
-                      getApp().goto("/packageE/pages/cart/cart2/cart2?state=1");
-                    }
-                  });
-
-                }
-              })
-            }
-
-
-            return false
-          } else {
-            //----先看会员在购物车中是否加入了该商品,立即购买的-----
-            getApp().request.get("/api/weshop/cart/page", {
-              data: {
-                store_id: os.stoid,
-                user_id: oo.user_id,
-                state: 1
-              },
-              success: function (res) {
-                //-------如果购物车中有相关的数据---------
-                if (res.data.code == 0 && res.data.data.total > 0) {
-                  for (let j in res.data.data.pageData) {
-                    let item_j = res.data.data.pageData[j];
-                    var url = '/api/weshop/cart/del/' + e.data.stoid + '/' + item_j.id;
-                    getApp().request.delete(url, {});
-                  }
-                }
-
-              }
-            })
-
-          }
-
-          if (th.data.prom_goods && newd.prom_type != 4 && newd.prom_type != 6) {
-            var prom_d = th.data.prom_goods;
-            for (var i in prom_d) {
-              //判断活动有俩种条件，0元 1件
-              var condition_t = prom_d[i].prom_type;
-              switch (condition_t) {
-                case 0: //按钱
-                  if (newd.goods_price >= condition_t) {
-                    newd.prom_type = 3;
-                    newd.prom_id = prom_d[i].prom_id;
-                  }
-                  break
-                case 1: //按购买数量
-                  if (newd.goods_num >= condition_t) {
-                    newd.prom_type = 3;
-                    newd.prom_id = prom_d[i].prom_id;
-                  }
-                  break;
-              }
-            }
-          }
-          //如果有阶梯促销的时候
-          if (th.data.jieti_prom && (newd.prom_type == 10 || newd.prom_type == 0)) {
-            newd.prom_type = 10;
-            newd.prom_id = th.data.ladder_act_id;
-          } else {
-            //-- 优惠促销的商品，立即购买就判断了,就直接购买 --
-            if ([1, 2, 4, 6].indexOf(newd.prom_type) == -1) {
-              newd.prom_type = 0;
-              newd.id = 0;
-            }
-          }
+            newd.prom_type = 0;
+            newd.id = 0;
             newd['pick_name'] = th.data.sto_sele_name;
             newd['pick_dis'] = th.data.sto_sele_distr;
             th.buyNow(newd);
-          }
-        },
+         }
+      },
         //因为在购物车  普通商品和 优惠促销，搭配购，组合购 阶梯购是一样的
         check_is_like(e, newd, idx) {
@@ -2671,9 +2538,7 @@ Page({
           },
           openSpecModel: function (t) {
-
-
-
+        
             var th = this;
             var open_store = t.currentTarget.dataset.ind;
@@ -2768,10 +2633,10 @@ Page({
             var th = this;
             var usr = getApp().globalData.userInfo;
             if (this.data.sele_g.prom_type != 0 && this.data.sele_g.prom_type != 3 && !this.data.sele_g.whsle_id) {
-              callback();
+               callback();
             } else {
-              //-- 判断有没有优惠活动 --
-              getApp().request.promiseGet("/api/weshop/goods/getGoodsPromListNew1/" + os.stoid + "/" + th.data.sele_g.goods_id + "/0" + "/" + usr.user_id, {}).then(async res => {
+               //-- 判断有没有优惠活动 --
+               getApp().request.promiseGet("/api/weshop/goods/getGoodsPromListNew1/" + os.stoid + "/" + th.data.sele_g.goods_id + "/0" + "/" + usr.user_id, {}).then(async res => {
                 if (res.data.code == 0) {
                   var r_data = res.data.data;
@@ -2823,7 +2688,6 @@ Page({
             }
           },
-
           //----获取线下价格-------
           get_off_price() {
             var th = this;
@@ -4984,7 +4848,7 @@ Page({
                           data: {
                             store_id: os.stoid,
                             user_id: user_id,
-                            goods_id: gd.goods_id
+                            goods_id: gd.goods_id, isnew:1
                           },
                           success: function (t) {
                             if (t.data.code == 0) {
@@ -5012,7 +4876,7 @@ Page({
                                     user_id: user_id,
                                     goods_id: gd.goods_id,
                                     prom_type: gd.prom_type,
-                                    prom_id: gd.prom_id
+                                    prom_id: gd.prom_id, isnew:1
                                   },
                                   //-----获取-----
                                   success: function (tt) {
@@ -7515,6 +7379,12 @@ Page({
                             //普通购买的时候，重新算一下组合购有没有
                             if (is_nor || is_spec) {
+
+
+                              th.setData({
+                                cx_prom_group: []
+                              })
+
                               var arr3 = null;
                               var url = '/api/weshop/activitylist/listGoodActInfo2New';
                               var req_d = {
@@ -7616,39 +7486,97 @@ Page({
                                 if (r_data.promGoodsLists) {
                                   var fir_act = r_data.promGoodsLists[0];
+                                  var is_yh_out_limit=0;
+
+
                                   //-- 计算一下限购，满足限购数才显示  --
-                                  await this.getUserBuyPromNum_pre(fir_act.prom_id);
-
-                                  if (!fir_act.limit_num || th.data.user_pre_buynum < fir_act.limit_num) {
-                                    var more_arr = [];
-                                    //减价
-                                    if (fir_act.money > 0) more_arr.push('减价' + fir_act.money + '元');
-                                    if (fir_act.sale > 0) more_arr.push('打' + fir_act.sale + '折');
-                                    if (fir_act.past == 1) more_arr.push('包邮');
-                                    if (fir_act.intValue > 0) more_arr.push('送' + fir_act.intValue + '积分');
-                                    if (fir_act.couponId > 0) more_arr.push('送' + fir_act.couponMoney + '元优惠券');
-                                    if (fir_act.gift_id) {
-                                      var is_more_gf = fir_act.gift_id.split(',')
-                                      if (is_more_gf.length > 1) {
-                                        more_arr.push('送赠品');
-                                      } else {
-                                        more_arr.push('送' + fir_act.goods_name + ' x' + fir_act.zp_num);
-                                      }
+                                  if (fir_act.limit_num ) {
+                                    await this.getUserBuyPromNum_pre(fir_act.prom_id);
+                                    if(th.data.user_pre_buynum >= fir_act.limit_num){
+                                      is_yh_out_limit=1;
                                     }
-                                    if (fir_act.lb_id) more_arr.push('送' + fir_act.lbtitle);
-                                    if (fir_act.zxlb_id) more_arr.push('送' + fir_act.zxlbtitle);
-                                    if (fir_act.monthgiftbag_id) more_arr.push('送' + fir_act.monthgiftbag_title);
+                                  }
+                                    // var more_arr = [];
+                                    // //减价
+                                    // if (fir_act.money > 0){
+                                    //
+                                    //      more_arr.push({
+                                    //        text:'减价' + fir_act.money + '元',
+                                    //        is_fir:1
+                                    //      });
+                                    // }
+                                    // if (fir_act.sale > 0) {
+                                    //       more_arr.push({
+                                    //         text:'打' + fir_act.sale + '折',
+                                    //         is_fir:1
+                                    //       });
+                                    // }
+                                    // if (fir_act.past == 1) {
+                                    //     more_arr.push({
+                                    //         text:'包邮',
+                                    //         is_fir:1
+                                    //     });
+                                    // }
+                                    // if (fir_act.intValue > 0){
+                                    //    more_arr.push({
+                                    //       text:'送' + fir_act.intValue + '积分',
+                                    //       is_fir:1
+                                    //    });
+                                    // }
+                                    // if (fir_act.couponId > 0) {
+                                    //      more_arr.push({
+                                    //        text:'送' + fir_act.couponMoney + '元优惠券',
+                                    //        is_quan:1
+                                    //      });
+                                    // }
+                                    //
+                                    // if (fir_act.gift_id) {
+                                    //     var is_more_gf = fir_act.gift_id.split(',')
+                                    //     if (is_more_gf.length > 1) {
+                                    //          more_arr.push({
+                                    //              text:'送赠品',
+                                    //              is_gift:1,
+                                    //              prom_id:fir_act.prom_id
+                                    //          });
+                                    //     } else {
+                                    //           more_arr.push({
+                                    //              text:'送' + fir_act.goods_name + ' x' + fir_act.zp_num,
+                                    //              is_gift:1,
+                                    //              prom_id:fir_act.prom_id
+                                    //           });
+                                    //     }
+                                    // }
+                                    // if (fir_act.lb_id){
+                                    //     more_arr.push({
+                                    //       text:'送' + fir_act.lbtitle,
+                                    //       lb_id:fir_act.lb_id
+                                    //     });
+                                    // }
+                                    // if (fir_act.zxlb_id){
+                                    //     more_arr.push({
+                                    //       text:'送' + fir_act.zxlbtitle,
+                                    //       zxlb_id:fir_act.zxlb_id
+                                    //     });
+                                    // }
+                                    // if (fir_act.monthgiftbag_id){
+                                    //     more_arr.push({
+                                    //       text:'送' + fir_act.monthgiftbag_title,
+                                    //       monthgiftbag_id:fir_act.monthgiftbag_id
+                                    //     });
+                                    // }
+                                    var more_arr=ut.format_yh_act(fir_act);
                                     //-- 开始组装数据 --
                                     th.add_cx_prom_group({
                                       id: fir_act.prom_id,
                                       condition: fir_act.condition + (fir_act.prom_type == 1 ? '件' : '元'),
                                       limit: '每人' + (fir_act.limit_num ? '限参与' + fir_act.limit_num + '次' : '参与不限次'),
                                       more: more_arr,
-                                      prom_type: 3
-
+                                      prom_type: 3,
+                                      promGoodsListsDtos:r_data.promGoodsLists,
+                                      is_yh_out_limit:is_yh_out_limit
                                     });
-                                  }
+                                  //}
                                 }
@@ -7663,7 +7591,7 @@ Page({
                                     prom_goods: r_data.promGoodsLists,
                                   })
                                 }
-                                th.is_show_more_buy();
+
                               }
                             })
@@ -7715,6 +7643,8 @@ Page({
                               })
                             }
+                            th.is_show_more_buy();
+
                             //-- 如果有促销活动也算是有参与活动，参与活动的也统一不进行计算起订的数量 --
                             this.data.is_act = 0;
                             if (this.data.zh_act || this.data.prom_goods || this.data.jieti_prom || this.data.collocationGoods) {
@@ -7784,16 +7714,22 @@ Page({
                                 id: 0
                               };
                             }
+
                             var prom = null;
-                            //-- 看有没有选中的活动 --
-                            var fd = this.data.cx_prom_group.findIndex(function (a) {
-                              return a.sele == 1;
-                            })
+                            prom = JSON.parse(JSON.stringify(this.data.cx_prom_group[0]));
+
+                            //-- 要判断有没有超出限购 --
+                            if(prom.prom_type==3 && prom.is_yh_out_limit){
+                                 if(this.data.cx_prom_group.length>1){
+                                     prom=this.data.cx_prom_group[1];
+                                 }else{
+                                     prom.prom_type=0;
+                                     prom.id=0;
+                                 }
+                            }
-                            prom = this.data.cx_prom_group[0];
-                            if (fd > -1) prom = this.data.cx_prom_group[fd];
                             if (ind) {
-                              return prom.prom_type;
+                               return prom.prom_type;
                             }
                             return prom;
                           },
@@ -7826,6 +7762,7 @@ Page({
                               if (this.data.card_field && this.data.sele_g[this.data.card_field] > 0) {
                                 per_price = this.data.sele_g[this.data.card_field];
                               }
+
                               var all_price = per_price * this.data.goodsInputNum;
                               var con = null;
                               for (var i in prom_goods) {
@@ -1642,7 +1642,8 @@ view.cart-btn-lg {
 }
 .bz_view view {
-  max-width: 65%;
+  width: 520rpx;
+  word-break: break-all;
 	/* max-height: 70rpx; */
 	/* overflow: hidden; */
 }
@@ -3372,10 +3373,10 @@ margin: auto; */
 .store-list {
 	width: 95%;
-	min-height: 300rpx;
+	min-height: 700rpx;
 	overflow-y: scroll;
 	margin: auto;
-	max-height: 610rpx;
+	max-height: 700rpx;
 }
 .store-list .store_choose {
@@ -3459,7 +3460,8 @@ margin: auto; */
 /* 门店分类列表 */
 .sort_store_list {
-	max-height: 700rpx;
+  max-height: 700rpx;
+  min-height: 700rpx;
 	overflow: hidden;
 	overflow-y: scroll;
 	width: 95%;
@@ -7,11 +7,11 @@
          <view  class="fs30 ellipsis-1" style="padding: 20rpx 30rpx">
            满{{item.condition}}<text space="{{true}}" wx:if="{{item.prom_type==0}}">元 </text> <text space="{{true}}" wx:else>件 </text>
            <text space="{{true}}" wx:if="{{item.content.is_money && item.content.is_money!='0'}}">减{{item.content.money}}元 </text>
-           <text space="{{true}}" wx:if="{{item.content.past && item.content.past!='0'}}">包邮</text>
+           <text space="{{true}}" wx:if="{{item.content.past && item.content.past!='0'}}">包邮 </text>
            <text space="{{true}}" wx:if="{{item.content.is_sale && item.content.is_sale!='0'}}">打{{item.content.sale}}折 </text>
            <text space="{{true}}" wx:if="{{item.content.is_int && item.content.is_int!='0'}}">送{{item.content.int}}积分 </text>
            <text space="{{true}}" wx:if="{{item.content.is_coupon && item.content.is_coupon!='0'}}">送{{item.content.coupon}}元优惠券 </text>
-           <text space="{{true}}" wx:if="{{item.content.is_gift  && item.content.is_gift!='0'}}">送{{item.content.gift_name}} </text>
+           <text space="{{true}}" wx:if="{{item.content.is_gift  && item.content.is_gift!='0'}}">送{{item.content.zp_mode==1?'多赠品':item.content.gift_name}} </text>
            <text space="{{true}}" wx:if="{{item.content.is_libao && item.content.is_libao!='0'}}">送{{item.content.lb_name}} </text>
          </view>
      </block>
@@ -303,7 +303,7 @@ Page({
         user_id: user_id,
         goods_id: gd.goods_id,
         prom_type: gd.prom_type,
-        prom_id: gd.prom_id
+        prom_id: gd.prom_id, isnew:1
       },
     }).then(res=>{
@@ -350,101 +350,140 @@ Page({
                  url: "/pages/team/team_confirm/team_confirm?orderSn=" + this.data.order.order_sn + "&orderPay=true"
              }) 		   
 		var order=this.data.order;
+
 		var order_goods=order.order_goods;
 		var user_id=order.user_id;
-		
-		var wlist="";	
-		for(var i in order_goods){		
-			var good=order_goods[i];			
-			//线下取价功能已经关闭或者过期
-			if(!th.data.is_open_offline && good.offline_cut>0){
-				 wx.showModal({
-				   title: '提示',
-				   content: '线下取价功能已经关闭或者过期！'
-				 });
-                th.setData({paying:0});
-				 return false;
-		}	
-		
-			//要每件每件的商品进行检查，看有么有超出库存，超出限购
-			var good= order_goods[i],goodsbuynum=0,promgoodsbuynum=0,gg=null;
-			//获取单品的现在的活动状态
-			await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + good.goods_id, {		
-			}).then(res=>{
-				gg=res.data.data;
-			})		
-			var limit = gg.viplimited;
-			var store_count = gg.store_count;
-			good.erpwareid=gg.erpwareid;
-			
-			//---要获得商品，该用户买了多少件,同步应用---
-			await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
-			  data: {
-			    store_id: os.stoid,
-			    user_id: getApp().globalData.user_id,
-			    goods_id: good.goods_id,
-			    prom_type: good.prom_type,
-			    prom_id: good.prom_id
-			  },
-			}).then(res => {
-			   var buy_num_data = res.data.data;
-			   if (buy_num_data.promgoodsbuynum) promgoodsbuynum = buy_num_data.promgoodsbuynum;
-			   goodsbuynum = buy_num_data.goodsbuynum;
-			})
-			
-			var buyed_mum2=goodsbuynum+good.goods_num;		
-			if (buyed_mum2 > limit && limit > 0) {
-			 
-			   var content=gg.goods_name+'购买数量超出商品限购,请取消订单';
-			   th.toast(content);
-               th.setData({paying:0});
-			    return false;
-			}
+
+
+        //如果使用预存的话，要重新效验下预存金额是否足够
+        if(order.pre_cut && order.pre_json){
+            let pickup_id=order.pickup_id
+            let res = await r.promiseGet('/api/weshop/pickup/get/' + os.stoid + '/' + pickup_id, {})
+            let keyid = res.data.data.keyid
+            let resdata = await th.vipadvancesum(keyid,order.pre_cut,order.pre_json)
+            if(resdata.code !=0){
+                let msg=resdata.msg || "预存金额不足"
+                getApp().confirmBox(msg);
+                th.setData({ paying: 0 });
+                return false;
+            }
+        }
+        // 幸运购检查库存量 api/weshop/activitylist/getActLen/{store_id}/{prom_type}/{prom_id}
+        if (parseInt(order_goods['0']['prom_type']) == 9) {
+            var aid = order_goods['0']['prom_id'];
+            var knum = 0;
+            await r.promiseGet('/api/weshop/activitylist/getActLen/' + os.stoid + '/9/' + aid, {
+            }).then(res => {
+                if (res.data.code == 0) {
+                    knum = res.data.data;
+                }
+            });
+
+            if (knum <= 0) {
+                getApp().confirmBox("库存为0，支付失败");
+                th.setData({ paying: 0 });
+                return false;
+            }
+
+        }
+
+        var wlist = "";
+        for (var i in order_goods) {
+            var good = order_goods[i];
+
+
+            //线下取价功能已经关闭或者过期
+            if (!th.data.is_open_offline && good.offline_cut > 0) {
+                wx.showModal({
+                    title: '提示',
+                    content: '线下取价功能已经关闭或者过期！'
+                });
+                th.setData({ paying: 0 });
+                return false;
+            }
+
+            //要每件每件的商品进行检查，看有么有超出库存，超出限购
+            var good = order_goods[i], goodsbuynum = 0, promgoodsbuynum = 0, gg = null, presellList = null;
+
+            //获取单品的现在的活动状态
+            await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + good.goods_id, {}).then(res => {
+                gg = res.data.data;
+            })
+
+            var limit = gg.viplimited;
+            var store_count = gg.store_count;
+            good.erpwareid = gg.erpwareid;
+
+            //---要获得商品，该用户买了多少件,同步应用---
+            await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
+                data: {
+                    store_id: os.stoid,
+                    user_id: user_id,
+                    goods_id: good.goods_id,
+                    prom_type: good.prom_type,
+                    prom_id: good.prom_id
+                },
+            }).then(res => {
+                var buy_num_data = res.data.data;
+                if (buy_num_data.promgoodsbuynum) promgoodsbuynum = buy_num_data.promgoodsbuynum;
+                goodsbuynum = buy_num_data.goodsbuynum;
+            })
+
+            var buyed_mum2 = goodsbuynum + good.goods_num;
+            if (buyed_mum2 > limit && limit > 0) {
+                var content = gg.goods_name + '购买数量超出商品限购,请取消订单';
+                th.toast(content);
+                th.setData({ paying: 0 });
+                return false;
+            }
+
             //当是组合优惠的时候
-            if(good.prom_type==7){
+            if (good.prom_type == 7) {
                 //如果有组合购
                 var isok = 1;
+                var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + good.prom_id + "/" + getApp().globalData.userInfo.user_id;
                 let zh_buy_info=null
-                var url="/api/weshop/prom/zhbuy/get/"+os.stoid+"/"+good.prom_id+"/"+getApp().globalData.userInfo.user_id;
                 await getApp().request.promiseGet(url, {}).then(res => {
-                    if(res.data.code==0 && res.data.data){
-                      zh_buy_info = res.data.data
-                        if(res.data.data.is_show!=1){
-                            isok=0;
+                    if (res.data.code == 0 && res.data.data) {
+                        zh_buy_info = res.data.data
+                        if (res.data.data.is_show != 1) {
+                            isok = 0;
                         }
                         //如果活动已经结束
-                        if(res.data.data.is_end==1){
-                            isok=0;
+                        if (res.data.data.is_end == 1) {
+                            isok = 0;
                         }
                         //已经结束
-                        if(ut.gettimestamp()>res.data.data.end_time){
-                            isok=0;
+                        if (ut.gettimestamp() > res.data.data.end_time) {
+                            isok = 0;
                         }
                         //还未开始
-                        if(ut.gettimestamp()<res.data.data.start_time){
-                            isok=0;
+                        if (ut.gettimestamp() < res.data.data.start_time) {
+                            isok = 0;
                         }
-                    }else{
+
+                    } else {
                         //未找到商品的活动
                         isok = 0;
                     }
                 })
-                if (!isok){
-                    var  content=gg.goods_name+'活动已经结束,请取消订单';
+                if (!isok) {
+                    var content = gg.goods_name + '活动已经结束,请取消订单';
                     th.toast(content);
-                    th.setData({paying:0});
-                     return false;
+                    th.setData({ paying: 0 });
+                    return false;
                 }
                 //增加组合购次数判断
-                let userbuynum = await th.getUserBuyPromNum(good.prom_id)
+                let userbuynum = await th.getUserBuyPromNum(good.prom_id,1)
+
                 if (zh_buy_info.buy_limit !=0 && zh_buy_info && userbuynum >= zh_buy_info.buy_limit) {
-                  var content = gg.goods_name + '超出组合购限购次数,请取消订单';
-                  th.toast(content);
-                  th.setData({ paying: 0 });
-                  return false;
+                    var content = gg.goods_name + '超出组合购限购次数,请取消订单';
+                    th.toast(content);
+                    th.setData({ paying: 0 });
+                    return false;
                 }
                 var url1 = "/api/weshop/prom/zhbuyGoods/page";
@@ -453,380 +492,611 @@ Page({
                     pageSize: 1,
                     store_id: os.stoid,
                     zh_id: good.prom_id,
-                    goods_id:good.goods_id
+                    goods_id: good.goods_id
                 }
                 await getApp().request.promiseGet(url1, {
                     data: req_data
                 }).then(res => {
                     if (ut.ajax_ok(res)) {
                         var gdlist = res.data.data.pageData[0];
-                        good.buyqty=gdlist.buyqty;
+                        good.buyqty = gdlist.buyqty;
                     }
                 })
-                var num=good['buyqty'];
-                console.log(1111);
-                console.log(num);
+                var num = good['buyqty'];
                 //---- 要计算商品的限购 -----
-                if(good['buyqty']>0){
-                    if(good.goods_num+promgoodsbuynum>good['buyqty']){
+                if (good['buyqty'] > 0) {
+                    if (good.goods_num + promgoodsbuynum > good['buyqty']) {
+                        var content = good['goods_name'] + "超出活动限购\n";
+                        th.toast(content);
+                        th.setData({ paying: 0 });
+                        return false;
+                    }
+                }
+            }
+            //如果是预售的时候，
+            if (good.prom_type == 8) {
+                await getApp().request.promiseGet("/api/weshop/order/orderPresell/countBuyGoodsSum", {
+                    data: { store_id: os.stoid, user_id: user_id, goods_id: good.goods_id, prom_id: good.prom_id },
+                }).then(e => {
+                    if (e.data.code == 0) {
+                        promgoodsbuynum = e.data.data.sumgoodsnum;
+                    }
+                })
+
+                var presell_id = good.prom_id;
+                var url = "/api/weshop/marketing/marketingPresellList/list"
+                var rd = {
+                    store_id: os.stoid,
+                    presell_id: presell_id,
+                    goods_id: good.goods_id
+                }
+                //------获取预售从表----------
+                await getApp().request.promiseGet(url, {
+                    data: rd
+                }).then(res => {
+                    if (res.data.code == 0 && res.data.data && res.data.data.length > 0) {
+                        var arr = res.data.data[0];
+                        presellList = arr
+                    }
+                })
-                        var  content= good['goods_name']+"超出活动限购\n";
+                if (presellList) {
+
+                    if (good.goods_num > presellList.presell_sumqty - presellList.buy_goodnum) {
+                        var content = good.goods_name + '购买数量超出商品库存,请取消订单';
+                        th.toast(content);
+                        th.setData({ paying: 0 });
+                        return false;
+                    }
+                    var buyed_mum3 = promgoodsbuynum + good.goods_num;
+                    if (buyed_mum3 > presellList.vip_butyqty && presellList.vip_butyqty > 0) {
+                        var content = good.goods_name + '购买数量超出商品限购,请取消订单';
                         th.toast(content);
-                        th.setData({paying:0});
+                        th.setData({ paying: 0 });
                         return false;
                     }
+
                 }
             }
             //如果优惠促销和搭配购的时候
-			if((good.prom_type==3 || good.prom_type==5) && good.is_collocation!=1 && good.is_gift!=1){
-                var p_ok = 1,is_g_prom=0;
-                //因为有全场优惠活动，商品参加的活动还未开始
-                var url="/api/weshop/activitylist/getGoodActInfo";
-                var req_data={
-                    store_id:os.stoid,goodsidlist:good.goods_id,is_detail:1,user_id:user_id
-                };
-                await getApp().request.promiseGet(url, {data:req_data}).then(async function (res) {
-                    if(res.data.code==0 && res.data.data && res.data.data.length){
-                        for(let i in res.data.data){
-                            let item=res.data.data[i];
-                            if(item.prom_type==3 || item.prom_type==5) {
-                                is_g_prom=1; break;
-                            }
+            if ((good.prom_type == 3 || good.prom_type == 5 || good.prom_type == 10) && good.is_gift != 1 && good.is_collocation != 1) {
+                var p_ok = 1, is_g_prom = 0;
+                //只读优化促销和阶梯促销
+                await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromListNew1/" + os.stoid + "/" + good.goods_id+"/0/"+user_id, {}).then(res => {
+                    if (res.data.code == 0) {
+                        var r_data = res.data.data;
+                        if (!r_data.collocationPromList && good.prom_type == 5) {
+                            var content = good.goods_name + '未找到活动,请取消订单重新购买';
+                            th.toast(content)
+                            p_ok = 0;
                         }
+                        if (!r_data.promGoodsLists && good.prom_type == 3) {
+                            var content = good.goods_name + '未找到活动,请取消订单重新购买';
+                            th.toast(content);
+                            p_ok = 0;
+                        }
+                        if (!r_data.ladderLists && good.prom_type == 10) {
+                            var content = good.goods_name + '未找到活动,请取消订单重新购买';
+                            th.toast(content);
+                            p_ok = 0;
+                        }
+                    } else {
+
+                        var content = good.goods_name + '未找到活动,请取消订单重新购买'
+                        th.toast(content);
+                        p_ok = 0;
                     }
                 })
-                if(is_g_prom){
-                    await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/0"+"/"+getApp().globalData.user_id, {}).then(res => {
-                        if (res.data.code == 0) {
-                            var r_data = res.data.data;
-                            if (!r_data.collocationPromList && good.prom_type == 5) {
-
-                                var content = good.goods_name + '未找到活动,请取消订单重新购买';
-                                th.toast(content)
-                                p_ok = 0;
-                            }
-                            if (!r_data.promGoodsLists && good.prom_type == 3) {
+                if (!p_ok) {
+                    th.setData({ paying: 0 });
+                    return false;
+                }
+            }
-                                var content = good.goods_name + '未找到活动,请取消订单重新购买';
-                                th.toast(content);
-                                p_ok = 0;
-                            }
-                        } else {
+            //-- 商品的普通购买 ，不要进行判断 --
+            if ((good.prom_type == 1 || good.prom_type == 2 || good.prom_type == 6 || good.prom_type == 4 || good.prom_type == 8 || good.prom_type == 9)
+                && !good.is_gift && !good.is_collocation && !good.is_integral_normal && !good.is_pd_normal) {
-                            var content = good.goods_name + '未找到活动,请取消订单重新购买'
-                            th.toast(content);
-                            th.setData({paying:0});
-                            p_ok = 0;
+            } else {
+
+                //因为商品的prom_type=0,所以商品的实际活动要重新获取
+                var url = '/api/weshop/activitylist/listGoodActInfo2New';
+                var req_d = {
+                    "store_id": os.stoid,
+                    "goods_id": good.goods_id,
+                    "user_id": user_id,
+                }
+                await getApp().request.promiseGet(url, {
+                    data: req_d
+                }).then(res => {
+                    if (res.data.code == 0 && res.data.data) {
+                        var arr = res.data.data;
+                        //-- 预热也要计算 --
+                        var arr2 = arr.filter(function (e) {
+                            return e.s_time < ut.gettimestamp() || (e.warm_uptime && e.warm_uptime < ut.gettimestamp())
+                        })
+                        if (arr2.length == 1) {
+                            gg.prom_type=arr2[0].prom_type;
+                            gg.prom_id=arr2[0].act_id;
                         }
-                    })
-                }else{
-                    await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromNormal/" + os.stoid + "/" + good.goods_id, {}).then(res => {
-                        if (res.data.code == 0) {
-                            var r_data = res.data.data;
-                            if (!r_data.collocationPromList && good.prom_type == 5) {
+                    }
+                })
-                                var content = good.goods_name + '未找到活动,请取消订单重新购买';
-                                th.toast(content)
-                                p_ok = 0;
+                if ((gg.prom_type == 1 || gg.prom_type == 2 || gg.prom_type == 4 || gg.prom_type == 6 || gg.prom_type == 8 || gg.prom_type == 9)
+                    && !good.is_collocation && !good.is_gift && !good.is_integral_normal && !good.is_pd_normal) {
+                    var prom = null;
+                    //---如果是活动的时候---
+                    var prom = null, th = this;
+                    if (gg.prom_type == 1) {
+                        await getApp().request.promiseGet("/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + gg.prom_id, {}).then(res => {
+                            if (res.data.code == 0) {
+                                prom = res.data.data;
+                                prom.price = prom.user_price;
                             }
-                            if (!r_data.promGoodsLists && good.prom_type == 3) {
-
-                                var content = good.goods_name + '未找到活动,请取消订单重新购买';
-                                th.toast(content);
-                                p_ok = 0;
+                        })
+                    }
+                    if (gg.prom_type == 2) {
+                        await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + gg.goods_id + "/" + gg.prom_id, {}).then(res => {
+                            if (res.data.code == 0) {
+                                prom = res.data.data;
+                                prom.price = prom.price;
+                            }
+                        })
+                    }
+                    if (gg.prom_type == 6) {
+                        await getApp().request.promiseGet("/api/weshop/teamlist/get/" + os.stoid + "/" + gg.prom_id, {}).then(res => {
+                            if (res.data.code == 0) {
+                                prom = res.data.data;
+                            }
+                        })
+                    }
+                    if (gg.prom_type == 4) {
+                        await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2", {
+                            data: { store_id: os.stoid, goods_id: gg.goods_id,user_id: getApp().globalData.user_id, }
+                        }).then(res => {
+                            if (res.data.code == 0 && res.data.data && res.data.data.pageData) {
+                                prom = res.data.data.pageData[0];
                             }
-                        } else {
+                        })
+                    }
+                    if (prom) {
+                        var t_now = ut.gettimestamp();
+                        if (prom.is_end == 0 && prom.start_time < t_now && prom.end_time > t_now) {
-                            var content = good.goods_name + '未找到活动,请取消订单重新购买'
+                            var content = gg.goods_name + '商品的活动发生了变化,请取消订单重新购买';
                             th.toast(content);
-                            p_ok = 0;
+                            th.setData({ paying: 0 });
+                            return false;
                         }
+                    }
+
+                    //-- 幸运购的时候 --
+                    if(gg.prom_type==8 || gg.prom_type==9){
+                        var content = gg.goods_name + '商品的活动发生了变化,请取消订单重新购买';
+                        th.toast(content);
+                        th.setData({ paying: 0 });
+                        return false;
+                    }
+
+                }
+                else {
+                    var t_ok = 1;
+                    //-- 如果是普通购买的时候，此时计算的一定是商品的prom_type==0了,  （组合购在普通购买的时候，就不判断了，因为组合购本身就可以普通购买）---
+                    if(!good.is_collocation && !good.is_gift && good.is_pd_normal!=2 && gg.prom_type!=7 ){
+
+                        var promgoodsbuynum0=0;
+                        //---要获得商品，该用户买了多少件,同步应用---
+                        await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
+                            data: {
+                                store_id: os.stoid,
+                                user_id: user_id,
+                                goods_id: good.goods_id,
+                                prom_type: gg.prom_type,
+                                prom_id: gg.prom_id
+                            },
+                        }).then(res => {
+                            var buy_num_data = res.data.data;
+                            if (buy_num_data.promgoodsbuynum) promgoodsbuynum = buy_num_data.promgoodsbuynum;
+                        })
+
+
+                        if(good.prom_type != gg.prom_type && good.prom_id != gg.prom_id){
+                            //如果商品有单独的活动的是偶
+                            switch (gg.prom_type){
+                                case 5:
+                                case 10:
+                                    var content = gg.goods_name + '商品的活动发生了变化,请取消订单重新购买';
+                                    th.toast(content);
+                                    t_ok = 0;
+                                    break;
+                                //-- 优惠促销是有限购的 --
+                                case 3:
+                                    var prom=null;
+                                    var yh_check=1;
+                                    await getApp().request.promiseGet("/api/weshop/promgoods/get/" + os.stoid + "/" + gg.prom_id, {}).then(res => {
+                                        if (res.data.code == 0) { prom = res.data.data; }
+                                    })
+                                    if (prom && prom.limit_num) {
+                                        var limit_num = prom.limit_num;
+                                        var user_pre_buynum = await this.getUserBuyPromNum_pre(prom.id)
+                                        if (limit_num>0 && user_pre_buynum >= limit_num) {
+                                            yh_check=0;
+                                        }
+                                    }
+                                    //-- 优惠促销活动没有超出限购的话 --
+                                    if(yh_check){
+                                        var content = gg.goods_name + '商品的活动发生了变化,请取消订单重新购买';
+                                        th.toast(content);
+                                        t_ok = 0;
+                                        break;
+                                    }
+
+                                    break
+                                case 7:
+                                    //获取组合购活动
+                                    var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + gg.prom_id + "/" + getApp().globalData.userInfo.user_id;
+                                    let zh_buy_info=null
+                                    await getApp().request.promiseGet(url, {}).then(res => {
+                                        if (res.data.code == 0 && res.data.data) {
+                                            zh_buy_info = res.data.data
+                                        }
+                                    })
+                                    //判断活动超出限购
+                                    var is_act_ok=1;
+                                    let userbuynum = await th.getUserBuyPromNum(gg.prom_id)
+                                    if (zh_buy_info.buy_limit !=0 && zh_buy_info && userbuynum >= zh_buy_info.buy_limit) {
+                                        is_act_ok=0;
+                                    }
+
+                                    //判断活动商品超出限购，在从表
+                                    var url1 = "/api/weshop/prom/zhbuyGoods/page";
+                                    var req_data = {
+                                        page: 1,
+                                        pageSize: 1,
+                                        store_id: os.stoid,
+                                        zh_id: gg.prom_id,
+                                        goods_id: gg.goods_id
+                                    }
+                                    await getApp().request.promiseGet(url1, {
+                                        data: req_data
+                                    }).then(res => {
+                                        if (ut.ajax_ok(res)) {
+                                            var gdlist = res.data.data.pageData[0];
+                                            gg.buyqty = gdlist.buyqty;
+                                        }
+                                    })
+                                    var num = gg['buyqty'];
+                                    //---- 要计算商品的限购 -----
+                                    if (gg['buyqty'] > 0) {
+                                        if (gg.goods_num + promgoodsbuynum0 > gg['buyqty']) {
+                                            is_act_ok=0;
+                                        }
+                                    }
+                                    if(is_act_ok){
+                                        var content = gg.goods_name + '商品的活动发生了变化,请取消订单重新购买';
+                                        th.toast(content);
+                                        t_ok = 0;
+                                        break;
+                                    }
+                            }
+                        }
+                    }
+                    //-- 判断活动是不是OK --
+                    if (!t_ok) {
+                        th.setData({ paying: 0 }); return false;
+                    }
+
+                    // if (!good.is_gift && good.prom_type != 3) {
+                    //   var t_ok = 1;
+                    //   await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/0" + "/" + getApp().globalData.user_id, {}).then(res => {
+                    //     if (res.data.code == 0) {
+                    //       var r_data = res.data.data;
+                    //       //-- 参加了全局的优惠活动 --
+                    //       if (r_data.promGoodsLists) {
+                    //         var content = gg.goods_name + '商品的活动发生了变化,请取消订单重新购买';
+                    //         th.toast(content);
+                    //         t_ok = 0;
+                    //       }
+                    //     }
+                    //   })
+                    //   if (!t_ok) {
+                    //     th.setData({ paying: 0 }); return false;
+                    //   }
+                    // }
+                    //-- 如果有参加线下取价 --
+                    if (good.offline_cut > 0) wlist += encodeURIComponent(gg.erpwareid) + ",";
+                }
+                //赠品和搭配购不判断商品金额
+                var isok = 1;
+                var card_field = th.data.card_field;
+
+                //-- 如果会员是等级会员,商品有等级价,且不是活动商品，同时线下取价的要放在最后来判断 --
+                if (!good.is_gift && !good.is_collocation && gg.prom_type != 9) {
+                    if (card_field && gg[card_field] > 0) {
+                        if (good.goods_price != gg[card_field] && good.offline_cut <= 0) isok = 0;
+                        if (good.goods_price > gg[card_field] && good.offline_cut > 0) isok = 0;  //如果线下价格比较贵，则不通过
+
+                    } else {
+                        if (good.goods_price != gg.shop_price && good.offline_cut <= 0) isok = 0;
+                        if (good.goods_price > gg.shop_price && good.offline_cut > 0) isok = 0; //如果线下价格比较贵，则不通过
+                    }
+                    var is_h = 0;
+                    if (!isok) {
+
+                        var content = gg.goods_name + '商品的价格发生了变化,请取消订单重新购买1'
+                        th.toast(content);
+                        th.setData({ paying: 0 });
+                        return false;
+                    }
+                }
+
+                //--如果是线下库存的时候--
+                if (th.data.conf.sales_rules >= 2 && !gg.whsle_id) {
+                    var ob = {};
+                    await th.check_down_line_next(gg, good.goods_num, order.pickup_id, function (obj) {
+                        ob = obj;
                     })
+                    if (ob.code == -1) {
+                        var content = gg.goods_name + '门店库存不足,请取消订单';
+                        th.toast(content);
+                        th.setData({ paying: 0 });
+                        return false;
+                    }
+
+                } else {
+                    if (good.goods_num > store_count) {
+
+                        var content = gg.goods_name + '商品的库存不足,请取消订单';
+                        th.toast(content);
+                        th.setData({ paying: 0 });
+                        return false;
+                    }
                 }
-                if (!p_ok){
-                    th.setData({paying:0});return false;
+            }
+
+            //---如果是活动的时候---
+            var prom = null, goodsinfo = good, th = this;
+            if (goodsinfo.prom_type == 1) {
+                await getApp().request.promiseGet("/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + goodsinfo.prom_id, {}).then(res => {
+                    if (res.data.code == 0) {
+                        prom = res.data.data;
+                        prom.price = prom.user_price;
+                    }
+                })
+            }
+            if (goodsinfo.prom_type == 2) {
+                await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + good.goods_id + "/" + goodsinfo.prom_id, {}).then(res => {
+                    if (res.data.code == 0) {
+                        prom = res.data.data;
+                        prom.price = prom.price;
+                    }
+                })
+            }
+
+            if (goodsinfo.prom_type == 6 && !good.is_pd_normal) {
+                await getApp().request.promiseGet("/api/weshop/teamlist/get/" + os.stoid + "/" + goodsinfo.prom_id, {}).then(res => {
+                    if (res.data.code == 0) {
+                        prom = res.data.data;
+                    }
+                })
+            }
+
+            if (goodsinfo.prom_type == 4 && !good.is_integral_normal) {
+                await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2", {
+                    data: { store_id: os.stoid, goods_id: goodsinfo.goods_id,user_id: getApp().globalData.user_id, }
+                }).then(res => {
+                    if (res.data.code == 0 && res.data.data && res.data.data.pageData) {
+                        prom = res.data.data.pageData[0];
+                    }
+                })
+            }
+            //----------如果有活动，并且在进行中，就不计算线下库存---------------
+            if (prom) {
+                var now = ut.gettimestamp();
+                if (prom.is_end == 1 && prom.end_time < now) {
+                    var content = goodsinfo.goods_name + '商品的活动已经结束,请取消订单'
+                    th.toast(content);
+                    th.setData({ paying: 0 });
+                    return false;
                 }
-			}
+                buyed_mum2 = promgoodsbuynum + good.goods_num;
+                if (buyed_mum2 > prom.buy_limit && prom.buy_limit > 0) {
-			//商品的普通购买 ，不要进行判断
-			if((good.prom_type==1 || good.prom_type==2 || good.prom_type==6  || good.prom_type==4) && !good.is_gift && !good.is_collocation && !good.is_integral_normal && !good.is_pd_normal){
+                    var content = goodsinfo.goods_name + '购买数量超出商品活动限购,请取消订单'
+                    th.toast(content);
+                    th.setData({ paying: 0 });
+                    return false;
+                }
-			  }else{
-				  if((gg.prom_type==1 || gg.prom_type==3 || gg.prom_type==5 || gg.prom_type==6 || gg.prom_type==4)
-					  && !good.is_collocation  && !good.is_gift && !good.is_integral_normal && !good.is_pd_normal) {
-				  				  var prom=null;
-				  				  //---如果是活动的时候---
-				  				  var prom=null,th=this;
-				  				  if(gg.prom_type==1){	
-				  				  			  await getApp().request.promiseGet("/api/ms/flash_sale/getNew/"+os.stoid+"/"+user_id+"/"+gg.prom_id,{
-				  				  			  }).then(res=>{
-				  				  				  if(res.data.code==0){
-				  				  					  prom=res.data.data;
-				  				  					  prom.price=prom.user_price;
-				  				  				  }
-				  				  			  })
-				  				  }	  
-								  
-								  if (gg.prom_type == 2) {
-								      await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/"+ gg.goods_id + "/" + gg.prom_id, {}).then(res => {
-								          if (res.data.code == 0) {
-								              prom = res.data.data;
-								              prom.price=prom.price;
-								          }
-								      })
-								  }
-								  
-								  
-				  				  if(gg.prom_type==6){
-				  				  			await getApp().request.promiseGet("/api/weshop/teamlist/get/"+os.stoid+"/"+gg.prom_id,{
-				  				  			}).then(res=>{
-				  				  				  if(res.data.code==0){
-				  				  					  prom=res.data.data;
-				  				  				  }
-				  				  			})	  
-				  				  }	 
-				  				  
-				  				  if(gg.prom_type==4){
-				  				  			await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2",{
-				  								data:{store_id:os.stoid,goods_id:gg.goods_id,user_id: getApp().globalData.user_id,}
-				  				  			}).then(res=>{
-				  				  				  if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){
-				  				  					  prom=res.data.data.pageData[0];
-				  				  				  }
-				  				  			})	  
-				  				  }	
-				  				  								
-				  				  if(prom){
-				  					  var t_now=ut.gettimestamp();
-				  					  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});
-				  						   return false;
-				  					  }
-				  				  } 				  
-				  }else{
-                          //不是赠品的时候
-				  	      if(!good.is_gift && good.prom_type!=3 && !good.is_collocation ){
-							  var t_ok=1;
-							  await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0"+"/"+getApp().globalData.user_id, {}).then(res => {
-								  if(res.data.code==0){
-									  var r_data=res.data.data;
-									  //-- 参加了全局的优惠活动 --
-									  if(r_data.promGoodsLists){
-										 
-										  var content=gg.goods_name+'商品的活动发生了变化,请取消订单重新购买';
-										  th.toast(content);
-										  t_ok=0;
-									  }
-								  }
-							  })
-							  if(!t_ok) {
-                                  th.setData({paying:0});return false;
-                              }
-						  }
+                // --看一下会员的秒杀价格是不是发生了变化，因为会员的身份发生了变化
+                if (goodsinfo.prom_type == 1 && goodsinfo.goods_price != prom.price) {
+                    var content = goodsinfo.goods_name + '秒杀活动的价格发生了变化';
+                    th.toast(content);
+                    th.setData({ paying: 0 });
+                    return false;
+                }
-						  //-- 如果有参加线下取价 --		  
-						  if(good.offline_cut>0) wlist+=encodeURIComponent(gg.erpwareid)+",";	
-				   }
-				  //赠品和搭配购不判断商品金额
-				  var isok=1;
-				  var card_field=th.data.card_field; // 会员等级
-				  //如果会员是等级会员,商品有等级价,且不是活动商品
-		          if(!good.is_gift && !good.is_collocation) {
-		             if (card_field && gg[card_field] > 0) {
-		                 if (good.goods_price != gg[card_field] && good.offline_cut<=0) isok = 0;
-		                 if (good.goods_price >gg[card_field] && good.offline_cut>0) isok = 0;  //如果线下价格比较贵，则不通过
-	             					 				  
-		             } else {
-		                 if (good.goods_price != gg.shop_price && good.offline_cut<=0) isok = 0;
-		                 if (good.goods_price> gg.shop_price && good.offline_cut>0) isok = 0; //如果线下价格比较贵，则不通过
-		             }
-		              var is_h=0;
-		              if (!isok) {
-		                 
-		                  var content=gg.goods_name + '商品的价格发生了变化,请取消订单重新购买22';
-		                  th.toast(content);
-                          th.setData({paying:0});
-		                   return false;
-		              }
-		          }
-				
-				  //--如果是线下库存的时候--		
-				  if(th.data.conf.sales_rules>=2 && !gg.whsle_id){
-					   var ob={};
-					   await th.check_down_line_next(gg,good.goods_num,order.pickup_id,function(obj){
-						   ob=obj;
-					   })
-					   if(ob.code==-1){
-						   var content=gg.goods_name+'门店库存不足,请取消订单';
-						   th.toast(content);
-                           th.setData({paying:0});
-						    return false;
-					   }				   
-					   
-				  }else{
-					  if(good.goods_num>store_count){
-						  
-						  var content=gg.goods_name+'商品的库存不足,请取消订单';
-						  th.toast(content);
-                          th.setData({paying:0});
-						   return false;		
-					  }
-					  
-				  }			  
-			  }
-			  
-			  console.log("------------------------------------");
-			   //---如果是活动的时候---
-			   var prom=null,goodsinfo=good,th=this;
-			   if(goodsinfo.prom_type==1){	
-			  			  await getApp().request.promiseGet("/api/ms/flash_sale/getNew/"+os.stoid+"/"+user_id+"/"+goodsinfo.prom_id,{
-			  			  }).then(res=>{
-			  				  if(res.data.code==0){
-			  					  prom=res.data.data;
-                                  prom.price=prom.user_price;
-			  				  }
-			  			  })
-			   }	
-			   
-			   if (goodsinfo.prom_type == 2) {
-			       await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/"+ good.goods_id + "/" + goodsinfo.prom_id, {}).then(res => {
-			           if (res.data.code == 0) {
-			               prom = res.data.data;
-			               prom.price=prom.price;
-			           }
-			       })
-			   }
-				 
-				 	 
-			   if(goodsinfo.prom_type==6 && !good.is_pd_normal){
-			  			await getApp().request.promiseGet("/api/weshop/teamlist/get/"+os.stoid+"/"+goodsinfo.prom_id,{
-			  			}).then(res=>{
-			  				  if(res.data.code==0){
-			  					  prom=res.data.data;
-			  				  }
-			  			})	  
-			   }
-			  				
-			  if(goodsinfo.prom_type==4 && !good.is_integral_normal){
-			  			 await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2",{
-			  			 	data:{store_id:os.stoid,goods_id:goodsinfo.goods_id,user_id: getApp().globalData.user_id,}
-			  			 }).then(res=>{
-			  			 	  if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){
-			  			 		  prom=res.data.data.pageData[0];
-			  			 	  }
-			  			 })	  
-			  }		
-			  							
-			   //----------如果有活动，并且在进行中，就不计算线下库存---------------	 
-			   if(prom){
-			  			  var now=ut.gettimestamp();
-			  			  if(prom.is_end==1 && prom.end_time<now){			   
-			  				
-			  				var content=goodsinfo.goods_name+'商品的活动已经结束,请取消订单重新购买';
-			  				th.toast(content);
-                            th.setData({paying:0});
-			  				return false;		
-			  			  }
-			  			  
-			  			  buyed_mum2=promgoodsbuynum+good.goods_num;
-			  			  if (buyed_mum2 > prom.buy_limit && prom.buy_limit > 0) {
-			  			     var content=goodsinfo.goods_name+'购买数量超出商品活动限购,请取消订单重新购买';
-			  			     th.toast(content);
-                              th.setData({paying:0});
-			  			      return false;
-			  			  }
-			  			  //看一下会员的秒杀价格是不是发生了变化
-                          if(goodsinfo.prom_type==1 && goodsinfo.goods_price!=prom.price){
-                               var content=goodsinfo.goods_name+'秒杀活动的价格发生了变化';
-                               th.toast(content);
-                               th.setData({paying:0});
-                               return false;
-                          }
-						  
-						  //看一下会员的团购价格是不是发生了变化
-						  if(goodsinfo.prom_type==2 && goodsinfo.goods_price!=prom.price){
-						      var content=goodsinfo.goods_name+'秒杀活动的价格发生了变化';
-						      th.toast(content);
-                              th.setData({paying:0});
-						       return false;
-						  }
+                // --看一下会员的团购价格是不是发生了变化
+                if (goodsinfo.prom_type == 2 && goodsinfo.goods_price != prom.price) {
+                    var content = goodsinfo.goods_name + '秒杀活动的价格发生了变化';
+                    th.toast(content);
+                    th.setData({ paying: 0 });
+                    return false;
+                }
+
+                if (goodsinfo.prom_type == 4) {
+                    if (good.goods_num > prom.limitqty - prom.buy_num) {
+
+                        var content = goodsinfo.goods_name + '购买数量超出商品活动库存,请取消订单'
+                        th.toast(content);
+                        th.setData({ paying: 0 });
+                        return false;
+                    }
+                } else if (goodsinfo.prom_type == 1 || goodsinfo.prom_type == 2 || goodsinfo.prom_type == 6) {
+                    if (order.add_time + 5 * 60 < ut.gettimestamp()) {
+                        var content = gg.goods_name + '该订单已经超时无法支付,请取消订单';
+                        th.toast(content);
+                        th.setData({ paying: 0 });
+                        return false;
+                    }
+                }
-			  			  if(goodsinfo.prom_type==4){
-			  				  if (good.goods_num > prom.limitqty-prom.buy_num) {
-			  				   
-			  				      var content=goodsinfo.goods_name+'购买数量超出商品活动库存,请取消订单';
-			  				      th.toast(content);
-                                  th.setData({paying:0});
-			  				       return false;
-			  				  }				  
-			  			  }else if(goodsinfo.prom_type == 1 || goodsinfo.prom_type == 2 || goodsinfo.prom_type == 6 ) {
-								if(order.add_time+5*60<ut.gettimestamp()) {
-									var content = gg.goods_name + '该订单已经超时无法支付,请取消订单';
-									th.toast(content);
-                                    th.setData({paying:0});
-									return false;
-								}
-						}
-											  
-			   }
-			  
-		}
-		
-		//-- 要判断一下线下取价价格是不是发生改变 --
-		if(wlist!="" && th.data.is_open_offline && th.data.is_open_offline>0){
-			wlist=ut.sub_last(wlist);
-			var keyid=order.pickup_id;
-			var user_info=getApp().globalData.userInfo;
-			if(!keyid) {
-                th.setData({paying:0});return false;
             }
-			var offarr=null;	
-			await getApp().request.promiseGet("/api/weshop/goods/listWarePrice", {
-			       data:{
-					   VIPId:encodeURIComponent(user_info.erpvipid),
-				  	   store_id:os.stoid,
-			           PickupId:keyid,
-				  	   WareIds:wlist},			 
-					},
-			).then(res=>{
-				if(res.data.code==0 && res.data.data && res.data.data.length>0){
-					offarr=res.data.data;						  
-				}
-			})				
-			if(!offarr && offarr.length<=0 ){
-				wx.showModal({ title: '获取线下取价失败',});
-			}
-			var newarr=ut.convert_arr_key(offarr,'WareId');	
-			//-- 循环判断线下的价格 --	
-			for(var k in order_goods){
-				var good=order_goods[k];
-				//判断线下取价是不是一样
-				if(newarr[good.erpwareid] && 
-				   parseFloat(newarr[good.erpwareid].WarePrice)!=parseFloat(good.goods_price)){		
-					
-					var content=good.goods_name + '商品的价格发生了变化,请取消订单重新购买';
-					th.toast(content);
-                    th.setData({paying:0});
-					 return false;	
-				}
-			}	
-				
-		}
-		/*---
-		o.jumpToCart4({
-            order_sn: this.data.order.order_sn,
-            order_amount: this.data.order.order_amount,
-			type: 1 //正常单
-        }, 1);--*/
+            //-- 预售和幸运购要单独计算 --
+            if (goodsinfo.prom_type == 8) {
+                var presell_id= goodsinfo.prom_id;
+                //------获取预售主表,判断预售活动是不是到期不可以使用了----------
+                var res= await getApp().request.promiseGet(`/api/weshop/marketing/marketingPresellForm/get/${os.stoid}/${presell_id}`, {})
+                if (res.data.code == 0 && res.data.data) {
+                    var act_data = res.data.data;
+                    if (act_data.is_end) {
+                        wx.showToast({ title: "活动已经结束", icon: 'none', duration: 3000 });
+                        return false;
+                    }
+                    if (act_data.isuse == 0) {
+                        wx.showToast({ title: "活动未启用", icon: 'none', duration: 3000 });
+                        return false;
+                    }
+
+                    var err_txt = "活动定金时间已经结束";
+                    var end_time = act_data.end_time;
+                    if (act_data.presell_type == 1) {
+                        err_txt = "活动时间已经结束";
+                    }
+                    if (end_time < ut.gettimestamp()) {
+                        wx.showToast({ title: err_txt, icon: 'none', duration: 3000 });
+                        return false;
+                    }
+
+                    if (act_data.presell_type == 0) {
+                        end_time = act_data.pay_enddate;
+                        err_txt = "活动尾款时间已经结束";
+                    }
+                    if (end_time < ut.gettimestamp()) {
+                        wx.showToast({ title: err_txt, icon: 'none', duration: 3000 });
+                        return false;
+                    }
+                }
+
+                var all_pre_goods=null;
+                var userInfo = getApp().globalData.userInfo;
+                var pre_data = { store_id: os.stoid, is_end: 0, timetype: 1, isuse: 1, goods_id: goodsinfo.goods_id };
+                if (userInfo) {
+                    pre_data.user_id = userInfo.user_id;
+                }
+                var rs_pre= await getApp().request.promiseGet("/api/weshop/marketing/marketingPresellList/page", {
+                    data: pre_data,
+                })
+                if (rs_pre.data.code == 0 && rs_pre.data.data.pageData && rs_pre.data.data.pageData.length > 0) {
+                    all_pre_goods = rs_pre.data.data.pageData;
+                }
+
+                if(!all_pre_goods){
+                    wx.showToast({ title: "未找到活动商品", icon: 'none', duration: 3000 });
+                    return false;
+                }
+                var idx = all_pre_goods.findIndex(function (ele) {
+                    return ele.goods_id == goodsinfo.goods_id;
+                })
+
+                if(idx==-1){
+                    wx.showToast({ title: "未找到活动商品", icon: 'none', duration: 3000 });
+                    return false;
+                }
+                var pre_arr = all_pre_goods[idx];
+                var prom_buy_limit = pre_arr.vip_butyqty;
+
+                if (goods.goods_num > th.data.pre_arr.presell_sumqty - th.data.pre_arr.buy_goodnum) {
+                    wx.showToast({ title: "超出活动商品库存", icon: 'none', duration: 3000 });
+                    return false;
+                }
+                //--判断商品是否超出活动限购--
+                if (promgoodsbuynum0 && prom_buy_limit > 0) {
+                    wx.showToast({ title: "超出活动商品库存", icon: 'none', duration: 3000 });
+                    return false;
+                }
+
+            }
+            //幸运购的时候
+            if (goodsinfo.prom_type == 9 && !good.is_pt_normal) {
+
+                var lk_act=null;
+                //获取单个活动成团信息
+                var lk_rs= await getApp().request.promiseGet('/api/weshop/prom/luckyActivity/page', {
+                    data: {
+                        store_id: os.stoid,
+                        is_end: 0,
+                        timetype: 1,
+                        id: goodsinfo.prom_id,
+                    }
+                });
+
+                if(lk_rs && ut.ajax_ok(lk_rs)){
+                    lk_act= lk_rs.data.data.pageData[0];
+                }
+                if(!lk_act){
+                    wx.showToast({ title: "未找到活动，或者活动已结束", icon: 'none', duration: 3000 });
+                    th.setData({ paying: 0 });
+                    return false;
+                }
+                // 检查幸运购活动商品库存
+                var lk_redis=await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/9/" + goodsinfo.prom_id,{});
+                if(!lk_redis || lk_redis<goodsinfo.goods_num ){
+                    wx.showToast({ title: "活动商品库存不足", icon: 'none', duration: 3000 });
+                    th.setData({ paying: 0 });
+                    return false;
+                }
+            }
+
+        }
+
+        //-- 要判断一下线下取价价格是不是发生改变 --
+        if (wlist != "" && th.data.is_open_offline && th.data.is_open_offline > 0) {
+            wlist = ut.sub_last(wlist);
+            var keyid = order.pickup_id;
+            var user_info = getApp().globalData.userInfo;
+            if (!keyid) {
+                th.setData({ paying: 0 }); return false;
+            }
+            var offarr = null;
+            await getApp().request.promiseGet("/api/weshop/goods/listWarePrice", {
+                    data: {
+                        VIPId: encodeURIComponent(user_info.erpvipid),
+                        store_id: os.stoid,
+                        PickupId: keyid,
+                        WareIds: wlist
+                    },
+                },
+            ).then(res => {
+                if (res.data.code == 0 && res.data.data && res.data.data.length > 0) {
+                    offarr = res.data.data;
+                }
+            })
+            if (!offarr && offarr.length <= 0) {
+                th.toast('获取线下取价失败');
+            }
+            var newarr = ut.convert_arr_key(offarr, 'WareId');
+            //-- 循环判断线下的价格 --
+            for (var k in order_goods) {
+                var good = order_goods[k];
+                //判断线下取价是不是一样
+                if (newarr[good.erpwareid] &&
+                    parseFloat(newarr[good.erpwareid].WarePrice) != parseFloat(good.goods_price)) {
+
+                    var content = good.goods_name + '商品的价格发生了变化,请取消订单重新购买';
+                    th.toast(content);
+                    th.setData({ paying: 0 });
+                    return false;
+                }
+            }
+        }
+
         py.pay(this.data.order.order_sn, function() {
             th.setData({paying:0});
@@ -836,8 +1106,10 @@ Page({
             th.setData({paying:0});
         },os.stoid,1);
-
     },
+
+
+
     checkTeam: function() {
         wx.navigateTo({
             url: "/pages/team/team_detail/team_detail?foundId=" + this.data.order.orderTeamFound.found_id
@@ -611,7 +611,8 @@ Page({
       }
     });
   },
-  //预存款判断
+
+  //-- 预存款判断 --
   async vipadvancesum(keyid,pre_cut,pre_json){
     let pre=JSON.parse(pre_json)
     let listform=[]
@@ -637,6 +638,7 @@ Page({
     })
     return res.data
   },
+
   /*----------跳转支付-----------*/
   async jumpToCart4(t) {
@@ -675,7 +677,6 @@ Page({
         if (res.data.code == 0) {
           knum = res.data.data;
         }
-
       });
       if (knum <= 0) {
@@ -708,6 +709,7 @@ Page({
       await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + good.goods_id, {}).then(res => {
         gg = res.data.data;
       })
+
       var limit = gg.viplimited;
       var store_count = gg.store_count;
       good.erpwareid = gg.erpwareid;
@@ -773,9 +775,9 @@ Page({
           th.setData({ paying: 0 });
           return false;
         }
-        //增加组合购次数判断
-        
-        let userbuynum = await th.getUserBuyPromNum(good.prom_id)
+
+         //增加组合购次数判断
+        let userbuynum = await th.getUserBuyPromNum(good.prom_id,1)
         if (zh_buy_info.buy_limit !=0 && zh_buy_info && userbuynum >= zh_buy_info.buy_limit) {
           var content = gg.goods_name + '超出组合购限购次数,请取消订单';
@@ -812,7 +814,6 @@ Page({
           }
         }
       }
-
       //如果是预售的时候，
       if (good.prom_type == 8) {
         await getApp().request.promiseGet("/api/weshop/order/orderPresell/countBuyGoodsSum", {
@@ -860,64 +861,23 @@ Page({
       }
       //如果优惠促销和搭配购的时候
-      if ((good.prom_type == 3 || good.prom_type == 5) && good.is_gift != 1 && good.is_collocation != 1) {
+      if ((good.prom_type == 3 || good.prom_type == 5 || good.prom_type == 10) && good.is_gift != 1 && good.is_collocation != 1) {
         var p_ok = 1, is_g_prom = 0;
-        //因为有全场优惠活动，商品参加的活动还未开始
-        var url = "/api/weshop/activitylist/getGoodActInfo";
-        var req_data = {
-          store_id: os.stoid, goodsidlist: good.goods_id, is_detail: 1, user_id: user_id
-        };
-        await getApp().request.promiseGet(url, { data: req_data }).then(async function (res) {
-          if (res.data.code == 0 && res.data.data && res.data.data.length) {
-            for (let i in res.data.data) {
-              let item = res.data.data[i];
-              if (item.prom_type == 3 || item.prom_type==5) {
-                is_g_prom = 1; break;
-              }
-            }
-          }
-        })
-        
-        if (is_g_prom) {
-          
-          // await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/0" + "/" + getApp().globalData.user_id, {}).then(res => {
-          await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromListNew1/" + os.stoid + "/" + good.goods_id + "/0" + "/" + getApp().globalData.user_id, {}).then(res => {
-            
+        //只读优化促销和阶梯促销
+        await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromListNew1/" + os.stoid + "/" + good.goods_id+"/0/"+user_id, {}).then(res => {
             if (res.data.code == 0) {
               var r_data = res.data.data;
               if (!r_data.collocationPromList && good.prom_type == 5) {
-
-                var content = good.goods_name + '未找到活动,请取消订单重新购买';
-                th.toast(content)
-                p_ok = 0;
+                 var content = good.goods_name + '未找到活动,请取消订单重新购买';
+                 th.toast(content)
+                 p_ok = 0;
               }
               if (!r_data.promGoodsLists && good.prom_type == 3) {
-
                 var content = good.goods_name + '未找到活动,请取消订单重新购买';
                 th.toast(content);
                 p_ok = 0;
               }
-            } else {
-
-              var content = good.goods_name + '未找到活动,请取消订单重新购买'
-              th.toast(content);
-              p_ok = 0;
-            }
-          })
-        } else {
-          //只读优化促销和阶梯促销
-          await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromNormal/" + os.stoid + "/" + good.goods_id, {}).then(res => {
-            if (res.data.code == 0) {
-              var r_data = res.data.data;
-              if (!r_data.collocationPromList && good.prom_type == 5) {
-
-                var content = good.goods_name + '未找到活动,请取消订单重新购买';
-                th.toast(content)
-
-                p_ok = 0;
-              }
-              if (!r_data.promGoodsLists && good.prom_type == 3) {
-
+              if (!r_data.ladderLists && good.prom_type == 10) {
                 var content = good.goods_name + '未找到活动,请取消订单重新购买';
                 th.toast(content);
                 p_ok = 0;
@@ -929,92 +889,225 @@ Page({
               p_ok = 0;
             }
           })
-
-        }
         if (!p_ok) {
           th.setData({ paying: 0 });
           return false;
         }
       }
-      //商品的普通购买 ，不要进行判断
-      if ((good.prom_type == 1 || good.prom_type == 2 || good.prom_type == 6 || good.prom_type == 4 || good.prom_type == 8)
+      //-- 商品的普通购买 ，不要进行判断 --
+      if ((good.prom_type == 1 || good.prom_type == 2 || good.prom_type == 6 || good.prom_type == 4 || good.prom_type == 8 || good.prom_type == 9)
         && !good.is_gift && !good.is_collocation && !good.is_integral_normal && !good.is_pd_normal) {
       } else {
-        if ((gg.prom_type == 1 || good.prom_type == 2 || gg.prom_type == 3 || gg.prom_type == 5 || gg.prom_type == 6 || gg.prom_type == 4)
-          && !good.is_collocation && !good.is_gift && !good.is_integral_normal && !good.is_pd_normal) {
-          var prom = null;
-          //---如果是活动的时候---
-          var prom = null, th = this;
-          if (gg.prom_type == 1) {
-            await getApp().request.promiseGet("/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + gg.prom_id, {}).then(res => {
-              if (res.data.code == 0) {
-                prom = res.data.data;
-                prom.price = prom.user_price;
-              }
-            })
-          }
-          if (gg.prom_type == 2) {
-            await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + gg.goods_id + "/" + gg.prom_id, {}).then(res => {
-              if (res.data.code == 0) {
-                prom = res.data.data;
-                prom.price = prom.price;
+        //因为商品的prom_type=0,所以商品的实际活动要重新获取
+        var url = '/api/weshop/activitylist/listGoodActInfo2New';
+        var req_d = {
+          "store_id": os.stoid,
+          "goods_id": good.goods_id,
+          "user_id": user_id,
+        }
+        await getApp().request.promiseGet(url, {
+          data: req_d
+        }).then(res => {
+          if (res.data.code == 0 && res.data.data) {
+              var arr = res.data.data;
+              //-- 预热也要计算 --
+              var arr2 = arr.filter(function (e) {
+                return e.s_time < ut.gettimestamp() || (e.warm_uptime && e.warm_uptime < ut.gettimestamp())
+              })
+              if (arr2.length == 1) {
+                gg.prom_type=arr2[0].prom_type;
+                gg.prom_id=arr2[0].act_id;
               }
-            })
           }
+        })
-          if (gg.prom_type == 6) {
-            await getApp().request.promiseGet("/api/weshop/teamlist/get/" + os.stoid + "/" + gg.prom_id, {}).then(res => {
-              if (res.data.code == 0) {
-                prom = res.data.data;
-              }
-            })
-          }
+        if ((gg.prom_type == 1 || gg.prom_type == 2 || gg.prom_type == 4 || gg.prom_type == 6 || gg.prom_type == 8 || gg.prom_type == 9)
+          && !good.is_collocation && !good.is_gift && !good.is_integral_normal && !good.is_pd_normal) {
+            var prom = null;
+            //---如果是活动的时候---
+            var prom = null, th = this;
+            if (gg.prom_type == 1) {
+              await getApp().request.promiseGet("/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + gg.prom_id, {}).then(res => {
+                if (res.data.code == 0) {
+                  prom = res.data.data;
+                  prom.price = prom.user_price;
+                }
+              })
+            }
+            if (gg.prom_type == 2) {
+              await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + gg.goods_id + "/" + gg.prom_id, {}).then(res => {
+                if (res.data.code == 0) {
+                  prom = res.data.data;
+                  prom.price = prom.price;
+                }
+              })
+            }
+            if (gg.prom_type == 6) {
+              await getApp().request.promiseGet("/api/weshop/teamlist/get/" + os.stoid + "/" + gg.prom_id, {}).then(res => {
+                if (res.data.code == 0) {
+                  prom = res.data.data;
+                }
+              })
+            }
+            if (gg.prom_type == 4) {
+              await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2", {
+                data: { store_id: os.stoid, goods_id: gg.goods_id,user_id: getApp().globalData.user_id, }
+              }).then(res => {
+                if (res.data.code == 0 && res.data.data && res.data.data.pageData) {
+                  prom = res.data.data.pageData[0];
+                }
+              })
+            }
+            if (prom) {
+              var t_now = ut.gettimestamp();
+              if (prom.is_end == 0 && prom.start_time < t_now && prom.end_time > t_now) {
-          if (gg.prom_type == 4) {
-            await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2", {
-              data: { store_id: os.stoid, goods_id: gg.goods_id,user_id: getApp().globalData.user_id, }
-            }).then(res => {
-              if (res.data.code == 0 && res.data.data && res.data.data.pageData) {
-                prom = res.data.data.pageData[0];
+                var content = gg.goods_name + '商品的活动发生了变化,请取消订单重新购买';
+                th.toast(content);
+                th.setData({ paying: 0 });
+                return false;
               }
-            })
-          }
-
-          if (prom) {
-            var t_now = ut.gettimestamp();
-            if (prom.is_end == 0 && prom.start_time < t_now && prom.end_time > t_now) {
+            }
+            //-- 幸运购的时候 --
+            if(gg.prom_type==8 || gg.prom_type==9){
               var content = gg.goods_name + '商品的活动发生了变化,请取消订单重新购买';
               th.toast(content);
               th.setData({ paying: 0 });
               return false;
             }
-          }
+
         }
         else {
-          if (!good.is_gift && good.prom_type != 3) {
             var t_ok = 1;
-            await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/0" + "/" + getApp().globalData.user_id, {}).then(res => {
-              if (res.data.code == 0) {
-                var r_data = res.data.data;
-                //-- 参加了全局的优惠活动 --
-                if (r_data.promGoodsLists) {
-                  var content = gg.goods_name + '商品的活动发生了变化,请取消订单重新购买';
-                  th.toast(content);
-                  t_ok = 0;
-                }
-              }
-            })
+            //-- 如果是普通购买的时候，此时计算的一定是商品的prom_type==0了,  （组合购在普通购买的时候，就不判断了，因为组合购本身就可以普通购买）---
+            if(!good.is_collocation && !good.is_gift && good.is_pd_normal!=2 && gg.prom_type!=7 ){
+
+                  var promgoodsbuynum0=0;
+                  //---要获得商品，该用户买了多少件,同步应用---
+                  await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
+                    data: {
+                      store_id: os.stoid,
+                      user_id: user_id,
+                      goods_id: good.goods_id,
+                      prom_type: gg.prom_type,
+                      prom_id: gg.prom_id
+                    },
+                  }).then(res => {
+                    var buy_num_data = res.data.data;
+                    if (buy_num_data.promgoodsbuynum) promgoodsbuynum = buy_num_data.promgoodsbuynum;
+                  })
+
+
+                  if(good.prom_type != gg.prom_type && good.prom_id != gg.prom_id){
+                      //如果商品有单独的活动的是偶
+                      switch (gg.prom_type){
+                        case 5:
+                        case 10:
+                            var content = gg.goods_name + '商品的活动发生了变化,请取消订单重新购买';
+                            th.toast(content);
+                            t_ok = 0;
+                            break;
+                            //-- 优惠促销是有限购的 --
+                        case 3:
+                          var prom=null;
+                          var yh_check=1;
+                          await getApp().request.promiseGet("/api/weshop/promgoods/get/" + os.stoid + "/" + gg.prom_id, {}).then(res => {
+                            if (res.data.code == 0) { prom = res.data.data; }
+                          })
+                          if (prom && prom.limit_num) {
+                            var limit_num = prom.limit_num;
+                            var user_pre_buynum = await this.getUserBuyPromNum_pre(prom.id)
+                            if (limit_num>0 && user_pre_buynum >= limit_num) {
+                              yh_check=0;
+                            }
+                          }
+                          //-- 优惠促销活动没有超出限购的话 --
+                          if(yh_check){
+                            var content = gg.goods_name + '商品的活动发生了变化,请取消订单重新购买';
+                            th.toast(content);
+                            t_ok = 0;
+                            break;
+                          }
+
+                          break
+                        case 7:
+                          //获取组合购活动
+                          var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + gg.prom_id + "/" + getApp().globalData.userInfo.user_id;
+                          let zh_buy_info=null
+                          await getApp().request.promiseGet(url, {}).then(res => {
+                            if (res.data.code == 0 && res.data.data) {
+                              zh_buy_info = res.data.data
+                            }
+                          })
+                          //判断活动超出限购
+                          var is_act_ok=1;
+                          let userbuynum = await th.getUserBuyPromNum(gg.prom_id)
+                          if (zh_buy_info.buy_limit !=0 && zh_buy_info && userbuynum >= zh_buy_info.buy_limit) {
+                            is_act_ok=0;
+                          }
+
+                          //判断活动商品超出限购，在从表
+                          var url1 = "/api/weshop/prom/zhbuyGoods/page";
+                          var req_data = {
+                            page: 1,
+                            pageSize: 1,
+                            store_id: os.stoid,
+                            zh_id: gg.prom_id,
+                            goods_id: gg.goods_id
+                          }
+                          await getApp().request.promiseGet(url1, {
+                            data: req_data
+                          }).then(res => {
+                            if (ut.ajax_ok(res)) {
+                              var gdlist = res.data.data.pageData[0];
+                              gg.buyqty = gdlist.buyqty;
+                            }
+                          })
+                          var num = gg['buyqty'];
+                          //---- 要计算商品的限购 -----
+                          if (gg['buyqty'] > 0) {
+                            if (gg.goods_num + promgoodsbuynum0 > gg['buyqty']) {
+                              is_act_ok=0;
+                            }
+                          }
+                          if(is_act_ok){
+                            var content = gg.goods_name + '商品的活动发生了变化,请取消订单重新购买';
+                            th.toast(content);
+                            t_ok = 0;
+                            break;
+                          }
+                       }
+                  }
+            }
+            //-- 判断活动是不是OK --
             if (!t_ok) {
-              th.setData({ paying: 0 }); return false;
+                th.setData({ paying: 0 }); return false;
             }
-          }
-          //-- 如果有参加线下取价 --
-          if (good.offline_cut > 0) wlist += encodeURIComponent(gg.erpwareid) + ",";
+
+            // if (!good.is_gift && good.prom_type != 3) {
+            //   var t_ok = 1;
+            //   await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/0" + "/" + getApp().globalData.user_id, {}).then(res => {
+            //     if (res.data.code == 0) {
+            //       var r_data = res.data.data;
+            //       //-- 参加了全局的优惠活动 --
+            //       if (r_data.promGoodsLists) {
+            //         var content = gg.goods_name + '商品的活动发生了变化,请取消订单重新购买';
+            //         th.toast(content);
+            //         t_ok = 0;
+            //       }
+            //     }
+            //   })
+            //   if (!t_ok) {
+            //     th.setData({ paying: 0 }); return false;
+            //   }
+            // }
+            //-- 如果有参加线下取价 --
+            if (good.offline_cut > 0) wlist += encodeURIComponent(gg.erpwareid) + ",";
         }
         //赠品和搭配购不判断商品金额
         var isok = 1;
@@ -1047,11 +1140,10 @@ Page({
             ob = obj;
           })
           if (ob.code == -1) {
-
-            var content = gg.goods_name + '门店库存不足,请取消订单';
-            th.toast(content);
-            th.setData({ paying: 0 });
-            return false;
+             var content = gg.goods_name + '门店库存不足,请取消订单';
+             th.toast(content);
+             th.setData({ paying: 0 });
+             return false;
           }
         } else {
@@ -1076,7 +1168,6 @@ Page({
           }
         })
       }
-
       if (goodsinfo.prom_type == 2) {
         await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + good.goods_id + "/" + goodsinfo.prom_id, {}).then(res => {
           if (res.data.code == 0) {
@@ -1086,7 +1177,6 @@ Page({
         })
       }
-
       if (goodsinfo.prom_type == 6 && !good.is_pd_normal) {
         await getApp().request.promiseGet("/api/weshop/teamlist/get/" + os.stoid + "/" + goodsinfo.prom_id, {}).then(res => {
           if (res.data.code == 0) {
@@ -1104,7 +1194,6 @@ Page({
           }
         })
       }
-
       //----------如果有活动，并且在进行中，就不计算线下库存---------------
       if (prom) {
         var now = ut.gettimestamp();
@@ -1158,6 +1247,113 @@ Page({
         }
       }
+
+      //-- 预售和幸运购要单独计算 --
+      if (goodsinfo.prom_type == 8) {
+        var presell_id= goodsinfo.prom_id;
+        //------获取预售主表,判断预售活动是不是到期不可以使用了----------
+        var res= await getApp().request.promiseGet(`/api/weshop/marketing/marketingPresellForm/get/${os.stoid}/${presell_id}`, {})
+        if (res.data.code == 0 && res.data.data) {
+          var act_data = res.data.data;
+          if (act_data.is_end) {
+            wx.showToast({ title: "活动已经结束", icon: 'none', duration: 3000 });
+            return false;
+          }
+          if (act_data.isuse == 0) {
+            wx.showToast({ title: "活动未启用", icon: 'none', duration: 3000 });
+            return false;
+          }
+
+          var err_txt = "活动定金时间已经结束";
+          var end_time = act_data.end_time;
+          if (act_data.presell_type == 1) {
+            err_txt = "活动时间已经结束";
+          }
+          if (end_time < ut.gettimestamp()) {
+            wx.showToast({ title: err_txt, icon: 'none', duration: 3000 });
+            return false;
+          }
+
+          if (act_data.presell_type == 0) {
+            end_time = act_data.pay_enddate;
+            err_txt = "活动尾款时间已经结束";
+          }
+          if (end_time < ut.gettimestamp()) {
+            wx.showToast({ title: err_txt, icon: 'none', duration: 3000 });
+            return false;
+          }
+        }
+
+        var all_pre_goods=null;
+        var userInfo = getApp().globalData.userInfo;
+        var pre_data = { store_id: os.stoid, is_end: 0, timetype: 1, isuse: 1, goods_id: goodsinfo.goods_id };
+        if (userInfo) {
+          pre_data.user_id = userInfo.user_id;
+        }
+        var rs_pre= await getApp().request.promiseGet("/api/weshop/marketing/marketingPresellList/page", {
+          data: pre_data,
+        })
+        if (rs_pre.data.code == 0 && rs_pre.data.data.pageData && rs_pre.data.data.pageData.length > 0) {
+            all_pre_goods = rs_pre.data.data.pageData;
+        }
+
+        if(!all_pre_goods){
+          wx.showToast({ title: "未找到活动商品", icon: 'none', duration: 3000 });
+          return false;
+        }
+        var idx = all_pre_goods.findIndex(function (ele) {
+          return ele.goods_id == goodsinfo.goods_id;
+        })
+
+        if(idx==-1){
+           wx.showToast({ title: "未找到活动商品", icon: 'none', duration: 3000 });
+           return false;
+        }
+        var pre_arr = all_pre_goods[idx];
+        var prom_buy_limit = pre_arr.vip_butyqty;
+
+        if (goods.goods_num > th.data.pre_arr.presell_sumqty - th.data.pre_arr.buy_goodnum) {
+           wx.showToast({ title: "超出活动商品库存", icon: 'none', duration: 3000 });
+           return false;
+        }
+        //--判断商品是否超出活动限购--
+        if (promgoodsbuynum0 && prom_buy_limit > 0) {
+            wx.showToast({ title: "超出活动商品库存", icon: 'none', duration: 3000 });
+            return false;
+        }
+
+      }
+      //幸运购的时候
+      if (goodsinfo.prom_type == 9 && !good.is_pt_normal) {
+
+        var lk_act=null;
+        //获取单个活动成团信息
+        var lk_rs= await getApp().request.promiseGet('/api/weshop/prom/luckyActivity/page', {
+            data: {
+              store_id: os.stoid,
+              is_end: 0,
+              timetype: 1,
+              id: goodsinfo.prom_id,
+            }
+        });
+
+        if(lk_rs && ut.ajax_ok(lk_rs)){
+          lk_act= lk_rs.data.data.pageData[0];
+        }
+        if(!lk_act){
+           wx.showToast({ title: "未找到活动，或者活动已结束", icon: 'none', duration: 3000 });
+           th.setData({ paying: 0 });
+           return false;
+        }
+        // 检查幸运购活动商品库存
+        var lk_redis=await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/9/" + goodsinfo.prom_id,{});
+        if(!lk_redis || lk_redis<goodsinfo.goods_num ){
+          wx.showToast({ title: "活动商品库存不足", icon: 'none', duration: 3000 });
+          th.setData({ paying: 0 });
+          return false;
+        }
+      }
+
     }
     //-- 要判断一下线下取价价格是不是发生改变 --
@@ -1200,6 +1396,7 @@ Page({
         }
       }
     }
+
     th.pay_next(e, o_index);
   },
@@ -2081,9 +2278,14 @@ Page({
     }
   },
   //获取用户参与组合购的次数
-  async getUserBuyPromNum(prom_id){
+  async getUserBuyPromNum(prom_id,is_buy){
     var userInfo = getApp().globalData.userInfo;
-    var url = `/api/weshop/ordergoods/getUserBuyPromNum?store_id=${os.stoid}&user_id=${userInfo.user_id}&prom_type=7&prom_id=${prom_id}`;
+
+    var url = `/api/weshop/ordergoods/getUserBuyPromNum?is_all=1&store_id=${os.stoid}&user_id=${userInfo.user_id}&prom_type=7&prom_id=${prom_id}`;
+    if(is_buy){
+      url = `/api/weshop/ordergoods/getUserBuyPromNum?store_id=${os.stoid}&user_id=${userInfo.user_id}&prom_type=7&prom_id=${prom_id}`;
+    }
+
     let res = await getApp().request.promiseGet(url, {
       data:{}
     });
@@ -2846,10 +3048,24 @@ Page({
   //-- 查看物流 --
   go_wuliu:function (e) {
       getApp().go_wuliu(e);
-  }
-
-
+  },
+  //优惠促销用户参与次数,is_buy=1，表示只获取支付了的
+  async getUserBuyPromNum_pre(prom_id,is_buy) {
+    var userInfo = getApp().globalData.userInfo;
+    var url = `/api/weshop/ordergoods/getUserBuyPromNum?is_all=1&store_id=${os.stoid}&user_id=${userInfo.user_id}&prom_type=3&prom_id=${prom_id}`;
+    if(is_buy){
+      url = `/api/weshop/ordergoods/getUserBuyPromNum?store_id=${os.stoid}&user_id=${userInfo.user_id}&prom_type=3&prom_id=${prom_id}`;
+    }
+    let res = await getApp().request.promiseGet(url, {
+      data: {}
+    });
+    let user_pre_buynum = 0
+    if (res.data.code == 0 && res.data.data) {
+      user_pre_buynum = res.data.data.userbuynum
+    }
+    return user_pre_buynum
+  },
 });
 \ No newline at end of file
@@ -55,11 +55,16 @@ module.exports = {
                 need_ck=th.data.in_zhact_new[aid]?th.data.in_zhact_new[aid]:0;
             }
             if(need_ck+act.zh_buy_num>=act.zh_num ){
-                return false;
+                if(!need_ok) {
+                    item_act_map.is_no_ok = 1;
+                }else{
+                    return false;
+                }
             }else{
                 min_can_buy= act.zh_num-act.zh_buy_num-need_ck;
             }
         }
+
         //-- 判断组合购的限购是不是到了 --
         if(act.buy_limit>0){
             var need_ck0=0;
@@ -67,8 +72,14 @@ module.exports = {
                 need_ck0=th.data.in_zhact_new[aid]?th.data.in_zhact_new[aid]:0;
             }
             var min_can_buy0=0;
-            if(need_ck+item_act_map.buyed>=act.buy_limit ){
-                return false;
+            if(need_ck+item_act_map.buyed>=act.buy_limit){
+                if(!need_ok) {
+                    item_act_map.is_no_ok = 1;
+                }else{
+                    return false;
+                }
+
+
             }else{
                 min_can_buy0=act.buy_limit-item_act_map.buyed-need_ck;
             }
@@ -554,7 +565,7 @@ module.exports = {
                                     user_id: getApp().globalData.user_id,
                                     goods_id: zh_goods[h].goods_id,
                                     prom_type: 7,
-                                    prom_id: item_act_map.prom_id
+                                    prom_id: item_act_map.prom_id, isnew:1
                                 },
                             })
                             if(res.data.code==0 && res.data.data && res.data.data.promgoodsbuynum){
@@ -612,7 +623,7 @@ module.exports = {
                 can_calc_cx[p].goods.map(function (gd){
                     ch_map.push(gd.goods_id);
                 })
-                ch_map.sort();
+                //ch_map.sort();
                 //-- 先找一下，有没有参与的商品一模一样的 --
                 var fd=show_can_cx[ch_map.join()];
                 if(fd){
@@ -670,6 +681,7 @@ module.exports = {
                              k_item.act_arr[ij].sele=1;
                              ck_prom_type= k_item.act_arr[ij];
                              k_item.cur_act=ck_prom_type;
+                             k_item.sele_prom_type=ck_prom_type.prom_type;
                          }
                     }
                 }
@@ -681,6 +693,7 @@ module.exports = {
                 k_item.act_arr[0].sele=1;
                 //-- 把当前活动进行赋值 --
                 k_item.cur_act=ck_prom_type;
+                k_item.sele_prom_type=ck_prom_type.prom_type;
             }
             //-- 如果是要控制数量的时候，也就是全选的时候，或者加减号的时候 --
@@ -799,6 +799,81 @@ module.exports = {
         return false
     },
+    //优惠促销的数据的格式话
+    format_yh_act(fir_act){
+        var more_arr = [];
+        if(fir_act){
+            //减价
+            if (fir_act.money > 0){
+
+                more_arr.push({
+                    text:'减价' + fir_act.money + '元',
+                    is_fir:1
+                });
+            }
+            if (fir_act.sale > 0) {
+                more_arr.push({
+                    text:'打' + fir_act.sale + '折',
+                    is_fir:1
+                });
+            }
+            if (fir_act.past == 1) {
+                more_arr.push({
+                    text:'包邮',
+                    is_fir:1
+                });
+            }
+            if (fir_act.intValue > 0){
+                more_arr.push({
+                    text:'送' + fir_act.intValue + '积分',
+                    is_fir:1
+                });
+            }
+            if (fir_act.couponId > 0) {
+                more_arr.push({
+                    text:'送' + fir_act.couponMoney + '元优惠券',
+                    is_quan:1
+                });
+            }
+
+            if (fir_act.gift_id) {
+                var is_more_gf = fir_act.gift_id.split(',')
+                if (is_more_gf.length > 1) {
+                    more_arr.push({
+                        text:'送赠品',
+                        is_gift:1,
+                        prom_id:fir_act.prom_id
+                    });
+                } else {
+                    more_arr.push({
+                        text:'送' + fir_act.goods_name + ' x' + fir_act.zp_num,
+                        is_gift:1,
+                        prom_id:fir_act.prom_id,
+                        is_no_goto:1,//不进行跳转的意思
+                    });
+                }
+            }
+            if (fir_act.lb_id){
+                more_arr.push({
+                    text:'送' + fir_act.lbtitle,
+                    lb_id:fir_act.lb_id
+                });
+            }
+            if (fir_act.zxlb_id){
+                more_arr.push({
+                    text:'送' + fir_act.zxlbtitle,
+                    zxlb_id:fir_act.zxlb_id
+                });
+            }
+            if (fir_act.monthgiftbag_id){
+                more_arr.push({
+                    text:'送' + fir_act.monthgiftbag_title,
+                    monthgiftbag_id:fir_act.monthgiftbag_id
+                });
+            }
+        }
+        return more_arr
+    },
     unserialize: unserialize,
     _throttle:_throttle,