|
@@ -149,7 +149,6 @@ var shoppingConfirm = new Vue({
|
|
|
_self.balance.isFreight = false;
|
|
|
_self.isBeansShow = false;
|
|
|
}
|
|
|
- _self.useUserMoney();
|
|
|
_self.changeDeductibleFreight();
|
|
|
break;
|
|
|
case -1:
|
|
@@ -162,7 +161,6 @@ var shoppingConfirm = new Vue({
|
|
|
_self.balance.isFreight = false;
|
|
|
_self.isBeansShow = false;
|
|
|
}
|
|
|
- _self.useUserMoney();
|
|
|
_self.changeDeductibleFreight();
|
|
|
break;
|
|
|
}
|
|
@@ -406,10 +404,11 @@ var shoppingConfirm = new Vue({
|
|
|
_self.payInfo.orderShouldPayFee = 0;
|
|
|
if(_self.balance.isFreight){
|
|
|
_self.balance.deductMoney = _self.totalPrice;
|
|
|
- _self.balance.surplusMoney = _self.balance.userMoney-total;
|
|
|
+ _self.balance.surplusMoney = (_self.balance.userMoney*10 - total*10)/10;
|
|
|
}else{
|
|
|
_self.balance.deductMoney = total;
|
|
|
- _self.balance.surplusMoney = _self.balance.userMoney - _self.balance.deductMoney;
|
|
|
+ _self.balance.surplusMoney = (_self.balance.userMoney*10 - _self.balance.deductMoney*10)/10;
|
|
|
+ console.log('剩余余额',_self.balance.surplusMoney);
|
|
|
}
|
|
|
}else{ // 部分抵扣
|
|
|
_self.payInfo.orderShouldPayFee = total - _self.balance.userMoney;
|
|
@@ -441,11 +440,11 @@ var shoppingConfirm = new Vue({
|
|
|
if(_self.balance.userMoney>=total){ // 全部抵扣
|
|
|
_self.payInfo.orderShouldPayFee = 0;
|
|
|
_self.balance.deductMoney = _self.totalPrice;
|
|
|
- _self.balance.surplusMoney = _self.balance.userMoney-_self.balance.deductMoney;
|
|
|
+ _self.balance.surplusMoney = (_self.balance.userMoney*10 - _self.balance.deductMoney*10)/10;
|
|
|
}else{ // 部分抵扣
|
|
|
_self.payInfo.orderShouldPayFee = total - _self.balance.userMoney;
|
|
|
_self.balance.deductMoney = _self.balance.userMoney;
|
|
|
- _self.balance.surplusMoney = _self.balance.userMoney-_self.balance.deductMoney;
|
|
|
+ _self.balance.surplusMoney = (_self.balance.userMoney*10 - _self.balance.deductMoney*10)/10;
|
|
|
}
|
|
|
}else{
|
|
|
_self.payInfo.orderShouldPayFee = (_self.totalPrice*100 + _self.payInfo.freight*100 - _self.freightBeansMoney*100)/100;
|
|
@@ -461,7 +460,7 @@ var shoppingConfirm = new Vue({
|
|
|
if(_self.balance.userMoney>=total) { // 全部抵扣
|
|
|
_self.payInfo.orderShouldPayFee = 0 ;
|
|
|
_self.balance.deductMoney = total;
|
|
|
- _self.balance.surplusMoney = _self.balance.userMoney-_self.balance.deductMoney;
|
|
|
+ _self.balance.surplusMoney = (_self.balance.userMoney*10 - _self.balance.deductMoney*10)/10;
|
|
|
}
|
|
|
}else{
|
|
|
_self.payInfo.orderShouldPayFee = _self.totalPrice + _self.payInfo.freight;
|