diff --git a/components/promate_pop/promate_pop.wxml b/components/promate_pop/promate_pop.wxml
index 2f5f18d..038644c 100644
--- a/components/promate_pop/promate_pop.wxml
+++ b/components/promate_pop/promate_pop.wxml
@@ -18,10 +18,11 @@
                         </view>
 
                         <view class="item_pro_right">
-                            <view wx:if="{{item.prom_type!=3}}" class="fs26">{{item.title}}</view>
-                            <view wx:else class="fs26">{{item.title}}
+                            <view wx:if="{{item.prom_type!=3}}" class="fs26" style="max-width:81%" >{{item.title}}</view>
+                            <view wx:else class="fs26"  style="max-width:81%" >{{item.title}}
                                消费满<text class="c-red">{{item.condition}}</text>享优惠({{item.limit}})
                             </view>
+
                             <view wx:if="{{item.prom_type==5}}" class="fs26">搭配价：<text class="c-red">{{item.show_price}}</text></view>
 
                             <view wx:if="{{item.prom_type!=3}}" class="fs22" style="color: #b9b6b6">
diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index 264136b..e1935d5 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -788,9 +788,29 @@ Page({
   },
 
 
+  //-- is_change是有没有切换活动的意思 --
   async get_cart_next(carr,is_change){
 
-    if(is_change) carr=this.data.cartlist_y;
+    //--- 切换的时候一定要把赠品去掉 ---
+    if(is_change){
+
+      carr=this.data.cartlist_y;
+      //-- 剔除赠品的数据，等到确定活动是优惠促销的时候，在显示赠品, 赠品直接删除 --
+      var new_arr=[];
+      for (var ir = 0; ir < carr.length; ir++) {
+        if(carr[ir].is_gift && ) {
+          var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
+          getApp().request.delete(url, {
+            success: function (t) {}
+          });
+          //商品已经下架
+          continue;
+        }
+        new_arr.push(carr[ir]);
+      }
+      carr=new_arr;
+
+    }
     //按门店分类的数组
     var arr = new Array();
 
@@ -803,6 +823,7 @@ Page({
     var no_zh_num={};
 
     for (var i = 0; i < carr.length; i++) {
+
       var item1 = carr[i];
       //-- 获取一下商品的所有活动 --
       await th.buy_pro_group(item1);
@@ -844,179 +865,10 @@ Page({
         })
       }
 
-      //要把优惠活动加入,prom_goods_map中,赠品不要运算，代发商品不算优惠
-      if (item1.prom_type == 3 && item1.is_gift != 1 && !item1.whsle_id) {
-        // th.check_is_youhui(item1.goods_id, item1.pick_id);
-        //增加优惠活动次数限制
-        let limit_num= await th.getprom(item1)  //活动限制次数
-
-        if(!limit_num){
-          await th.add_prom_goods_map(item1);
-          // item1.prom_id=''
-          // item1.prom_type=''
-        }else{
-          let user_pre_buynum = await th.getUserBuyPromNum_pre(item1.prom_id)  //用户已经参与次数
-          if(user_pre_buynum<limit_num){
-            await th.add_prom_goods_map(item1);
-          }else{
-            // await th.add_prom_goods_map(item1);
-            item1.prom_id=''
-            item1.prom_type=''
-          }
-        }
-      }
-
-      //-- 如果组合购的总数量不足的处理 --
-      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]) {
-          var isok = 1;
-          var is_flag = 1;
-          var store_count_ok=1;
-          //如果有组合购
-          var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + item1.prom_id + '/' + getApp().globalData.userInfo.user_id;
-          await getApp().request.promiseGet(url, {}).then(res => {
-            if (res.data.code == 0 && res.data.data) {
-              //如果活动已经结束
-              if (res.data.data.is_end == 1) {
-                isok = 0;
-              }
-              if (ut.gettimestamp() > res.data.data.end_time) {
-                isok = 0;
-              }
-              item1.act = res.data.data;
-
-              //-- 在这里要判断一下活动的组合购总数量 --
-              if(item1.act.zh_num>0 && item1.act.zh_buy_num>=item1.act.zh_num){
-                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
-
-              }else{
-                th.data.zhhe_act_map[item1.prom_id] = res.data.data;
-              }
-
-            } else {
-              //未找到商品的活动
-              is_flag = 0;
-            }
-          })
-
-          if (!isok) {
-            getApp().my_warnning("组合购的活动已经过期", 0, th);
-            return false;
-          }
-
-          //------ 先增组合活动的总数量的时候 -------
-          if(store_count_ok) {
-            var url1 = "/api/weshop/prom/zhbuyGoods/page";
-            var req_data = {
-              page: 1,
-              pageSize: 2000,
-              store_id: os.stoid,
-              zh_id: item1.prom_id,
-            }
-            await getApp().request.promiseGet(url1, {
-              data: req_data
-            }).then(res => {
-              if (ut.ajax_ok(res)) {
-                var gdlist = res.data.data.pageData;
-                gdlist.forEach(i => {
-                  if (item1.goods_id == i.goods_id && !is_flag) {
-                    item1.prom_type = 0;
-                    item1.prom_type1 = 0;
-                    item1.prom_id = 0;
-                    item1.prom_id1 = 0
-                  }
-                })
-                th.data.zuhe_map_good[item1.prom_id] = gdlist;
-              }
-            })
-          }
-
-
-
-        }
-        else {
-          item1.act = th.data.zhhe_act_map[item1.prom_id];
-        }
-      }
-      if (item1.prom_type == 10) {
-        if (!th.data.ladder_map[item1.prom_id]) {
-          //如果有预售
-          var isok = 1;
-          var is_flag = 1;
-          var act = null;
-          var url = "/api/weshop/prom/ladderForm/get/" + os.stoid + "/" + item1.prom_id;
-          await getApp().request.promiseGet(url, {}).then(res => {
-            console.log(res, 1000);
-            if (res.data.code == 0 && res.data.data) {
-              if (res.data.data.isuse != 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.start_time) {
-                isok = 0;
-              }
-              act = res.data.data;
-
-            } else {
-              //未找到商品的活动
-              is_flag = 0;
-            }
-          })
-          if (!isok) {
-            var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item1.id;
-            getApp().request.delete(url, {});
-            th.data.ladder_map[item1.prom_id] = -1;
-            continue;
-          }
-          th.data.ladder_map[item1.prom_id] = act;
-
-          //-- 获取阶梯规则 --
-          var url1 = "/api/weshop/prom/ladderList/list";
-          var req_data = {
-            store_id: os.stoid,
-            form_id: item1.prom_id,
-          }
-          await getApp().request.promiseGet(url1, {
-            data: req_data
-          }).then(rs1 => {
-            if (rs1.data.code == 0 && rs1.data.data) {
-              var gdlist = rs1.data.data;
-              th.data.ladder_map[item1.prom_id].ladder_list = gdlist;
-            }
-          })
-        }
-      }
-
       if(is_change){
-         carr[i].collocationList=null;
+        carr[i].collocationList=null;
       }
 
-      //-- 判断一下，获取搭配购的消息,只有prom_type==5才会判断优惠活动  --
-      if ( item1.prom_type == 5 && (!carr[i].collocationList || !carr[i].collocationList.length)) {
-        await th.set_collection(item1, carr, i);
-      }
     }
 
     //在分组的时候，就不要再调用接口，await
@@ -1250,6 +1102,179 @@ Page({
           }
       }
 
+      //要在多活动确定之后，在来计算
+      for(var jh=0;jh<arr[k].goods.length;jh++){
+          var item1=arr[k].goods[jh]
+          //要把优惠活动加入,prom_goods_map中,赠品不要运算，代发商品不算优惠
+          if (item1.prom_type == 3 && item1.is_gift != 1 && !item1.whsle_id) {
+            // th.check_is_youhui(item1.goods_id, item1.pick_id);
+            //增加优惠活动次数限制
+            let limit_num= await th.getprom(item1)  //活动限制次数
+
+            if(!limit_num){
+              await th.add_prom_goods_map(item1);
+              // item1.prom_id=''
+              // item1.prom_type=''
+            }else{
+              let user_pre_buynum = await th.getUserBuyPromNum_pre(item1.prom_id)  //用户已经参与次数
+              if(user_pre_buynum<limit_num){
+                await th.add_prom_goods_map(item1);
+              }else{
+                // await th.add_prom_goods_map(item1);
+                item1.prom_id=''
+                item1.prom_type=''
+              }
+            }
+          }
+          //-- 如果组合购的总数量不足的处理 --
+          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]) {
+              var isok = 1;
+              var is_flag = 1;
+              var store_count_ok=1;
+              //如果有组合购
+              var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + item1.prom_id + '/' + getApp().globalData.userInfo.user_id;
+              await getApp().request.promiseGet(url, {}).then(res => {
+                if (res.data.code == 0 && res.data.data) {
+                  //如果活动已经结束
+                  if (res.data.data.is_end == 1) {
+                    isok = 0;
+                  }
+                  if (ut.gettimestamp() > res.data.data.end_time) {
+                    isok = 0;
+                  }
+                  item1.act = res.data.data;
+
+                  //-- 在这里要判断一下活动的组合购总数量 --
+                  if(item1.act.zh_num>0 && item1.act.zh_buy_num>=item1.act.zh_num){
+                    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
+
+                  }else{
+                    th.data.zhhe_act_map[item1.prom_id] = res.data.data;
+                  }
+
+                } else {
+                  //未找到商品的活动
+                  is_flag = 0;
+                }
+              })
+
+              if (!isok) {
+                getApp().my_warnning("组合购的活动已经过期", 0, th);
+                return false;
+              }
+
+              //------ 先增组合活动的总数量的时候 -------
+              if(store_count_ok) {
+                var url1 = "/api/weshop/prom/zhbuyGoods/page";
+                var req_data = {
+                  page: 1,
+                  pageSize: 2000,
+                  store_id: os.stoid,
+                  zh_id: item1.prom_id,
+                }
+                await getApp().request.promiseGet(url1, {
+                  data: req_data
+                }).then(res => {
+                  if (ut.ajax_ok(res)) {
+                    var gdlist = res.data.data.pageData;
+                    gdlist.forEach(i => {
+                      if (item1.goods_id == i.goods_id && !is_flag) {
+                        item1.prom_type = 0;
+                        item1.prom_type1 = 0;
+                        item1.prom_id = 0;
+                        item1.prom_id1 = 0
+                      }
+                    })
+                    th.data.zuhe_map_good[item1.prom_id] = gdlist;
+                  }
+                })
+              }
+
+
+
+            }
+            else {
+              item1.act = th.data.zhhe_act_map[item1.prom_id];
+            }
+          }
+          if (item1.prom_type == 10) {
+            if (!th.data.ladder_map[item1.prom_id]) {
+              //如果有预售
+              var isok = 1;
+              var is_flag = 1;
+              var act = null;
+              var url = "/api/weshop/prom/ladderForm/get/" + os.stoid + "/" + item1.prom_id;
+              await getApp().request.promiseGet(url, {}).then(res => {
+                console.log(res, 1000);
+                if (res.data.code == 0 && res.data.data) {
+                  if (res.data.data.isuse != 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.start_time) {
+                    isok = 0;
+                  }
+                  act = res.data.data;
+
+                } else {
+                  //未找到商品的活动
+                  is_flag = 0;
+                }
+              })
+              if (!isok) {
+                var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item1.id;
+                getApp().request.delete(url, {});
+                th.data.ladder_map[item1.prom_id] = -1;
+                continue;
+              }
+              th.data.ladder_map[item1.prom_id] = act;
+
+              //-- 获取阶梯规则 --
+              var url1 = "/api/weshop/prom/ladderList/list";
+              var req_data = {
+                store_id: os.stoid,
+                form_id: item1.prom_id,
+              }
+              await getApp().request.promiseGet(url1, {
+                data: req_data
+              }).then(rs1 => {
+                if (rs1.data.code == 0 && rs1.data.data) {
+                  var gdlist = rs1.data.data;
+                  th.data.ladder_map[item1.prom_id].ladder_list = gdlist;
+                }
+              })
+            }
+          }
+
+          //-- 判断一下，获取搭配购的消息,只有prom_type==5才会判断优惠活动  --
+          if ( item1.prom_type == 5 && (!carr[i].collocationList || !carr[i].collocationList.length)) {
+            await th.set_collection(item1, carr, i);
+          }
+      }
+
+
       var item = arr[k].goods;
       var offline_price = 0;
       var offline_num = 0;
@@ -1384,8 +1409,6 @@ Page({
     }, 500)
   },
 
-
-
   //-----单个商品购买的入口判断----
   get_buy_goods: function (e) {
     var th = this;
@@ -1903,6 +1926,10 @@ Page({
   async buy_pro_group(item1, is_state) {
     //-- 代发商品不参与任何活动 --
     if (item1.whsle_id) return false;
+    //-- 购物车的秒杀和团购不计算 --
+    var p_type=parseInt(item1.prom_type);
+    if([1,2].indexOf(p_type)>-1) return false;
+
     var th=this;
     var req_d = {
       store_id: os.stoid,
@@ -2087,6 +2114,13 @@ Page({
                     duo_zp_num_arr[item_map.prom_id] = t_zp_num;
                   }
                 }
+                //--- 不是多个赠品赠送的时候, ---
+                else{
+
+                }
+
+
+
               } else item_map.cy_cx = 0;
             })
           }
@@ -2271,8 +2305,6 @@ Page({
   },
 
 
-
-
   calclate_lbNum(r_data) {
     
     if(!r_data) return false;
@@ -7550,14 +7582,18 @@ Page({
           var fg=goods.findIndex(function (g_item){
             return g_item.goods_id==ck_prom_type.goods[b].goods_id
                 && [0,3,5,7,10].indexOf(g_item.prom_type)>-1
-                && g_item.pick_id==pk
+                && g_item.pick_id==pk && g_item.is_gift==0;
           })
           if(fg>-1){
             goods[fg].prom_type=ck_prom_type.prom_type;
             goods[fg].prom_id=ck_prom_type.prom_id;
-            th.data.cartlist_y[idx].goods[fg].prom_type= goods[fg].prom_type;
-            th.data.cartlist_y[idx].goods[fg].prom_id= goods[fg].prom_id;
 
+            for(var ik=0;ik< th.data.cartlist[idx].goods.length;ik++){
+                if(th.data.cartlist[idx].goods[ik].id==goods[fg].id){
+                  th.data.cartlist[idx].goods[ik].prom_type= goods[fg].prom_type;
+                  th.data.cartlist[idx].goods[ik].prom_id= goods[fg].prom_id;
+                }
+            }
           }
         }
 
diff --git a/packageE/pages/cart/cart2/cart2.wxml b/packageE/pages/cart/cart2/cart2.wxml
index f30e58c..a794f22 100644
--- a/packageE/pages/cart/cart2/cart2.wxml
+++ b/packageE/pages/cart/cart2/cart2.wxml
@@ -168,7 +168,6 @@
           </block>
         </block>
 
-
         <!-- 使用搭配 -->
         <cart_collect_temp id="col{{pidx}}"
                 bind:childFun="select_coll" sales_rules="{{sales_rules}}"
diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index cc01e00..7f2c4f5 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -4203,7 +4203,6 @@ Page({
               continue;
             }
 
-
             var url = "/api/weshop/cart/delGift?store_id=" + newd.store_id + "&user_id=" +
               newd.user_id + "&goods_id=" + newd.goods_id + "&is_gift=1&pick_id=" + newd.pick_id + "&prom_id=" + newd.prom_id
             await getApp().request.promiseDelete(url, {})
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index ca3ff1b..999fb55 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -7637,6 +7637,7 @@ Page({
                                     }
                                     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);
 
                                     //-- 开始组装数据 --
                                     th.add_cx_prom_group({