From cb5a1ee939c80306d50c60cf7e8aedce3c25a53c Mon Sep 17 00:00:00 2001
From: luo <17530855@qq.com>
Date: Fri, 3 Feb 2023 17:18:11 +0800
Subject: [PATCH] 搭配购优化

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

diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index c313e79..002df07 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -1419,7 +1419,16 @@ Page({
                     t.data.data.guide_id = gg.guide_id;
                     t.data.data.guide_type = gg.guide_type;
                   }
-                  th.setData({ collocation_goods: gg.collocation_goods });
+                  //搭配购如果原来就有勾选，不能直接赋值，旧的要保留
+                  if(th.data.collocation_goods && th.data.collocation_goods.length){
+                    if(gg.collocation_goods){
+                      let coll_goods=th.data.collocation_goods
+                      coll_goods.push(...gg.collocation_goods)
+                      th.setData({collocation_goods:coll_goods})
+                    }
+                  }else{
+                    th.setData({ collocation_goods: gg.collocation_goods });
+                  }
 
                   if (th.data.all_collocation_list && gg.collocation_goods) {
                     for (var i = 0; i < th.data.all_collocation_list.length; i++) {
@@ -2318,7 +2327,7 @@ Page({
             continue;
           }
 
-          debugger;
+          
           if (back_data && back_data['is_by_all'] && item[j].is_post_temp
               && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item[j].goods_id) == -1)) {
 
--
libgit2 0.21.4