From 3a704d91da7f1527e0b50acbe79d727f59148a03 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Sat, 3 Feb 2024 15:39:40 +0800
Subject: [PATCH] 活动的切换的优化

---
 packageE/pages/cart/cart2/cart2.js | 22 +++++++++++++++-------
 pages/cart/cart/cart.js            |  4 ++--
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index 149f6be..8909ab7 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -8384,10 +8384,8 @@ Page({
     //-- 获取到当前的show_can_cx--
     var idx=this.data.sele_cx_group_cidx;
     var gd_key= this.data.cx_group_gd_key;
-
-
-    var pk_id=this.data.cartlist[idx].pickup_id;
-    var cx_prom_group2= th.data.show_can_cx_map[pk_id][gd_key].act_arr;
+    var pk=this.data.cartlist[idx].pickup_id;
+    var cx_prom_group2= th.data.show_can_cx_map[pk][gd_key].act_arr;
 
     var cx_prom_group=this.data.cartlist[idx].show_can_cx[gd_key].act_arr;
 
@@ -8421,14 +8419,12 @@ Page({
       return el.sele;
     })
 
-
     this.cx_check_ok2(function (ck_res){
 
       if(ck_res.code==0){
         th.data.cartlist[idx].show_can_cx[gd_key].sele_prom_type=ck_prom_type.prom_type;
         th.data.cartlist[idx].show_can_cx[gd_key].cur_act=ck_prom_type;
 
-
         var goods0= JSON.parse(JSON.stringify(th.data.cartlist_y));
         var goods=[];
         for(var ik=0;ik<goods0.length;ik++){
@@ -8622,6 +8618,9 @@ Page({
     let item = this.data.cartlist[pidx].show_can_cx[can_cx_idx];  //促销内容
     let pk=this.data.cartlist[pidx].pickup_id;  //门店ID
 
+    //获取到后台计算多促销的数据
+    var cx_prom_group2= this.data.show_can_cx_map[pk][can_cx_idx].act_arr;
+
     //给no_cj_prom进行赋值
     item.no_cj_prom = !item.no_cj_prom ? 1 : 0;
     var txt = 'cartlist[' + pidx + '].show_can_cx';
@@ -8629,7 +8628,16 @@ Page({
       [txt]: this.data.cartlist[pidx].show_can_cx,
     })
 
-    let ck_prom_type=item.cur_act;
+    //使用深拷贝，生成临时的变量
+    let ck_prom_type= ut.deep_cp(item.cur_act);
+    var f_act=cx_prom_group2.find(function (ite){
+       return ite.prom_type==ck_prom_type.prom_type
+    })
+    if(!ck_prom_type || !f_act){
+        ut.m_toast('未找到活动');
+    }
+    ck_prom_type.goods=f_act.goods;
+
     //处理一下商品
     let goods0 = JSON.parse(JSON.stringify(th.data.cartlist_y));
     let goods = [];
diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index 98b1762..73c1909 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -2613,9 +2613,9 @@ Page({
             } else if (item[c].prom_type == 10) {
               ladder_calc.add_ladder_prom(car, a, obj);
             } else {
-              console.log("索引:"+c+",数量:"+item[c].goods_num+",单价:"+item[c].goods_price+",合计："+item[c].goods_num * item[c].goods_price+",商品:"+item[c].goods_name);
+              //console.log("索引:"+c+",数量:"+item[c].goods_num+",单价:"+item[c].goods_price+",合计："+item[c].goods_num * item[c].goods_price+",商品:"+item[c].goods_name);
               tfeel += item[c].goods_num * item[c].goods_price;
-              console.log("累计:"+tfeel);
+              //console.log("累计:"+tfeel);
             }
             t_num += item[c].goods_num;
           }
--
libgit2 0.21.4