更新第二次订单问题

pages/pay/pay.js

@@ -81,7 +81,7 @@ Page({
       }
       
       var total = 0;
-      for(var i in val.data.product_list){
+  		for(var i in val.data.product_list){
       	total = total + (val.data.product_list[i].price * val.data.product_list[i].order_count)
       }
       
@@ -118,7 +118,7 @@ Page({
 //      curPayway:val.data.total >= (that.data.total + that.data.yunfei)?'balance':'weixinpay'
 				curPayway:'weixinpay',
 				useBalance:val.data.total > 0 ? true:false,
-				afterdec:val.data.total >= (that.data.total + that.data.yunfei)?'0':(that.data.total + that.data.yunfei)-val.data.total
+				afterdec:parseInt(val.data.total) >= parseInt(that.data.total) + parseInt(that.data.yunfei)?'0':(that.data.total + that.data.yunfei)-val.data.total
       });
     }
     __request.$get(url, params, success)

pages/pay/pay.wxml

@@ -104,7 +104,7 @@
         <view class="clean"></view>
       </view>
 -->
-	<view class="pay-payway-item" wx:if="{{payData.order_type != 1 && balanceInfo.total}}">
+	<view class="pay-payway-item" wx:if="{{payData.order_type != 1 && balanceInfo.total && payData.pay_way == ''}}">
 		<view class="pay-payway-balance fl">
           <image class="pay-icon" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/pay/luobopay.jpg" bindtap="selectClick" data-payway="balance"></image>
           <text bindtap="selectClick" data-payway="balance">代金券抵扣 （剩余：{{balanceInfo.total / 100}}）</text>
@@ -172,8 +172,8 @@
 		订单已满99元以上(含99元)免除运费
 	  </view>
 	  
-	  <view wx:if="{{useBalance}}" style="padding:15rpx;text-align:right">
-	  	使用代金券抵扣 <text style="color:#F00">-{{balanceInfo.total - total+yunfei >= 0 ? (total+yunfei) / 100 : balanceInfo.total / 100}}</text> 代金券
+	  <view wx:if="{{useBalance || payData.coupon_price>0}}" style="padding:15rpx;text-align:right">
+	  	使用代金券抵扣 <text style="color:#F00">-{{payData.coupon_price>0?payData.coupon_price:balanceInfo.total - total+yunfei >= 0 ? (total+yunfei) / 100 : balanceInfo.total / 100}}</text> 代金券
 	  </view>
     </view>
   </view>
@@ -189,7 +189,7 @@
         
         
         <currency wx:if="{{useBalance}}" symbol="￥" value="{{afterdec}}" class="red"></currency>
-        <currency wx:else symbol="￥" value="{{total+yunfei}}" class="red"></currency>
+        <currency wx:else symbol="￥" value="{{payData.pay_way == '' ? total+yunfei : payData.paied_price}}" class="red"></currency>
         
         <text class="red" wx:if="{{curPayway === 'balance'}}">{{(total+yunfei) / 100}}<currency value="{{total}}" class="red"></currency>代金券</text>
         <text class="red" wx:if="{{curPayway === 'integral'}}">{{(total+yunfei) / 100}}代金券</text>