From 570ab1d3731e02856438f3b059509e6dcb7d331d Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Wed, 5 Jul 2023 23:23:40 +0800
Subject: [PATCH] 1、购物车的优化 2、确认订单页面的优化

---
 packageE/pages/cart/cart2/cart2.wxml | 57 +++++++++++++++++++++++++++++++++++++++++----------------
 packageE/pages/cart/cart2/filter.wxs |  9 ++-------
 utils/more_cx.js                     |  4 +++-
 3 files changed, 46 insertions(+), 24 deletions(-)

diff --git a/packageE/pages/cart/cart2/cart2.wxml b/packageE/pages/cart/cart2/cart2.wxml
index c84ced8..d672039 100644
--- a/packageE/pages/cart/cart2/cart2.wxml
+++ b/packageE/pages/cart/cart2/cart2.wxml
@@ -120,6 +120,7 @@
              <!-- 新增促销多活动的排版,单商品的时候 -->
              <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"
                        data-index="{{pidx}}"
                        data-gd_key="{{items.goods_id}}"
@@ -144,26 +145,50 @@
              <!-- 新增促销多活动的排版，多商品的时候 -->
              <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>
+
+                      <block wx:if="{{ pitem.sele_prom_type==7 || pitem.sele_prom_type==10 }}">
+                        <view class="bdb16" wx:if="{{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 class="cx-obtain-coupon wsize">
-                            <text class="bg_jj"></text>
+                        </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>
-                      </view>
+                      </block>
+
                     </block>
                   </block>
 
diff --git a/packageE/pages/cart/cart2/filter.wxs b/packageE/pages/cart/cart2/filter.wxs
index df76675..fe1b3c5 100644
--- a/packageE/pages/cart/cart2/filter.wxs
+++ b/packageE/pages/cart/cart2/filter.wxs
@@ -21,12 +21,12 @@ 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){
+function check_is_last(index,goods_id,is_act_last){
     var gd_arr=index.split(',');
     var idx=-1;
     //-- 判断有没有包含商品 --
@@ -40,11 +40,6 @@ function check_is_last(index,goods_id,is_act_last,prom_type){
     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;
diff --git a/utils/more_cx.js b/utils/more_cx.js
index 1279b2d..1cd5a22 100644
--- a/utils/more_cx.js
+++ b/utils/more_cx.js
@@ -623,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){
@@ -681,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;
                          }
                     }
                 }
@@ -692,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;
             }
 
             //-- 如果是要控制数量的时候，也就是全选的时候，或者加减号的时候 --
--
libgit2 0.21.4