From fc8fd8a50a1ce217878cea477bc7d4f3017c53d5 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Tue, 18 Apr 2023 09:16:56 +0800
Subject: [PATCH] 多促销的优化

---
 packageE/pages/cart/cart2/cart2.js | 10 +++++++---
 pages/cart/cart/cart.js            |  5 +++++
 pages/cart/cart/cart.wxml          |  6 +++---
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index 46a4b49..3c0daf9 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -754,9 +754,13 @@ Page({
         if(carr.length==1){
             var item1=carr[0];
             await th.buy_pro_group(item1,1);
-            if(item1.prom_type==0 && item1.more_cx){
-                //-- 对活动进行排序 --
-                th.cx_prom_group(item1.more_cx);
+
+            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;
             }
diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index 366b29b..84d0099 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -2193,6 +2193,8 @@ Page({
             }
           }
         });
+
+
       }
       //-- 切换活动的按钮要把他返回 --
       this.data.change_act=0;
@@ -3049,6 +3051,8 @@ Page({
               goods_id: i_arr[j].goods_id,
               id: i_arr[j].id,
               goods_price: i_arr[j].goods_price,
+              prom_id:i_arr[j].prom_id,
+              prom_type:i_arr[j].prom_type,
             };
             //判断是不是线下取价
             if (i_arr[j].is_offline) {
@@ -4458,6 +4462,7 @@ Page({
 
         }
          func(show_can_cx);
+         return false;
       }
 
       var th=this;
diff --git a/pages/cart/cart/cart.wxml b/pages/cart/cart/cart.wxml
index 5a365c2..8a70175 100644
--- a/pages/cart/cart/cart.wxml
+++ b/pages/cart/cart/cart.wxml
@@ -130,7 +130,7 @@
 
             <!-- 验证活动是不是多个，要不要显示切换 -->
             <!-- 新增促销多活动的排版 -->
-            <view class="bdt16"
+            <view class="bdb16"
                   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 bindtap="switch_cx_group"
                       data-index="{{pidx}}"
@@ -158,14 +158,14 @@
           <!-- 新增促销多活动的排版 -->
           <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 class="bdb16" 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 class="xc-coupon-fram" wx:for="{{item.show_can_cx[index].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>
--
libgit2 0.21.4