From e1e61b183b9b98c7c6571b6b1fc34610d70e3bfa Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Tue, 2 Jul 2024 15:16:11 +0800
Subject: [PATCH] ~~组合购，再购物车选中去凑单的时候，跳转活动页面的时候，商品要自动选中

---
 packageB/pages/zuhegou/index/index.js | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/packageB/pages/zuhegou/index/index.js b/packageB/pages/zuhegou/index/index.js
index f3ca31e..4bad532 100644
--- a/packageB/pages/zuhegou/index/index.js
+++ b/packageB/pages/zuhegou/index/index.js
@@ -2868,19 +2868,30 @@ Page({
       store_id: os.stoid,
       pageSize: 600,
       state: 0,
-      prom_type: 7,
-      prom_id: this.data.act.id
     };
     //获取购物车列表
     getApp().request.get("/api/weshop/cart/list", {
       data: req,
       success: async function (e) {
         if (ut.ajax_ok(e)) {
+          var  mlist=e.data.data.pageData.filter(function (e){
+              return e.zh_prom_id==th.data.act.id || (e.prom_type==7 && e.prom_id==th.data.act.id)
+          })
+
+          if(!mlist || mlist.length==0){
+            return false;
+          }
           var map = {};
-          var mlist = e.data.data.pageData;
+          //var mlist = e.data.data.pageData;
           th.data.cart_list = mlist;
           for (let i in mlist) {
             let item = mlist[i];
+
+            if(item.zh_prom_id && item.prom_type==0 ){
+               item.prom_type=7;
+               item.prom_id=th.data.act.id
+            }
+
             if (item.prom_type != 7) continue;
             if (item.prom_id != th.data.act.id) continue;
             if (th.data.def_pick_store && th.data.def_pick_store.pickup_id) {
--
libgit2 0.21.4