修改代金券抵扣

pages/pay/pay.js

@@ -25,7 +25,9 @@ Page({
     },
     total:0,
     yunfei:0,
-    payFlag:false
+    payFlag:false,
+    useBalance:false,
+    afterdec:0//使用代金券扣除后的总额
   },
   onLoad: function (options) {
     this.data.orderId = options.orderId;
@@ -113,11 +115,20 @@ Page({
       that.setData({
         balanceInfo: val.data,
         cache: false,
-        curPayway:val.data.total >= (that.data.total + that.data.yunfei)?'balance':'weixinpay'
+//      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
       });
     }
     __request.$get(url, params, success)
   },
+  switchChange:function(e){
+  	var that = this;
+  	that.setData({
+  		useBalance:e.detail.value
+  	})
+  },
   getUserInfo: function () {
     var that = this
     var url = "v1/user/info";
@@ -263,11 +274,13 @@ Page({
       trad_pwd: that.data.pwd,
       pay_way: that.data.curPayway,
       address_id: that.data.address.id,
-      s: 'xcx'
+      s: 'xcx',
+      use_coupon:that.data.useBalance
     }
     var success = function (val) {
+    	console.log(val);
     	if(val.statusCode === 200){
-	      if (that.data.curPayway === 'weixinpay') {
+	      if (that.data.curPayway === 'weixinpay' && val.data.need_wx) {
 	        wx.requestPayment({
 	          'timeStamp': val.data.pay_data.timeStamp,
 	          'nonceStr': val.data.pay_data.nonceStr,

pages/pay/pay.wxml

@@ -104,6 +104,16 @@
         <view class="clean"></view>
       </view>
 -->
+	<view class="pay-payway-item" wx:if="{{payData.order_type != 1 && balanceInfo.total}}">
+		<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>
+        </view>
+        <view class="fr pay-balance-cash">
+          <switch checked bindchange="switchChange" color="#eab86a" style="zoom:0.75"/>
+        </view>
+	</view>
+<!--
       <view class="pay-payway-item" wx:if="{{payData.order_type != 1 && balanceInfo.total}}" bindtap="selectClick" data-payway="balance">
         <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>
@@ -117,7 +127,7 @@
         </view>
         <view class="clean"></view>
       </view>
-
+-->
       <view class="pay-payway-item" wx:if="{{balanceInfo.dc_total && !payData.product.mall_balance_price}}">
         <view class="pay-payway-balance fl">
           <image class="pay-icon" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/pay/d5cpay.jpg"></image>
@@ -161,6 +171,10 @@
 	  <view class="yunfei" wx:if="{{total>=9900}}">
 		订单已满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>
     </view>
   </view>
   
@@ -174,7 +188,9 @@
         <currency wx:if="{{useRadishSelect && payData.total_price - balanceInfo.total <= 0}}" symbol="￥" value="0" class="red"></currency> -->
         
         
-        <currency wx:if="{{curPayway === 'weixinpay'}}" symbol="￥" value="{{total+yunfei}}" class="red"></currency>
+        <currency wx:if="{{useBalance}}" symbol="￥" value="{{afterdec}}" class="red"></currency>
+        <currency wx:else symbol="￥" value="{{total+yunfei}}" 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>
       </view>

pages/pay/pay.wxss

@@ -411,9 +411,8 @@
   border-bottom: 1rpx solid #dedede;
 }
 .yunfei{
-padding: 15px;
+padding: 15rpx;
 background-color: #FFFFFF;
-font-size: 14px;
 text-align: right;
 color:#4c4c4c;
 }