Merge branch 'dev' into 'test'

Dev See merge request !847

Merge branch 'dev' into 'test'
Dev See merge request !847
后端研发-苏明海
2 parents 1de18883 36ca2aa2
Showing 2 changed files with 10 additions and 29 deletions
pages/user/order_detail/order_detail.js
pages/user/order_list/order_list.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<ut.gettimestamp()) {
+                                  var content = gg.goods_name + '该订单已经超时无法支付,请取消订单';
+                                  th.toast(content);
+                                  return false;
+                              }
+                          }
 			   }
  
 		}
@@ -460,7 +460,6 @@ Page({
       }
     });
   },
-
     /*----------跳转支付-----------*/
     async jumpToCart4(t) {
         var o_index = t.currentTarget.dataset.idx;
@@ -835,17 +834,9 @@ 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 + '超出商品活动库存,请取消订单';
+                } else if(goodsinfo.prom_type == 1 || goodsinfo.prom_type == 2 || goodsinfo.prom_type == 6 ) {
+                    if(order.add_time+5*60<ut.gettimestamp()) {
+                        var content = gg.goods_name + '该订单已经超时无法支付,请取消订单';
                         th.toast(content);
                         return false;
                     }