支付时提货券显示异常bug

pages/pay/pay.js

@@ -206,22 +206,27 @@ Page({
 //  	console.log('showusebalance:',(val.data.total > 0 && that.data.payData.order_type == 0))
 
 		var afterdec = 0;
-		if(that.data.receivetype == 0){
-			console.log('val.data.total',val.data.total);
-			console.log('that.data.canusebalance',that.data.canusebalance);
-			console.log('that.data.yunfei',that.data.yunfei);
-			if(parseInt(val.data.total) >= parseInt(that.data.canusebalance) + parseInt(that.data.yunfei)){
-				afterdec = that.data.nousebalance;
+		if(that.data.payData.pay_way == ''){
+			if(that.data.receivetype == 0){
+				console.log('val.data.total',val.data.total);
+				console.log('that.data.canusebalance',that.data.canusebalance);
+				console.log('that.data.yunfei',that.data.yunfei);
+				if(parseInt(val.data.total) >= parseInt(that.data.canusebalance) + parseInt(that.data.yunfei)){
+					afterdec = that.data.nousebalance;
+				}else{
+					afterdec = Math.abs((that.data.canusebalance + that.data.yunfei)-val.data.total) + that.data.nousebalance;
+				}
 			}else{
-				afterdec = Math.abs((that.data.canusebalance + that.data.yunfei)-val.data.total) + that.data.nousebalance;
+				if(parseInt(val.data.total) >= parseInt(that.data.canusebalance)){
+					afterdec = that.data.nousebalance;
+				}else{
+					afterdec = Math.abs((that.data.canusebalance)-val.data.total) + that.data.nousebalance;
+				}
 			}
 		}else{
-			if(parseInt(val.data.total) >= parseInt(that.data.canusebalance)){
-				afterdec = that.data.nousebalance;
-			}else{
-				afterdec = Math.abs((that.data.canusebalance)-val.data.total) + that.data.nousebalance;
-			}
+			afterdec = that.data.total+that.data.yunfei-that.data.payData.coupon_price;
 		}
+		
 
       that.setData({
         balanceInfo: val.data,

pages/pay/pay.wxml

@@ -236,9 +236,12 @@
 	  	订单总金额 <text style="color:#F00">{{receivetype == 0 ? ((payData.total_price + payData.freight) / 100) : (payData.total_price / 100)}}</text>
 	  </view>
 	  
-	  <view wx:if="{{useBalance || payData.coupon_price>0}}" style="padding:15rpx;text-align:right">
+	  <view wx:if="{{useBalance && payData.pay_way == ''}}" style="padding:15rpx;text-align:right">
 	  	使用提货券抵扣 <text style="color:#F00">-{{payData.coupon_price>0?payData.coupon_price/100:((total+yunfei)-afterdec) / 100}}</text> 提货券
 	  </view>
+	  <view wx:if="{{payData.pay_way != ''}}" style="padding:15rpx;text-align:right">
+	  	使用提货券抵扣 <text style="color:#F00">-{{payData.coupon_price}}</text> 提货券
+	  </view>
 	  
     </view>
 	

utils/request.js

@@ -1,4 +1,4 @@
-// // 新正式（未审批）
+// 新正式（未审批）
 // const apiHost = 'https://fohowapi.hiwavo.com/' 
 // 测试
 const apiHost = 'https://tfohowapi.hiwavo.com/'