diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js index de8c16b..f0f52ea 100644 --- a/pages/cart/cart/cart.js +++ b/pages/cart/cart/cart.js @@ -2600,7 +2600,7 @@ Page({ }, //-- 循环汇总其他门店,其他活动有此商品的购买数量的汇总,不包含赠品 -- - get_goods_other(item, pitem){ + get_goods_other(item, pitem,only){ var goods_id = this.data.requestData[pitem].goods[item].goods_id; var num=0; for (let i = 0; i < this.data.requestData[pitem].goods.length; i++) { @@ -2609,6 +2609,8 @@ Page({ num+=t_item.goods_num } } + + if(only) return num; for (let j = 0; j < this.data.requestData.length;j++){ if(j!=pitem){ var goods=this.data.requestData[j].goods; @@ -2877,16 +2879,16 @@ Page({ var cQty=store_count; //--- 看一下是不是线下库存 --- if (th.data.sales_rules >= 2 && !goodsinfo.whsle_id) { - //th.check_down_line(t, pitem, item, wareIds,limit); var ob = {}; - await th.check_down_line_next(t, pitem, item, erpwareid, function (res) { + await th.check_down_line_next(t, pitem, item, wareIds, function (res) { ob = res; }); cQty=ob.CanOutQty; + //-- 只获取相同门店,2的时候,因为是线下不同的门店,所以库存再不同门店是不一样的 -- + if(th.data.sales_rules== 2) other_gd_num=th.get_goods_other(item, pitem,1); } - var is_showing=0; var cbuy=limit; if (t.goods_num > limit) { @@ -3379,7 +3381,6 @@ Page({ //--------------去结算------------ async checkout() { - if (getApp().is_sp_hao()) { wx.showToast({ title: "视频号不支持购物车购买", @@ -3615,9 +3616,6 @@ Page({ return false } - - - if (checkArr7.length > 0) { let checkStr = [] checkArr7.map(item => {