diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js index 3d6b546..46115ed 100644 --- a/pages/cart/cart/cart.js +++ b/pages/cart/cart/cart.js @@ -143,6 +143,7 @@ Page({ for(var i = 1; i < 100; i++) { clearInterval(i); } + this.data.zuhe_map={}; }, onUnLoad(){ getApp().globalData.cart_zh_act=null; @@ -525,21 +526,7 @@ Page({ u_item.zh_prom_goods={}; for (let var1 in obj) { var h_item=obj[var1]; - var gdlist=null; - var url1 = "/api/weshop/prom/zhbuyGoods/page"; - var req_data = { - page: 1, - pageSize: 2000, - store_id: os.stoid, - zh_id: h_item.prom_id, - } - await getApp().request.promiseGet(url1, { - data: req_data - }).then(res => { - if (ut.ajax_ok(res)) { - gdlist = res.data.data.pageData; - } - }) + var gdlist= th.data.zuhe_map_good[item.prom_id]; //获取活动需要的商品列表 u_item.zh_prom_goods[h_item.prom_id]=gdlist; } diff --git a/pages/cart/cart/zh_calculate.js b/pages/cart/cart/zh_calculate.js index 79213cd..baf13da 100644 --- a/pages/cart/cart/zh_calculate.js +++ b/pages/cart/cart/zh_calculate.js @@ -119,7 +119,13 @@ module.exports = { item.offline_price=get_num(item).offline_price; var cart_num=get_num(item).goods_num; var zh_b_num=get_num2(item).zh_b_num; - if(!cart_num) continue; + if(!cart_num) { + if (item.zhqty) { + title="必买商品未加购,下单立享【"+act.zhprice+"元任选"+act.zhbuyqty+"件】"; + need_to_buy += item.zhqty; + } + continue; + } item.cart_num =cart_num; //-- 当商品有购买的时候,以及有限购的时候 --