Commit 02bfb03fee38d626bb8764bbe9d229840c9785d7
1 parent
e70b1406
组合购再购物车加减数量时先不要判断线下库存,要再结算的时候,才判断线下库存
Showing
2 changed files
with
7 additions
and
1 deletions
pages/cart/cart/cart.js
... | ... | @@ -1444,7 +1444,7 @@ Page({ |
1444 | 1444 | }) |
1445 | 1445 | } else { |
1446 | 1446 | //--- 看一下是不是线下库存 --- |
1447 | - if(th.data.sales_rules==2){ | |
1447 | + if(th.data.sales_rules==2 && goodsinfo.prom_type!=7){ | |
1448 | 1448 | th.check_down_line(t, pitem, item,wareIds); |
1449 | 1449 | }else{ |
1450 | 1450 | if (t.goods_num > store_count) { |
... | ... | @@ -1504,6 +1504,7 @@ Page({ |
1504 | 1504 | |
1505 | 1505 | //---检验线下库存的数量的子函数--- |
1506 | 1506 | async check_down_line_next(t, pitem, item,erpwareid,func){ |
1507 | + | |
1507 | 1508 | var goodsinfo = this.data.requestData[pitem].goods[item]; |
1508 | 1509 | var lock=0,pick_no,plist; |
1509 | 1510 | //先读取门店的lock | ... | ... |
pages/cart/cart/zh_calculate.js
... | ... | @@ -86,6 +86,11 @@ module.exports = { |
86 | 86 | var title =""; //提示语; |
87 | 87 | //var goods = bitem.goods; |
88 | 88 | var goods = zh_prom_goods[act.id]; |
89 | + | |
90 | + for (let v3 in car_item.goods) { | |
91 | + car_item.goods[v3].need_downlow_num=0; | |
92 | + } | |
93 | + | |
89 | 94 | //寻找一下 |
90 | 95 | function get_num(ite) { |
91 | 96 | for (let v1 in bitem.goods) { | ... | ... |