diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js index 1bf18f6..8a8bf0f 100644 --- a/pages/cart/cart/cart.js +++ b/pages/cart/cart/cart.js @@ -1444,7 +1444,7 @@ Page({ }) } else { //--- 看一下是不是线下库存 --- - if(th.data.sales_rules==2){ + if(th.data.sales_rules==2 && goodsinfo.prom_type!=7){ th.check_down_line(t, pitem, item,wareIds); }else{ if (t.goods_num > store_count) { @@ -1504,6 +1504,7 @@ Page({ //---检验线下库存的数量的子函数--- async check_down_line_next(t, pitem, item,erpwareid,func){ + var goodsinfo = this.data.requestData[pitem].goods[item]; var lock=0,pick_no,plist; //先读取门店的lock diff --git a/pages/cart/cart/zh_calculate.js b/pages/cart/cart/zh_calculate.js index 94f262d..2aa98c8 100644 --- a/pages/cart/cart/zh_calculate.js +++ b/pages/cart/cart/zh_calculate.js @@ -86,6 +86,11 @@ module.exports = { var title =""; //提示语; //var goods = bitem.goods; var goods = zh_prom_goods[act.id]; + + for (let v3 in car_item.goods) { + car_item.goods[v3].need_downlow_num=0; + } + //寻找一下 function get_num(ite) { for (let v1 in bitem.goods) {