支付调整

pages/pay/pay.js

@@ -45,7 +45,8 @@ Page({
 	has_unuse_quan:false,
 	use_silver:0,
 	pay_cash:0,//佣金抵扣
-	freight_limit:9900
+	freight_limit:9900,
+	unquan_silver:0//不能使用提货券抵扣的银豆
   },
   onLoad: function (options) {
     this.data.orderId = options.orderId;
@@ -122,6 +123,7 @@ Page({
 	  var canusebalance = 0;
 	  var nousebalance = 0;
 	  var use_silver = 0;
+	  var unquan_silver = 0;//使用的silver
 	  for(var i in val.data.product_list){
 		  var item = val.data.product_list[i];
 		  if(!item.send){
@@ -136,8 +138,10 @@ Page({
 						 if(!item.use_quan){
 			  			 			nousebalance = nousebalance + (item.price * item.count);   
 									check_has_unuse_quan = true;
+									unquan_silver = unquan_silver + item.silver;
 			  			 }else{
 			  			 			canusebalance = canusebalance + (item.price * item.count);
+									
 			  			 } 
 			  }
 			  
@@ -158,7 +162,8 @@ Page({
 		nousebalance:nousebalance,
 		has_unuse_quan:check_has_unuse_quan,
 		use_silver:use_silver,
-		disAmount:val.data.dis_amount
+		disAmount:val.data.dis_amount,
+		unquan_silver:unquan_silver
       });
       
       
@@ -256,32 +261,39 @@ Page({
 		var mins_total = that.data.total - use_silver;
 		var mins_canuse = that.data.canusebalance;
 		var mins_nouse = that.data.nousebalance;
-		var left_silver = use_silver;
 		var afterdec = 0;
 		var dis_amount = 0;
 		
 		
 		//
 		sour_total = sour_total - use_silver;
+		
+		
 		//canuse的扣除银豆
-		if(mins_canuse - use_silver < 0){
-			mins_canuse = 0;
-			left_silver = use_silver - mins_canuse;
-		}else{
-			mins_canuse = mins_canuse - use_silver;
-			left_silver = 0;
-		}
-		console.log('mins_canuse',mins_canuse);
-		console.log('left_silver',left_silver);
-		//nouse的扣除剩余的银豆
-		if(mins_nouse - left_silver < 0){
-			mins_nouse = 0;
-			left_silver = left_silver - mins_nouse;
-		}else{
-			mins_nouse = mins_nouse - left_silver;
-			left_silver = 0;
-		}
-		console.log('left_silver',left_silver);
+		// if(mins_canuse - use_silver < 0){
+		// 	mins_canuse = 0;
+		// 	left_silver = use_silver - mins_canuse;
+		// }else{
+		// 	mins_canuse = mins_canuse - use_silver;
+		// 	left_silver = 0;
+		// }
+		// console.log('mins_canuse',mins_canuse);
+		// console.log('left_silver',left_silver);
+		// //nouse的扣除剩余的银豆
+		// if(mins_nouse - left_silver < 0){
+		// 	mins_nouse = 0;
+		// 	left_silver = left_silver - mins_nouse;
+		// }else{
+		// 	mins_nouse = mins_nouse - left_silver;
+		// 	left_silver = 0;
+		// }
+		// console.log('left_silver',left_silver);
+		
+		//重写分别扣除的银豆
+		var quan_silver = use_silver - that.data.unquan_silver;
+		mins_canuse = mins_canuse - quan_silver;
+		mins_nouse = mins_nouse - that.data.unquan_silver;
+		
 		
 		
 		//新增剩余的根据等级和订单类型做折扣
@@ -323,8 +335,6 @@ Page({
 		}
 
 		var source_afterdec = afterdec;
-
-		
 		
 		//canuse的扣除银豆
 		// mins_canuse = mins_canuse - use_silver < 0 ? 0 : mins_canuse - use_silver;
@@ -336,7 +346,7 @@ Page({
 		console.log('afterdec',afterdec);
 		console.log('mins_canuse',mins_canuse);
 		console.log('mins_nouse',mins_nouse);
-		console.log('left_silver',left_silver);
+		console.log('use_silver',use_silver);
 		console.log('sour_total',sour_total);
 		
 
@@ -375,7 +385,7 @@ Page({
 		useBalance: /* (val.data.total > 0 && that.data.payData.order_type == 0) || */ !that.data.payData.shut_wechat ? true:false,
 		afterdec: afterdec,
 		hasSeilver: val.data.silver_total,
-		useSeilver: use_silver - left_silver,
+		useSeilver: use_silver,
 		minusTotal: sour_total,
 		discountBl: val.data.discount_bl,
 		sourceAfterdec: source_afterdec,

pages/pay/pay.wxml

@@ -175,7 +175,7 @@
 	
 	<view class="pay-payway-item" wx:if="{{cashInfo.available > 0 && 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"></image>
+	      <image class="pay-icon" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/pay/yongjin.png"></image>
 	      <text >佣金抵扣 （剩余：{{cashInfo.available / 100}}）</text>
 	    </view>
 	    <view class="fr pay-balance-cash" wx:if="{{!payData.shut_wechat}}">