Commit 5bf764d5f3bc754a9487edb849c46c94eb5fd158
1 parent
86d675f4
订单的重新支付时的bug
Showing
2 changed files
with
2 additions
and
3 deletions
pages/user/order_detail/order_detail.js
| @@ -378,10 +378,9 @@ Page({ | @@ -378,10 +378,9 @@ Page({ | ||
| 378 | } | 378 | } |
| 379 | 379 | ||
| 380 | //如果优惠促销和搭配购的时候 | 380 | //如果优惠促销和搭配购的时候 |
| 381 | - if((good.prom_type==3 || good.prom_type==5) && !good.is_collocation){ | 381 | + if((good.prom_type==3 || good.prom_type==5) && good.is_collocation!=1 && good.is_gift!=1){ |
| 382 | var p_ok=1; | 382 | var p_ok=1; |
| 383 | await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0", {}).then(res => { | 383 | await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0", {}).then(res => { |
| 384 | - }).then(res=>{ | ||
| 385 | if(res.data.code==0){ | 384 | if(res.data.code==0){ |
| 386 | var r_data=res.data.data; | 385 | var r_data=res.data.data; |
| 387 | if(!r_data.collocationPromList && good.prom_type==5){ | 386 | if(!r_data.collocationPromList && good.prom_type==5){ |
pages/user/order_list/order_list.js
| @@ -495,7 +495,7 @@ Page({ | @@ -495,7 +495,7 @@ Page({ | ||
| 495 | } | 495 | } |
| 496 | 496 | ||
| 497 | //如果优惠促销和搭配购的时候 | 497 | //如果优惠促销和搭配购的时候 |
| 498 | - if(good.prom_type==3 || good.prom_type==5){ | 498 | + if((good.prom_type==3 || good.prom_type==5) && good.is_gift!=1 && good.is_collocation!=1){ |
| 499 | var p_ok=1; | 499 | var p_ok=1; |
| 500 | await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0", {}).then(res => { | 500 | await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0", {}).then(res => { |
| 501 | if(res.data.code==0){ | 501 | if(res.data.code==0){ |