diff --git a/components/promate_pop/promate_pop.js b/components/promate_pop/promate_pop.js
index adfcc05..18dc40f 100644
--- a/components/promate_pop/promate_pop.js
+++ b/components/promate_pop/promate_pop.js
@@ -4,23 +4,35 @@ Component({
 	  type:0,     //0只显示再商品详情页面   1显示再有选择按钮
 	  pro_pop:0,  //是否弹出
 	  cx_prom_group:[], //弹出框的内容展示
+	  is_cart:0
   },
   methods: {
 	  //-- 初始化弹出框 --
-	  set_init(type,cx_prom_group){
+	  set_init(type,cx_prom_group,is_cart){
 		 if(!type) type=0;
+		 if(!is_cart) is_cart=0;
 
+		 var fd=cx_prom_group.findIndex(function (gh){
+			 return gh.sele
+		 })
+		 if(fd==-1){
+			 cx_prom_group[0].sele=1;
+		 }
          this.setData({
-			 type:type,pro_pop:1,cx_prom_group
+			 type:type,pro_pop:1,cx_prom_group,is_cart:is_cart
 		 })
 	  },
 
-	  /*----pop的开关---*/
+	  /*----pop的开关,如果按钮是‘确定’，就要返回参数给父层组件---*/
 	  close_pro_pop: async function (event) {
-		this.setData({pro_pop: 0});
+		  this.setData({pro_pop: 0});
+		  if(!this.data.type) return false;
+		  var idx=this.data.cx_prom_group.findIndex(function (e){
+			  return e.sele==1;
+		  })
+		  this.triggerEvent('sure_cx_group',{sele_idx:idx},{bubbles: true});
 	  },
 
-
 	  go_the_url:function (e){
 		  var prom_id = e.currentTarget.dataset.id;
 		  var prom_type = e.currentTarget.dataset.prom_type;
@@ -37,15 +49,24 @@ Component({
 				  }
 				  break;
 			  case 7:
-				  url="/packageB/pages/zuhegou/index/index?id=" + id
+				  url="/packageB/pages/zuhegou/index/index?id=" + prom_id
 				  break;
 			  case 10:
 				  url="/pages/goods/goodsList/goodsList?ladder_id=" + prom_id;
 				  break;
 		  }
 		  getApp().goto(url);
+	  },
 
-
+	  //-- 选择活动 --
+	  sele_act:function (e){
+		  var index=e.currentTarget.dataset.index;
+		  var cx_prom_group=this.data.cx_prom_group;
+		  for (var idx=0;idx<cx_prom_group.length;idx++){
+              if(idx!=index) cx_prom_group[idx].sele=0;
+			  else cx_prom_group[idx].sele=1;
+		  }
+		  this.setData({cx_prom_group})
 	  }
 
   }
diff --git a/components/promate_pop/promate_pop.wxml b/components/promate_pop/promate_pop.wxml
index cd562bf..6d870f8 100644
--- a/components/promate_pop/promate_pop.wxml
+++ b/components/promate_pop/promate_pop.wxml
@@ -2,7 +2,7 @@
 <!-- --弹起领券-- -->
 <view wx:if='{{pro_pop==1}}'>
     <view class="cover-layer flex-center"  bindtap="close_pro_pop"></view>
-    <view class="cx-popup {{pro_pop== true ? 'up_pro' : 'down_pro'}} ">
+    <view class="cx-popup {{pro_pop== true ? 'up_pro' : 'down_pro'}}  {{is_cart?'cart_show':''}}" style="z-index: 3500" >
         <view class="top-frame">
             <view class="top t-c">促销列表</view>
         </view>
@@ -10,7 +10,6 @@
         <view class="xc-frame">
             <view class="top-frame">
                 <view class="xc-coupon-frame ">
-
                     <!-- for循环显示内容 -->
                     <view wx:for="{{cx_prom_group}}" class="item_pro flex ai-center">
                         <view class="tab_bx fs24">{{p_fil.set_tab_title(item)}}</view>
@@ -23,7 +22,7 @@
                             <view wx:else class="fs26">{{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==5}}" class="fs26">搭配价：<text class="c-red">{{item.show_price}}</text></view>
 
                             <view wx:if="{{item.prom_type!=3}}" class="fs22" style="color: #b9b6b6">
                                {{item.show_time}}
@@ -31,14 +30,30 @@
                             <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>
                             </view>
+                        </view>
+
+
+                        <view class="r_item_pro">
+                            <view style="text-align: center">
+                                <!-- 如果是弹出框进行选择的时候  -->
+                                <block wx:if="{{type==1}}">
+                                    <view wx:if="{{item.sele}}" class="circle white xc-hook on">
+                                        <text>Γ</text>
+                                    </view>
+                                    <view bindtap="sele_act" data-index="{{index}}" wx:else class="circle white xc-hook"></view>
 
+                                    <view style="height: 12rpx"></view>
+                                </block>
+                                <view bindtap="go_the_url" data-id="{{item.id}}" data-prom_type="{{item.prom_type}}" class="xq_btn fs30">详情</view>
+                            </view>
                         </view>
-                        <view bindtap="go_the_url" data-id="{{item.id}}" data-prom_type="{{item.prom_type}}" class="xq_btn fs30">详情</view>
+
                     </view>
 
                 </view>
             </view>
         </view>
+
         <view class="cx-confirm pd20"  bindtap="close_pro_pop">
             <view wx:if="{{type==0}}" class="confirm t-c">我知道了</view>
             <view wx:if="{{type==1}}" class="confirm t-c">确定</view>
diff --git a/components/promate_pop/promate_pop.wxss b/components/promate_pop/promate_pop.wxss
index b4b094b..99dc64c 100644
--- a/components/promate_pop/promate_pop.wxss
+++ b/components/promate_pop/promate_pop.wxss
@@ -8,6 +8,9 @@
     position: fixed;
     bottom: 0;
 }
+.cx-popup.cart_show{
+    bottom:100rpx
+}
 
 .cx-popup .top {
     font-size: 32rpx;
@@ -201,10 +204,17 @@
     background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAMAAADzapwJAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAABCUExURUdwTPInDPInDPgoDfMnDPYqEvInDPInDPInDP87NPUoDv8vEvMoDPInDPIoDPMnDvInDPInDPInDPIoDPQoDfInDEON4KMAAAAVdFJOUwD45yawG4zz3gQ0DmLOfECQZpPlS54kMQ4AAAC0SURBVBjTbZFREoMgDERDS0xQQNHu/a/alEGtaIYfHrBhs0S1pujVifo40VkhC+BUHSDzQTlBhjHY8bjogXmDZ+orJKwXwMUeUoa/0PeGbH8Q4Y5CJopYOjosiOQxdpRGk1UXOkrBKdkimtN8UrKrJBVXdzsllSYSjR/0J9JaGn81WluWtonYKQ0op51P3M2L2bmZN9n8MKoVqTph/RsseyjfYxAkfgot/82CpuJVLOLSIv4Cd5AJ37BgpFwAAAAASUVORK5CYII=) no-repeat;
     background-size: 22rpx auto;
 }
-.xq_btn{
+
+.r_item_pro{
     position: absolute;
     right: 18rpx;
-    top:52rpx;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.xq_btn{
     width: 100rpx;
     height: 60rpx;
     background-color: #e03033;
@@ -220,4 +230,21 @@
 }
 
 
+/*选择的圆圈*/
+.xc-hook {
+    width: 30rpx;
+    height: 30rpx;
+    line-height: 30rpx;
+    text-align: center;
+    border: 1rpx solid #999;
+    display: inline-block;
+}
+/*选中的时候*/
+.xc-hook.on {
+    transform: rotate(-135deg);
+    background-color: #d60021;
+}
+
+
+
 @import '../../app.wxss';
diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index 48932cb..366b29b 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -199,7 +199,13 @@ Page({
           //判断组合购活动是不是满足
           if(is_zh_ok){
             if(!item1.more_cx) item1.more_cx=[];
-            item1.more_cx.push({prom_type:7,prom_id:zh_id,gdlist:gdlist})
+            var show_time=ut.formatTime(zh_pro0.start_time)+"至"+ ut.formatTime(zh_pro0.end_time);
+            item1.more_cx.push({
+               prom_type:7,prom_id:zh_id,gdlist:gdlist,
+               title: zh_pro0.name,
+               show_time: show_time,
+               id:zh_id
+            })
           }
         }
       }
@@ -214,7 +220,16 @@ Page({
       //-- 如果是搭配购的时候 --
       if (r_data.collocationList) {
         if(!item1.more_cx) item1.more_cx=[];
-        item1.more_cx.push({prom_type:5,prom_id: r_data.collocationPromList.id});
+
+        var show_price= '￥'+r_data.collocationPromList.max+'-'+ r_data.collocationPromList.min;
+        var show_time=ut.formatTime(r_data.collocationPromList.start_time)+"至"+ ut.formatTime(r_data.collocationPromList.end_time);
+
+        item1.more_cx.push({
+          prom_type:5,prom_id: r_data.collocationPromList.id,
+          title: r_data.collocationPromList.title,
+          show_time: show_time,
+          id:r_data.collocationPromList.id,
+        });
       }
       //-- 如果是阶梯促销的时候 --
       if (r_data.ladderLists) {
@@ -224,7 +239,27 @@ Page({
           if (res.data.code == 0 && res.data.data) {
             th.data.ladder_map[act_id] = res.data.data;
             if(!item1.more_cx) item1.more_cx=[];
-            item1.more_cx.push({prom_type:10,prom_id: act_id});
+
+            var prom_content = "";
+
+            for (let jj in r_data.ladderLists) {
+              if (r_data.ladderLists[jj].discount == 10) {
+                prom_content += "第" + (parseInt(jj) + 1) + "件原价，";
+              } else {
+                prom_content += "第" + (parseInt(jj) + 1) + "件" + r_data.ladderLists[jj].discount + "折，";
+              }
+            }
+            prom_content = ut.sub_last(prom_content);
+
+            var s_time=res.data.data.start_time;
+            var e_time=res.data.data.end_time;
+
+            item1.more_cx.push({
+              prom_type:10,prom_id: act_id,
+              title: prom_content,
+              show_time: ut.formatTime(s_time) + "至" + ut.formatTime(e_time),
+              id:act_id
+            });
           }
         })
 
@@ -259,7 +294,33 @@ Page({
         //--- 这个地方是在计算优惠促销的限购 ---
         if(!fir_act.limit_num || th.data.user_pre_buynum<fir_act.limit_num){
 
-          var push_item={prom_type:3,prom_id: fir_act.prom_id,fir_act:fir_act};
+
+          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.lb_id) more_arr.push('送'+fir_act.lbtitle);
+          if (fir_act.zxlb_id) more_arr.push('送'+fir_act.zxlbtitle);
+
+          var push_item={
+            prom_type:3,prom_id: fir_act.prom_id,fir_act:fir_act,
+            condition: fir_act.condition + (fir_act.prom_type == 1 ? '件' : '元'),
+            limit: '每人' + (fir_act.limit_num ? '限参与' + fir_act.limit_num + '次' : '参与不限次'),
+            more: more_arr,
+            id:fir_act.prom_id
+          };
+
           //--- 如果是一件商品的时候，那么就要判断这个商品。同时商品的购买数量有没有满足  ---
           if (is_state == 1) {
             //-- 按件进行计算 --
@@ -311,7 +372,6 @@ Page({
       this.getTabBar().setData({
         active: index //数字是当前页面在tabbar的索引
       })
-
       getApp().requestCardNum(this);
     }
 
@@ -2133,10 +2193,9 @@ Page({
             }
           }
         });
-
-
-
       }
+      //-- 切换活动的按钮要把他返回 --
+      this.data.change_act=0;
     }
 
     //-- 服务卡 --
@@ -3223,7 +3282,9 @@ Page({
                             var data = {
                               id: g_arr[i].id,
                               selected: 1,
-                              store_id: oo.stoid
+                              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) {
@@ -3253,6 +3314,8 @@ Page({
                       wx.hideLoading();
                       return false;
                     }
+
+
                     wx.hideLoading();
                     wx.navigateTo({
                       url: "/packageE/pages/cart/cart2/cart2"
@@ -3413,7 +3476,9 @@ Page({
                       var data = {
                         id: g_arr[i].id,
                         selected: 1,
-                        store_id: oo.stoid
+                        store_id: oo.stoid,
+                        prom_type:g_arr[i].prom_type,
+                        prom_id:g_arr[i].prom_id,
                       };
 
                       //-- 如果有线下取价的时候 --
@@ -4339,11 +4404,9 @@ Page({
   //-- 判读一下促销分组的问题 --
   async cart_cx_group(goods,car_item,func){
 
-      if(car_item.change_act){
-
-         car_item.change_act=0;
+      //更改活动的时候，就不能再重新计算活动，只有再加减数量和选择商品的时候，就要重新计算活动
+      if(this.data.change_act){
          var show_can_cx=car_item.show_can_cx;
-
          for(var k in show_can_cx){
           var k_item=show_can_cx[k];
           var ck_prom_type=null;
@@ -4394,7 +4457,6 @@ Page({
           }
 
         }
-         
          func(show_can_cx);
       }
 
@@ -4479,6 +4541,7 @@ Page({
                     can_calc_cx.push(item_act_map)
                  }
                  break
+
             case 7:
                  //-- 活动列表 --
                  var zhact_gdlist=item_act_map.act.gdlist;
@@ -4529,6 +4592,7 @@ Page({
       //-- 同时相同商品数量的活动，还要看取那一个来进行计算金额。  默认的时候是按照后台的顺序。--
       //-- 有选择的时候，就按照切换选择了什么就按照什么来计算 --
       var show_can_cx={};
+
       if(can_calc_cx.length){
             for(var p=0;p<can_calc_cx.length;p++){
                 var ch_map=[];
@@ -4543,6 +4607,9 @@ Page({
                    fd.act_arr.push(can_calc_cx[p])
                 }else{
                    var e={ch_map:ch_map,act_arr:[]};
+                  if(ch_map.length>1){
+                     e.is_duo_gd=1;
+                  }
                    e.act_arr.push(can_calc_cx[p]);
                    show_can_cx[ch_map.join()]=e;
                 }
@@ -4585,7 +4652,6 @@ Page({
            }
            //-- 此时已经确定了商品的活动是什么类型的，可以确定购物车中商品的具体活动进行金额的计算 --
            if(!ck_prom_type) ck_prom_type=k_item.act_arr[0];
-
            //-- 此时要把购物车中的商品确定活动 --
            for (var b=0; b<ck_prom_type.goods.length;b++){
                 //-- 开始查找 --
@@ -4597,7 +4663,6 @@ Page({
                    goods[fg].prom_id=ck_prom_type.prom_id;
                 }
            }
-
       }
 
       //-- 显示到前端，并切换 --
@@ -4635,6 +4700,50 @@ Page({
           if(idx>-1) num++;
       })
       return num;
+  },
+
+  //-- 开始显示活动的弹出 --
+  switch_cx_group:function (e){
+    var idx=e.currentTarget.dataset.index;
+    var gd_key=e.currentTarget.dataset.gd_key;
+    this.data.sele_cx_group_cidx=idx;
+    this.data.cx_group_gd_key=gd_key;
+    //-- 获取到--
+    var cx_prom_group=this.data.requestData[idx].show_can_cx[gd_key].act_arr;
+
+    var cx_arr=[];
+    var find_sele=0;
+    for (var h=0;h<cx_prom_group.length;h++){
+       //-- 看有没有选中的活动 --
+       if(cx_prom_group[h].sele){
+         find_sele=1;
+       }
+       cx_arr.push(cx_prom_group[h].act);
+    }
+    //-- 如果没有，就默认第一个为选中 --
+    //-- if(!find_sele) cx_arr[0].sele=1; --
+    var cp_arr=JSON.parse(JSON.stringify(cx_arr));
+    var pro_pop = this.selectComponent("#pro_pop"); //组件的id
+    pro_pop.set_init(1,cx_arr,1);
+  },
+
+  //--- 选择回来时候的选择 ---
+  sure_cx_group:function(e){
+    var sele_idx=e.detail.sele_idx;
+    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;
+
+    for(var dx=0;dx<cx_prom_group.length;dx++){
+      if(dx!=sele_idx) cx_prom_group[dx].sele=0;
+      else cx_prom_group[dx].sele=1;
+    }
+
+    this.data.change_act=1;
+    this.doCheckAll();
+
   }
 
+
 });
\ No newline at end of file
diff --git a/pages/cart/cart/cart.json b/pages/cart/cart/cart.json
index 70ce71e..08f0ff2 100644
--- a/pages/cart/cart/cart.json
+++ b/pages/cart/cart/cart.json
@@ -2,6 +2,7 @@
     "navigationBarTitleText": "购物车",
     "usingComponents": {
         "warn": "/components/long_warn/long_warn",
-        "goods_recommend":"/components/goods_list/goods_list"
+        "goods_recommend":"/components/goods_list/goods_list",
+        "pro_pop": "/components/promate_pop/promate_pop"
     }
 }
\ No newline at end of file
diff --git a/pages/cart/cart/cart.wxml b/pages/cart/cart/cart.wxml
index e917be3..5a365c2 100644
--- a/pages/cart/cart/cart.wxml
+++ b/pages/cart/cart/cart.wxml
@@ -1,3 +1,6 @@
+<!-- 促销弹出框 -->
+<pro_pop id="pro_pop" bind:sure_cx_group="sure_cx_group"></pro_pop>
+
 <wxs module="g_filter" src="g_filter.wxs"></wxs>
 
 <block wx:if="{{ad_data}}">
@@ -38,7 +41,7 @@
 	
 	<!-- 商品的列表 -->
 	<block wx:if="{{requestData && requestData.length>0}}">
-      <block wx:for="{{requestData}}" wx:key="{{index}}" wx:for-item="item" wx:for-index="pidx">
+      <block wx:for="{{requestData}}" wx:key="{{pidx}}" wx:for-item="item" wx:for-index="pidx">
       <!-- 门店底下的商品 -->
       <view class="store">
         <view class="shmd_m">
@@ -54,7 +57,7 @@
 
         </view>
 
-        <block  wx:for="{{item.goods}}" wx:for-item="items" wx:for-index="idx" wx:key="{{index}}">
+        <block  wx:for="{{item.goods}}" wx:for-item="items" wx:for-index="idx" wx:key="{{idx}}">
             <view class="order-item" data-item="{{idx}}">
                 <block wx:if="{{!items.is_gift}}">
                     <view bindtap="check_th_item" class="order-raido flex-vertical " data-check="{{items.selected}}" data-item="{{idx}}" data-pitems="{{pidx}}">
@@ -129,7 +132,10 @@
             <!-- 新增促销多活动的排版 -->
             <view class="bdt16"
                   wx:if="{{g_filter.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 data-coupon="1" bindtap="switch_cx_group" class="cx-frame flex" style="position: relative">
+                <view bindtap="switch_cx_group"
+                      data-index="{{pidx}}"
+                      data-gd_key="{{items.goods_id}}"
+                      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="{{item.show_can_cx[items.goods_id].act_arr}}" >
@@ -148,11 +154,37 @@
         </block >
 
 
+          <!--此时是多个商品参与活动的切换 验证活动是不是多个，要不要显示切换 -->
+          <!-- 新增促销多活动的排版 -->
+          <block wx:if="{{item.show_can_cx}}">
+              <block  wx:for="{{item.show_can_cx}}" wx:for-item="pitem">
+                  <view class="bdt16" wx:if="{{pitem.is_duo_gd}}" >
+                          <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="{{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>
+                              </view>
+                              <view class="cx-obtain-coupon wsize">
+                                  <text class="bg_jj"></text>
+                              </view>
+                          </view>
+                  </view>
+              </block>
+          </block>
+
       </view>
-        <!--- 去凑单 -->
-       <view  style="margin-top: 20rpx; padding: 0 30rpx">
+           <!--- 去凑单 -->
           <block wx:if="{{item.make_up_arr}}">
-            <view class="flex jc_sb fs28" wx:for="{{item.make_up_arr}}" style="margin-bottom: 20rpx" >
+          <view  style="margin-top: 20rpx; padding: 0 30rpx">
+              <view class="flex jc_sb fs28" wx:for="{{item.make_up_arr}}" style="margin-bottom: 20rpx" >
               <view class="ellipsis-1" style="width: 80%">再买<text class="co-red">{{item.diff}}<text wx:if="{{item.diff_type==0}}">元</text>
                           <text wx:if="{{item.diff_type==1}}">件</text>
                    </text>，
@@ -168,8 +200,8 @@
               </view>
                 <view class="co-red" data-prom_id="{{item.prom_id}}" bindtap="go_cou_dang">去凑单></view>
               </view>
+          </view>
           </block>
-        </view>
           <!-- 还差多少件立即享受组合购 -->
           <block wx:if="{{item.need_list && item.need_list.length>0 && !is_edit}}">
             <view class="fs28 pdr20 pdl20 pdb20 c-red2 flex jc_sb" wx:for="{{item.need_list}}">