From f36f36af04d8ab5a39976595027a212aa09f00a5 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Wed, 21 Feb 2024 16:51:07 +0800
Subject: [PATCH] 优惠促销取价的优化

---
 packageE/pages/cart/cart2/cart2.js | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index 19187d5..df2c0a4 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -1384,8 +1384,11 @@ Page({
                 }
 
               }else{
-                item1.prom_id = arr[k].show_can_cx[key_o].cur_act.prom_id;
-                item1.prom_type = arr[k].show_can_cx[key_o].cur_act.prom_type;
+                //不是优惠促销的不参与  不是订单促销参与（订单促销不是实收价的时候）
+                if( !(arr[k].show_can_cx.no_cj_prom && arr[k].show_can_cx.cur_act.prom_type==3) && !th.data.can_use_ord_prom[arr[k].pick_id]){
+                  item1.prom_id = arr[k].show_can_cx[key_o].cur_act.prom_id;
+                  item1.prom_type = arr[k].show_can_cx[key_o].cur_act.prom_type;
+                }
               }
             }
           }
@@ -8898,6 +8901,19 @@ Page({
     })
     //清空优惠促销的内容
     this.data.prom_goods_map = {};
+
+    //处理一下商品
+    let goods0 = JSON.parse(JSON.stringify(this.data.cartlist_y));
+    let goods = [];
+    for (var ik = 0; ik < goods0.length; ik++) {
+      var item_c = goods0[ik];
+      if(item_c.pick_id == pickid && item_c.is_collocation) continue;
+      if(item_c.is_gift) continue
+      goods.push(item_c);
+    }
+
+    //原始数据要有深拷贝不能有地址的牵连
+    this.data.cartlist_y = JSON.parse(JSON.stringify(goods))
     //-- 重新计算一下价格 --
     this.get_cart_next(null, 1, {prom_type: 0, prom_id: 0});
   }
--
libgit2 0.21.4