From c227e66fd61dd8b4768fed2c910f2d4d3a9d94d2 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Wed, 5 Jul 2023 15:01:45 +0800
Subject: [PATCH] 组合购切换的问题

---
 packageE/pages/cart/cart2/cart2.wxml      | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------
 packageE/pages/cart/cart2/filter.wxs      | 37 ++++++++++++++++++++++++++++++++++++-
 packageE/pages/cart/cart2/zh_calculate.js | 24 ++++++++++++++++++------
 3 files changed, 108 insertions(+), 33 deletions(-)

diff --git a/packageE/pages/cart/cart2/cart2.wxml b/packageE/pages/cart/cart2/cart2.wxml
index 07ee0dc..c84ced8 100644
--- a/packageE/pages/cart/cart2/cart2.wxml
+++ b/packageE/pages/cart/cart2/cart2.wxml
@@ -115,8 +115,9 @@
               </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].cur_act.prom_type)}}">
                  <view bindtap="switch_cx_group"
@@ -139,35 +140,62 @@
                </view>
              </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 && util.check_is_last(index,items.goods_id,items.is_act_last,pitem.cur_act.prom_type) }}" >
+
+                        <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 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>
+<!--        <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}}"
diff --git a/packageE/pages/cart/cart2/filter.wxs b/packageE/pages/cart/cart2/filter.wxs
index 282ee3c..df76675 100644
--- a/packageE/pages/cart/cart2/filter.wxs
+++ b/packageE/pages/cart/cart2/filter.wxs
@@ -21,8 +21,43 @@ function check_show(items,sele_prom_type){
    return true;
 }
 
+//prom_type活动类型
+//goods_id 商品的id
+//index多活动的索引
+//is_act_last 是不是最后一个
+
+function check_is_last(index,goods_id,is_act_last,prom_type){
+    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([7,10].indexOf(prom_type)>-1){
+        if(is_act_last==0) return false;
+        return true
+    }
+    //-- 判断是不是活动的最后一个商品 --
+    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
 }
diff --git a/packageE/pages/cart/cart2/zh_calculate.js b/packageE/pages/cart/cart2/zh_calculate.js
index f6b803f..445bc02 100644
--- a/packageE/pages/cart/cart2/zh_calculate.js
+++ b/packageE/pages/cart/cart2/zh_calculate.js
@@ -253,6 +253,10 @@ module.exports = {
                     }
                 }
 
+
+
+                //-- 暂存的数组 --
+                var temp_arr=[];
                 if (Object.keys(goods_map).length) {
                     //这里就开始拆分提交订单时的列表
                     for (let j in goods_map) {
@@ -270,8 +274,8 @@ module.exports = {
                         new_g.prom_type = 0;
                         new_g.prom_id = 0;
                         new_g.is_zh_split = 1;  //-- 是组合购拆分出去的 --
-                        goods.push(new_g);
-
+                        //暂时存储一下
+                        temp_arr.push(new_g);
                         //如果商品的数量已经为空了
                         if (goods[idx].goods_num <= 0) {
                             goods.splice(idx, 1);
@@ -279,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;
--
libgit2 0.21.4