From 11b033fa081b76f6f7feebf2f385b5b13445650e Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Sat, 17 Sep 2022 15:53:55 +0800
Subject: [PATCH] 组合显示购物车的

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

diff --git a/packageB/pages/zuhegou/index/index.js b/packageB/pages/zuhegou/index/index.js
index 69f769b..00ccb51 100644
--- a/packageB/pages/zuhegou/index/index.js
+++ b/packageB/pages/zuhegou/index/index.js
@@ -358,12 +358,17 @@ Page({
                                     }
                                 }
                                 //获取购物车的内容
-                                th.get_cart_val(e);
+                                setTimeout(function(){
+                                    th.get_cart_val(e);
+                                },1000)
+
 
                             })
                         } else {
                             //获取购物车的内容
-                            th.get_cart_val(e);
+                            setTimeout(function(){
+                                th.get_cart_val(e);
+                            },1000)
                         }
                     }, 1);
 
@@ -2242,11 +2247,15 @@ Page({
                     var map = {};
                     var mlist = e.data.data.pageData;
                     th.data.cart_list = mlist;
-
                     for (let i in mlist) {
                         let item = mlist[i];
                         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){
+                             if(item.pick_id!=th.data.def_pick_store.pickup_id){
+                                 continue;
+                             }
+                        }
                         map[item.goods_id] = item;
                     }
 
--
libgit2 0.21.4