Commit 11b033fa081b76f6f7feebf2f385b5b13445650e

Authored by yvan.ni
1 parent 4f6f14c5

组合显示购物车的

packageB/pages/zuhegou/index/index.js
... ... @@ -358,12 +358,17 @@ Page({
358 358 }
359 359 }
360 360 //获取购物车的内容
361   - th.get_cart_val(e);
  361 + setTimeout(function(){
  362 + th.get_cart_val(e);
  363 + },1000)
  364 +
362 365  
363 366 })
364 367 } else {
365 368 //获取购物车的内容
366   - th.get_cart_val(e);
  369 + setTimeout(function(){
  370 + th.get_cart_val(e);
  371 + },1000)
367 372 }
368 373 }, 1);
369 374  
... ... @@ -2242,11 +2247,15 @@ Page({
2242 2247 var map = {};
2243 2248 var mlist = e.data.data.pageData;
2244 2249 th.data.cart_list = mlist;
2245   -
2246 2250 for (let i in mlist) {
2247 2251 let item = mlist[i];
2248 2252 if (item.prom_type != 7) continue;
2249 2253 if (item.prom_id != th.data.act.id) continue;
  2254 + if(th.data.def_pick_store && th.data.def_pick_store.pickup_id){
  2255 + if(item.pick_id!=th.data.def_pick_store.pickup_id){
  2256 + continue;
  2257 + }
  2258 + }
2250 2259 map[item.goods_id] = item;
2251 2260 }
2252 2261  
... ...