diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js index 277b338..65902ab 100644 --- a/pages/user/order_detail/order_detail.js +++ b/pages/user/order_detail/order_detail.js @@ -654,23 +654,13 @@ Page({ th.toast(content); return false; } - }else{ - var redis_num = 0; - //------判断活动是否抢光----- - await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + - os.stoid + "/" + goodsinfo.prom_type + "/" + goodsinfo.prom_id, { - }).then(res => { - redis_num = res.data.data; - }); - - if (good.goods_num > redis_num) { - - var content=gg.goods_name+'超出商品活动库存,请取消订单'; - th.toast(content); - return false; - } - } - + }else if(goodsinfo.prom_type == 1 || goodsinfo.prom_type == 2 || goodsinfo.prom_type == 6 ) { + if(order.add_time+5*60 { - redis_num = res.data.data; - }); - - if (good.goods_num > redis_num) { - - var content = gg.goods_name + '超出商品活动库存,请取消订单'; + } else if(goodsinfo.prom_type == 1 || goodsinfo.prom_type == 2 || goodsinfo.prom_type == 6 ) { + if(order.add_time+5*60