From 173d3b0ac31dc1176a21ce83d6760fdbb4d1c173 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Thu, 16 Feb 2023 13:47:13 +0800
Subject: [PATCH] 优惠促销，搭配促销在计算时候的优化

---
 packageE/pages/cart/cart2/cart2.js |  9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index a12e178..6576fd8 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -1739,6 +1739,9 @@ Page({
     //-- 循环处理 --
     for (var i in c_arr) {
       var cart_item = c_arr[i];      //就是每一单的意思
+      //--优惠多少钱--
+      cart_item.cut_price = 0;
+
       var pickid = cart_item.pickup_id;
       var ord_goods = c_arr[i].goods;   //就是每一单的从表的意思
       var o_price = 0, q_conditin = 0;
@@ -1898,8 +1901,7 @@ Page({
           }
 
 
-          //--优惠多少钱--
-          if (!cart_item.cut_price) cart_item.cut_price = 0;
+
           //--  --
           if (item_map.price != undefined && item_map.price != null
             && item_map.prom_price != undefined && item_map.prom_price != null)
@@ -5993,7 +5995,8 @@ Page({
        bn_coll.clear_sele();
        this.setData({ collocation_goods: [] });
        //让主商品的活动变成5，搭配购
-       this.setData({ 'bn_goods.prom_type': 0, 'bn_goods.prom_id': 0 });
+       if(this.data.bn_goods==5)
+          this.setData({ 'bn_goods.prom_type': 0, 'bn_goods.prom_id': 0 });
     }
 
     this.debounce(this.setexptype.bind(this, e), 400)();
--
libgit2 0.21.4