订单的重新支付时的bug

yvan.ni
1 parent 86d675f4
Showing 2 changed files with 2 additions and 3 deletions
pages/user/order_detail/order_detail.js
pages/user/order_list/order_list.js
@@ -378,10 +378,9 @@ Page({
 			}
  
 			//如果优惠促销和搭配购的时候
-			if((good.prom_type==3 || good.prom_type==5) && !good.is_collocation){
+			if((good.prom_type==3 || good.prom_type==5) && good.is_collocation!=1 && good.is_gift!=1){
 				var p_ok=1;
 			    await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0", {}).then(res => {
-			    }).then(res=>{
 			        if(res.data.code==0){
 			                var r_data=res.data.data;
 			                if(!r_data.collocationPromList && good.prom_type==5){
@@ -495,7 +495,7 @@ Page({
 		}
  
 		//如果优惠促销和搭配购的时候
-		if(good.prom_type==3 || good.prom_type==5){
+		if((good.prom_type==3 || good.prom_type==5) && good.is_gift!=1 && good.is_collocation!=1){
 			var p_ok=1;
 		    await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0", {}).then(res => {
 		        if(res.data.code==0){