From e2015e88c3fb95c9d11dbb0e15ad21b7c843f413 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Tue, 18 Apr 2023 14:51:11 +0800
Subject: [PATCH] 优惠促销多活动的后台优化

---
 packageE/pages/cart/cart2/cart2.js        | 395 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------
 packageE/pages/cart/cart2/cart2.wxml      |  99 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------
 packageE/pages/cart/cart2/cart2.wxss      |  78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 packageE/pages/cart/cart2/filter.wxs      |  11 ++++++++++-
 packageE/pages/cart/cart2/zh_calculate.js |  82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/cart/cart/cart.js                   |   6 ++++--
 pages/cart/cart/cart.wxml                 |   4 ++--
 pages/cart/cart/cart.wxss                 |   1 +
 8 files changed, 621 insertions(+), 55 deletions(-)

diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index 3c0daf9..2a2f12e 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -678,10 +678,9 @@ Page({
   },
 
 
-  //获取促销活动的组合
-  cx_prom_group(prom_list){
+  //-- 获取促销活动的组合 --
+  cx_prom_group(prom_list,item1){
       var th=this;
-
       //需要读者系统顺序
       var json_d =this.data.json_d;
       var auto_promote_sale=json_d.auto_promote_sale;
@@ -691,10 +690,13 @@ Page({
         sort_type='prom_type';
       }else{
            var auto_promote_sale=auto_promote_sale.split(',');
-           //-- 循环处理 --
+           //--- 循环处理 ---
            prom_list.map(function (e){
                 var fd=auto_promote_sale.indexOf(e.prom_type+'');
                 e.sort=fd;
+                if(e.prom_type==item1.prom_type){
+                  e.sele=1;
+                }
            })
            sort_type='sort';
       }
@@ -703,7 +705,6 @@ Page({
       function comp(a, b) {
         return a[sort_type]-b[sort_type]; //升序
       }
-
       //使用sort排序
       prom_list.sort(comp);
   },
@@ -750,25 +751,10 @@ Page({
         //-- 判断组合购是总数量是不是存在 --
         var no_zh_num={};
 
-        //--------  如果是立即购买过来的时候 或者购买的商品只有一种的时候  ---
-        if(carr.length==1){
-            var item1=carr[0];
-            await th.buy_pro_group(item1,1);
-
-            if(item1.more_cx){
-              //-- 对活动进行排序 --
-              th.cx_prom_group(item1.more_cx);
-            }
-
-            if(item1.prom_type==0){
-                item1.prom_type=item1.more_cx[0].prom_type;
-                item1.prom_type=item1.more_cx[0].prom_id;
-            }
-        }
-
-
         for (var i = 0; i < carr.length; i++) {
           var item1 = carr[i];
+          //-- 获取一下商品的所有活动 --
+          await th.buy_pro_group(item1);
           //把已经购买了多少见的内容填入
           var goodsbuynum = 0, promgoodsbuynum = 0;
           //--要获得商品，该用户买了多少件,同步应用--
@@ -1153,6 +1139,13 @@ Page({
         //-- 循环计算一下线下取价 --
         for (var k = 0; k < arr.length; k++) {
           var c_item = arr[k];
+
+          //-- 要进行归类一下活动 --
+          await th.cart_cx_group(arr[k].goods,c_item,(show_can_cx)=>{
+             arr[k].show_can_cx=show_can_cx;
+          })
+
+
           var item = arr[k].goods;
           var offline_price = 0;
           var offline_num = 0;
@@ -1201,8 +1194,7 @@ Page({
           await getApp().request.promisePost("/api/weshop/order/getrebateSum", {
             is_json: 1, data: req_d
           }).then(rs => {
-            
-            if (rs.data.code == 0) back_data = rs.data.data;
+             if (rs.data.code == 0) back_data = rs.data.data;
           });
 
           if (back_data && parseFloat(back_data)) {
@@ -1876,7 +1868,7 @@ Page({
       if (is_zh_ok) {
 
         //-- 组合的数组填充一下 --
-        th.data.zuhe_map[zh_pro0.id] = zh_pro0;
+        th.data.zhhe_act_map[zh_pro0.id] = zh_pro0;
 
         var url1 = "/api/weshop/prom/zhbuyGoods/page";
         var req_data = {
@@ -2071,13 +2063,13 @@ Page({
           if (is_state == 1) {
             //-- 按件进行计算 --
             if (fir_act.prom_type == 1) {
-              if (fir_act.condition > item1.goods_num) {
+              if (fir_act.condition <= item1.goods_num) {
                 item1.more_cx.push(push_item);
               }
             }else{
               //-- 按数量进行计算 --
               var all_price = item1.goods_price * item1.goods_num;
-              if (parseFloat(fir_act.condition) > parseFloat(parseFloat(all_price).toFixed(2))) {
+              if (parseFloat(fir_act.condition) <= parseFloat(parseFloat(all_price).toFixed(2))) {
                 item1.more_cx.push(push_item);
               }
             }
@@ -7349,6 +7341,355 @@ Page({
          }
     }
     return false;
+  },
+
+
+  //-- 判读一下促销分组的问题 --
+  async cart_cx_group(goods,car_item,func){
+
+    //更改活动的时候，就不能再重新计算活动，只有再加减数量和选择商品的时候，就要重新计算活动
+    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;
+        //-- 如果是多活动，先把活动按照后台的顺序排序一下，
+        //-- 同时确定一下商品最终要用什么活动来购买计算。  --就是要进行切换 --
+        if(k_item.act_arr.length>1){
+          var json_d =this.data.json_d;
+          var auto_promote_sale=json_d.auto_promote_sale;
+          var sort_type='';
+
+          if(!auto_promote_sale){
+            sort_type='prom_type';
+          }else{
+            var auto_promote_sale=auto_promote_sale.split(',');
+            //-- 循环处理 --
+            k_item.act_arr.map(function (e){
+              var fd=auto_promote_sale.indexOf(e.prom_type+'');
+              e.sort=fd;
+            })
+            sort_type='sort';
+          }
+          //-- 排序一下,进行升序 --
+          function comp(a, b) {
+            return a[sort_type]-b[sort_type]; //升序
+          }
+          //活动要排序一下
+          k_item.act_arr.sort(comp);
+
+          //确定一下活动,先看一下有没有选择的活动
+          ck_prom_type=k_item.act_arr.find(function (el){
+            return el.sele;
+          })
+
+        }
+        //-- 此时已经确定了商品的活动是什么类型的，可以确定购物车中商品的具体活动进行金额的计算 --
+        if(!ck_prom_type) ck_prom_type=k_item.act_arr[0];
+
+        //-- 此时要把购物车中的商品确定活动 --
+        for (var b=0; b<ck_prom_type.goods.length;b++){
+          //-- 开始查找 --
+          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;
+          })
+          if(fg>-1){
+            goods[fg].prom_type=ck_prom_type.prom_type;
+            goods[fg].prom_id=ck_prom_type.prom_id;
+          }
+        }
+
+      }
+      func(show_can_cx);
+      return false;
+    }
+
+    var th=this;
+    //-- 促销活动对象表,最初的map表，包含活动类型，活动id，goods商品 ---
+    var cx_act_map=[];
+    for(var i=0; i<goods.length;i++){
+      var c_item=goods[i];
+      //没有选中
+      if(!c_item.selected) continue;
+      //如果是秒杀之类是商品
+      if([1,2,4,6,8,9].indexOf(c_item.prom_type)>-1) continue;
+
+      //-- 把活动进行规整 --
+      var more_cx=c_item.more_cx;
+      for (var j=0;j<more_cx.length;j++){
+        var n_item=more_cx[j];
+        var key=n_item.prom_type+'-'+n_item.prom_id;
+        var fd=cx_act_map.find(function (e){
+          return e.key==key;
+        })
+        if(fd){
+          fd.goods.push(c_item);
+        }else{
+          var p_item={key:key,prom_type:n_item.prom_type,prom_id:n_item.prom_id,goods:[],act:n_item};
+          p_item.goods.push(c_item);
+          cx_act_map.push(p_item);
+        }
+      }
+      goods[i].prom_type=0;
+      goods[i].prom_id=0;
+    }
+    //-- 如果活动数量大于1个，那么活动就要排序一下，有商品种类数最多排再前面，降序进行排列 --
+    if(cx_act_map.length>1){
+      //门店分类要排序下
+      function compare(a, b) {
+        var value1 = a.goods.length;
+        var value2 = b.goods.length;
+        return value2 - value1;
+      }
+      cx_act_map.sort(compare);
+    }
+    //-- 能够进行最后计算的活动(包含切换) --
+    var can_calc_cx=[];
+    //-- 此时对数组的活动进行判断，看能不能达到购买数量的条件 --
+    for(var ii=0;ii<cx_act_map.length;ii++){
+
+      var item_act_map=cx_act_map[ii];
+      //如果活动有交集的时候，商品数量一样多（不是完全相同时，就是参与的商品有交集），就按照后台确定的活动顺序
+      //如果活动商品数量少的和  活动数量多的 有交集，那么数量少的不显示，也不计算
+      //如果活动的商品一样（那就是多活动切换），优先计算的活动按照后台确定的活动顺序
+      if(!th.check_ok_cx_pro(item_act_map,can_calc_cx)){
+        continue;
+      }
+      switch(item_act_map.prom_type){
+        case 3:
+          var fir_act=item_act_map.act.fir_act;
+          var t_goods=item_act_map.goods;
+          var all_num=0;
+          var all_pri=0;
+          for(var f=0;f<t_goods.length;f++){
+            all_num+=t_goods[f].goods_num;
+            all_pri+=t_goods[f].goods_num*t_goods[f].goods_price;
+          }
+
+          var yh_ok=1;
+          switch (fir_act.prom_type){
+            case 0:
+              if(all_pri<fir_act.condition) {
+                yh_ok=0;
+              }
+              break;
+            case 1:
+              if(all_num<fir_act.condition) {
+                yh_ok=0;
+              }
+              break;
+          }
+
+          //-- 如果有满足优惠条件的时候 --
+          if(yh_ok){
+            can_calc_cx.push(item_act_map)
+          }
+          break
+
+        case 7:
+          //-- 活动列表 --
+          var zhact_gdlist=item_act_map.act.gdlist;
+          var zh_goods=item_act_map.goods;
+
+          //--- 要循环计算一下商品的已购数量 ---
+          for(var h=0;h<zh_goods.length;h++){
+            //-- 商品的限购 --
+            var promgoodsbuynum = 0;
+            var res=await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
+              data: {
+                store_id: os.stoid,
+                user_id: getApp().globalData.user_id,
+                goods_id: zh_goods[h].goods_id,
+                prom_type: 7,
+                prom_id: item_act_map.prom_id
+              },
+            })
+            if(res.data.code==0 && res.data.data && res.data.data.promgoodsbuynum){
+              promgoodsbuynum = res.data.data.promgoodsbuynum;
+            }
+            zh_goods[h].zh_b_num=promgoodsbuynum;
+          }
+          //-- 放到map中 --
+          th.data.zuhe_map_good[item_act_map.prom_id] = zhact_gdlist;
+          if(!car_item.zh_prom_goods) car_item.zh_prom_goods={};
+          car_item.zh_prom_goods[item_act_map.prom_id] = zhact_gdlist;
+
+          var zh_pro0 = null;
+          //-- 获取活动信息 --
+          var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + item_act_map.prom_id + "/" + getApp().globalData.user_id;
+          await getApp().request.promiseGet(url, {}).then(rh => {
+            zh_pro0 = rh.data.data;
+          })
+          if(!zh_pro0) break;
+          //当满足组合的要求：总数要满足，起购数要满足
+          if(zh_calc.ch_zh_ok(zh_pro0,zhact_gdlist,zh_goods,th)){
+            can_calc_cx.push(item_act_map)
+          }
+          break;
+        default:
+          can_calc_cx.push(item_act_map);
+      }
+
+    }
+
+    //-- 此时来给满足条件的活动进行分组~~相同参与商品和数量的归纳再一起， --
+    //-- 同时相同商品数量的活动，还要看取那一个来进行计算金额。  默认的时候是按照后台的顺序。--
+    //-- 有选择的时候，就按照切换选择了什么就按照什么来计算 --
+    var show_can_cx={};
+
+    if(can_calc_cx.length){
+      for(var p=0;p<can_calc_cx.length;p++){
+        var ch_map=[];
+        can_calc_cx[p].goods.map(function (gd){
+          ch_map.push(gd.goods_id);
+        })
+        ch_map.sort();
+        //-- 先找一下，有没有参与的商品一模一样的 --
+        var fd=show_can_cx[ch_map.join()];
+        if(fd){
+          //-- 把数组添加进去 --ch_map
+          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;
+        }
+      }
+    }
+
+    for(var k in show_can_cx){
+      var k_item=show_can_cx[k];
+      var ck_prom_type=null;
+      //-- 如果是多活动，先把活动按照后台的顺序排序一下，
+      //-- 同时确定一下商品最终要用什么活动来购买计算。  --就是要进行切换 --
+      if(k_item.act_arr.length>1){
+        var json_d =this.data.json_d;
+        var auto_promote_sale=json_d.auto_promote_sale;
+        var sort_type='';
+
+        if(!auto_promote_sale){
+          sort_type='prom_type';
+        }else{
+          var auto_promote_sale=auto_promote_sale.split(',');
+          //-- 循环处理 --
+          k_item.act_arr.map(function (e){
+            var fd=auto_promote_sale.indexOf(e.prom_type+'');
+            e.sort=fd;
+          })
+          sort_type='sort';
+        }
+        //-- 排序一下,进行升序 --
+        function comp(a, b) {
+          return a[sort_type]-b[sort_type]; //升序
+        }
+        //活动要排序一下
+        k_item.act_arr.sort(comp);
+
+        //确定一下活动,先看一下有没有选择的活动
+        ck_prom_type=k_item.act_arr.find(function (el){
+          return el.sele;
+        })
+
+      }
+      //-- 此时已经确定了商品的活动是什么类型的，可以确定购物车中商品的具体活动进行金额的计算 --
+      if(!ck_prom_type) ck_prom_type=k_item.act_arr[0];
+      //-- 此时要把购物车中的商品确定活动 --
+      for (var b=0; b<ck_prom_type.goods.length;b++){
+        //-- 开始查找 --
+        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;
+        })
+        if(fg>-1){
+          goods[fg].prom_type=ck_prom_type.prom_type;
+          goods[fg].prom_id=ck_prom_type.prom_id;
+        }
+      }
+    }
+
+    //-- 显示到前端，并切换 --
+    //th.setData({show_can_cx})
+    //--- 调用回调函数 ---
+    func(show_can_cx);
+  },
+  //-- 查看活动参与的商品是不是有重复交集的地方，是不是一样的商品数量，can_calc_cx这个数组也是按照商品的数量降序排列的--
+  check_ok_cx_pro(item_act_map,can_calc_cx){
+    //-- 加入第一个，返回真 --
+    if(!can_calc_cx.length) return true;
+    var th_goods=item_act_map.goods;
+    for(var i=0;i<can_calc_cx.length;i++){
+      var can_goods=can_calc_cx[i].goods;
+      //计算一下有交集的数量,没有交集，OK
+      var num=this.hasJiao(can_goods,th_goods);
+      if(!num) continue;
+      //计算一下俩个shu
+      if(can_goods.length==th_goods.length && can_goods.length==num){
+        return true;
+      }
+      if(can_goods.length>th_goods.length){
+        return false;
+      }
+    }
+    return true;
+  },
+  //-- 判断是不是有交集,返回交集的数量 --
+  hasJiao(arr1, arr2){
+    var num=0;
+    arr1.map(function (e){
+      var idx=arr2.findIndex(function (g){
+        return g.goods_id==e.goods_id;
+      })
+      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.calculatePrice();
+
   }
 
+
 });
diff --git a/packageE/pages/cart/cart2/cart2.wxml b/packageE/pages/cart/cart2/cart2.wxml
index f5b5018..cc05e62 100644
--- a/packageE/pages/cart/cart2/cart2.wxml
+++ b/packageE/pages/cart/cart2/cart2.wxml
@@ -1,5 +1,5 @@
 <!-- 促销弹出框 -->
-<pro_pop id="pro_pop"></pro_pop>
+<pro_pop id="pro_pop" bind:sure_cx_group="sure_cx_group"></pro_pop>
 
 <wxs module="filter" src="c_filter.wxs"></wxs>
 <wxs src="filter.wxs" module="util"></wxs>
@@ -85,32 +85,85 @@
           <!-- <view>门店：{{item.pname}}</view> -->
           <view>{{item.pname}}</view>
         </view>
-        <view class="order-detail" wx:for="{{item.goods}}" wx:for-index="idx" wx:for-item="items">
-          <!----商品图片----->
-          <view class="goods-img" style="position: relative; overflow: hidden" bindtap="go_url" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{items.goods_id}}&prom_type={{items.prom_type}}&prom_id={{items.prom_id}}">
-            <image wx:if="{{items.is_gift}}" src="{{imgUrl}}/miniapp/images/giveaway.png" class="gift_image"></image>
-            <text class="zuhe" wx:if="{{items.prom_type==7}}">组合购</text>
-            <image class="wh100 bdr14" src="{{items.original_img}}" binderror='cart_set_err' data-err='cartlist[{{pidx}}].goods[{{idx}}].original_img'></image>
-          </view>
-          <!----商品名称规格---->
-          <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{items.goods_id}}&prom_type={{items.prom_type}}&prom_id={{items.prom_id}}">
-            <view class="goods-name ellipsis-2">{{items.goods_name}}</view>
-            <!-- 商品属性 -->
-            <view class="flex-vertical fs28 color-gray n_guige">
-              <view class="goods-color">
-                <block><text>{{filters.show_gui_ge(items.goods_spec,items.goods_color)}}</text></block>
+
+        <!-- for循环使用 -->
+        <block wx:for="{{item.goods}}" wx:for-index="idx" wx:for-item="items">
+            <view class="order-detail" >
+              <!----商品图片----->
+              <view class="goods-img" style="position: relative; overflow: hidden" bindtap="go_url" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{items.goods_id}}&prom_type={{items.prom_type}}&prom_id={{items.prom_id}}">
+                <image wx:if="{{items.is_gift}}" src="{{imgUrl}}/miniapp/images/giveaway.png" class="gift_image"></image>
+                <text class="zuhe" wx:if="{{items.prom_type==7}}">组合购</text>
+                <image class="wh100 bdr14" src="{{items.original_img}}" binderror='cart_set_err' data-err='cartlist[{{pidx}}].goods[{{idx}}].original_img'></image>
               </view>
+              <!----商品名称规格---->
+              <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{items.goods_id}}&prom_type={{items.prom_type}}&prom_id={{items.prom_id}}">
+                <view class="goods-name ellipsis-2">{{items.goods_name}}</view>
+                <!-- 商品属性 -->
+                <view class="flex-vertical fs28 color-gray n_guige">
+                  <view class="goods-color">
+                    <block><text>{{filters.show_gui_ge(items.goods_spec,items.goods_color)}}</text></block>
+                  </view>
+                </view>
+
+                <!-----商品名称规格------>
+                <view class="order-num flex-space-between">
+                  <view wx:if="{{items.prom_type==10}}" class="co-red">￥<text class="fs36">{{filters.toFix(items.goods_price,2)}}</text><text>({{items.discount}}折)</text></view>
+                  <view wx:else class="co-red">￥<text class="fs36">{{filters.toFix(items.goods_price,2)}}</text></view>
+                  <view style="color: red;" wx:if="{{items.use_commission && items.use_commission*1>0}}">佣金：{{filters.toFix(items.use_commission/items.goods_num,2)}}*{{items.goods_num}}</view>
+                  <view class="goods-num">x{{items.goods_num}}</view>
+                </view>
+              </navigator>
             </view>
+            <!-- 验证活动是不是多个，要不要显示切换 -->
+            <!-- 新增促销多活动的排版 -->
+            <view class="bdb16"
+                  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 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}}" >
+                    <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>
 
-            <!-----商品名称规格------>
-            <view class="order-num flex-space-between">
-              <view wx:if="{{items.prom_type==10}}" class="co-red">￥<text class="fs36">{{filters.toFix(items.goods_price,2)}}</text><text>({{items.discount}}折)</text></view>
-              <view wx:else class="co-red">￥<text class="fs36">{{filters.toFix(items.goods_price,2)}}</text></view>
-            <view style="color: red;" wx:if="{{items.use_commission && items.use_commission*1>0}}">佣金：{{filters.toFix(items.use_commission/items.goods_num,2)}}*{{items.goods_num}}</view>
-              <view class="goods-num">x{{items.goods_num}}</view>
+        <!--此时是多个商品参与活动的切换 验证活动是不是多个，要不要显示切换 -->
+        <!-- 新增促销多活动的排版 -->
+        <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>
-          </navigator>
-        </view>
+          </block>
+        </block>
+
 
         <!-- 使用搭配 -->
         <cart_collect_temp id="col{{pidx}}"
diff --git a/packageE/pages/cart/cart2/cart2.wxss b/packageE/pages/cart/cart2/cart2.wxss
index 27613fe..e1f5cc9 100644
--- a/packageE/pages/cart/cart2/cart2.wxss
+++ b/packageE/pages/cart/cart2/cart2.wxss
@@ -1143,3 +1143,81 @@ margin-left: 20rpx;
     font-size: 28rpx;
 }
 
+
+.cx-frame {
+    /* border-top:3rpx solid #eee; */
+    /* width:99%;
+    height: 95rpx;
+    line-height: 95rpx;
+    padding-left:24rpx; */
+    padding: 20rpx;
+    background-color: #fff;
+}
+
+.cx-frame .cx-sizs {
+    /* width: 68rpx; */
+    /* height: 100%; */
+    /* line-height: 100rpx; */
+    /* overflow: hidden; */
+    /* margin-left: 10rpx; */
+}
+
+.xc-coupon-fram {
+    position: relative;
+    margin-right: 16rpx;
+    /* width:200rpx; */
+    /* padding-top:30rpx; */
+
+}
+
+.xc-coupon-fram .xc-coupon {
+    /* width:175rpx ;
+    height: 40rpx;
+    line-height: 40rpx; */
+    background-color: #d60021;
+    /* margin:0 auto; */
+    color: #fff;
+    padding: 6rpx 20rpx;
+
+}
+
+.xc-coupon-fram .xc-circular {
+    width: 16rpx;
+    height: 16rpx;
+    background-color: white;
+    position: absolute;
+    top: 50%;
+    /* left: -10rpx; */
+    transform: translateY(-50%);
+}
+
+.cx-obtain-coupon {
+    /* width: 65rpx;
+    height: 100%;
+    padding-left:15rpx; */
+    color: #d70025;
+    display: flex;
+    align-items: center;
+    /* position: absolute;
+    right: 5rpx; */
+}
+
+.bg_jj {
+    width: 14rpx;
+    height: 14rpx;
+    border-top: 2rpx solid #d70026;
+    border-right: 2rpx solid #d70026;
+    transform: rotateZ(45deg);
+    display: inline-block;
+    margin-bottom: 3rpx;
+}
+
+.bg_jj.down {
+    transform: rotateZ(135deg);
+}
+
+.bg_jj.up {
+    transform: rotateZ(-45deg);
+    margin-top: 6rpx;
+}
+
diff --git a/packageE/pages/cart/cart2/filter.wxs b/packageE/pages/cart/cart2/filter.wxs
index c0e8d13..9b528dd 100644
--- a/packageE/pages/cart/cart2/filter.wxs
+++ b/packageE/pages/cart/cart2/filter.wxs
@@ -6,6 +6,15 @@ var format = function (text) {
   return text.replace(reg, '\n')
 }
 
+
+//判断商品是不是有活动切换
+function is_more_act(items,show_can_cx){
+  if([1,2,4,6,8,9].indexOf(items.prom_type)>-1) return false;
+  if(!show_can_cx) return false;
+  return true;
+}
+
 module.exports = {
-  format: format
+  format: format,
+  is_more_act:is_more_act
 }
diff --git a/packageE/pages/cart/cart2/zh_calculate.js b/packageE/pages/cart/cart2/zh_calculate.js
index 69e525a..d4697f1 100644
--- a/packageE/pages/cart/cart2/zh_calculate.js
+++ b/packageE/pages/cart/cart2/zh_calculate.js
@@ -539,6 +539,88 @@ module.exports = {
             }
         }
         return zhqty_bz_flag;
+    },
+
+    //-- 判断组合购有没有满足 ---
+    ch_zh_ok(act,gdlist,c_goods,th){
+        //-- 寻找一下 --
+        function get_num(ite) {
+            for (let v1 in c_goods) {
+                var vh = c_goods[v1];
+                if (vh.goods_id == ite.goods_id) {
+                    return vh;
+                }
+            }
+            return 0;
+        }
+        var goods =gdlist;
+        var all_num=0;
+        var need_to_buy=0;
+        for (var i in goods) {
+            var item = goods[i];
+            var cart_num = get_num(item).goods_num;
+            var zh_b_num = get_num(item).zh_b_num;
+            if (!cart_num) {
+                if (item.zhqty) {
+                    need_to_buy += item.zhqty;
+                }
+                continue;
+            }
+
+            item.cart_num = cart_num;
+            //-- 当商品有购买的时候,以及有限购的时候 --
+            if (item.buyqty > 0) {
+                var cbuy = item.buyqty - zh_b_num;
+                var key = item.goods_id + "" + act.id;
+                if (th.data.in_zhact_gdmap_gp[key]) {
+                    var cbuy = item.buyqty - zh_b_num - th.data.in_zhact_gdmap_gp[key];
+                }
+                //当可买的数量为0
+                if (cbuy <= 0) {
+                    item.num = 0;
+                } else {
+                    if (cbuy >= cart_num) item.num = cart_num;
+                    else {
+                        item.num = cbuy;
+                    }
+                }
+            } else {
+                item.num = cart_num;
+            }
+
+            if (item.num) {
+                all_num += item.num;
+                //当有起购数的控制的时候
+                if (item.zhqty) {
+                    if (item.num < item.zhqty) {
+                        need_to_buy += item.zhqty - item.num;
+                    }
+                }
+            } else {
+                if (item.zhqty) {
+                    need_to_buy += item.zhqty;
+                }
+            }
+        }
+
+        //当满足组合的要求：总数要满足，起购数要满足
+        if (all_num >= act.zhbuyqty && !need_to_buy) {
+            //商品的列表
+            for (var u in goods) {
+                var ite = goods[u];
+                if (ite.buyqty > 0 && ite.num > 0) {
+                    console.log(222, th.data.in_zhact_gdmap_gp);
+                    var key = ite.goods_id + "" + act.id;
+                    if (th.data.in_zhact_gdmap_gp[key]) {
+                        th.data.in_zhact_gdmap_gp[key] += ite.num;
+                    } else {
+                        th.data.in_zhact_gdmap_gp[key] = ite.num;
+                    }
+                }
+            }
+            return true;
+        }
+        return false;
     }
 
 
diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index 84d0099..bc1efa8 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -325,13 +325,13 @@ Page({
           if (is_state == 1) {
             //-- 按件进行计算 --
             if (fir_act.prom_type == 1) {
-              if (fir_act.condition > item1.goods_num) {
+              if (fir_act.condition <= item1.goods_num) {
                 item1.more_cx.push(push_item);
               }
             }else{
               //-- 按数量进行计算 --
               var all_price = item1.goods_price * item1.goods_num;
-              if (parseFloat(fir_act.condition) > parseFloat(parseFloat(all_price).toFixed(2))) {
+              if (parseFloat(fir_act.condition) <= parseFloat(parseFloat(all_price).toFixed(2))) {
                 item1.more_cx.push(push_item);
               }
             }
@@ -344,6 +344,8 @@ Page({
       }
     }
 
+    console.log(JSON.stringify(item1.more_cx),333);
+
   },
 
   onLoad: function () {
diff --git a/pages/cart/cart/cart.wxml b/pages/cart/cart/cart.wxml
index 8a70175..2e76e99 100644
--- a/pages/cart/cart/cart.wxml
+++ b/pages/cart/cart/cart.wxml
@@ -158,14 +158,14 @@
           <!-- 新增促销多活动的排版 -->
           <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}}" >
+                  <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="{{item.show_can_cx[index].act_arr}}" >
+                                  <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>
diff --git a/pages/cart/cart/cart.wxss b/pages/cart/cart/cart.wxss
index c06eba5..20979b5 100644
--- a/pages/cart/cart/cart.wxss
+++ b/pages/cart/cart/cart.wxss
@@ -401,6 +401,7 @@ page {
 }
 
 
+
 .cx-frame {
   /* border-top:3rpx solid #eee; */
   /* width:99%;
--
libgit2 0.21.4