zhengjinyi преди 3 години
родител
ревизия
dd82d086e6
променени са 1 файла, в които са добавени 11 реда и са изтрити 4 реда
  1. 11 4
      src/main/resources/static/js/shopping/confirm.js

+ 11 - 4
src/main/resources/static/js/shopping/confirm.js

@@ -422,10 +422,17 @@ var shoppingConfirm = new Vue({
                                 console.log('_self.balance.surplusMoney',_self.balance.surplusMoney)
                             }
                         }else{ // 部分抵扣
-                            _self.payInfo.orderShouldPayFee = _self.repiceNumSub(total,_self.balance.userMoney); // 最终订单总价 = 订单总金额 - 余额总额
-                            _self.balance.deductMoney = _self.balance.userMoney; // 抵扣使用金额 = 余额总额
-                            _self.balance.surplusMoney = 0; // 抵扣后剩余余额 = 0
-                            console.log('_self.payInfo.orderShouldPayFee',_self.payInfo.orderShouldPayFee)
+                            if(_self.balance.isFreight){// 勾选了采美豆丢运费
+                                _self.payInfo.orderShouldPayFee = _self.repiceNumSub(_self.totalPrice,_self.balance.userMoney); // 最终订单总价 = 订单总金额 - 余额总额
+                                _self.balance.deductMoney = _self.balance.userMoney; // 抵扣使用金额 = 余额总额
+                                _self.balance.surplusMoney = 0; // 抵扣后剩余余额 = 0
+                                console.log('部分抵扣勾选了采美豆运费',_self.payInfo.orderShouldPayFee)
+                            }else{
+                                _self.payInfo.orderShouldPayFee = _self.repiceNumSub(total,_self.balance.userMoney); // 最终订单总价 = 订单总金额 - 余额总额
+                                _self.balance.deductMoney = _self.balance.userMoney; // 抵扣使用金额 = 余额总额
+                                _self.balance.surplusMoney = 0; // 抵扣后剩余余额 = 0
+                                console.log('部分抵扣没有勾选了采美豆运费',_self.payInfo.orderShouldPayFee)
+                            }
                         }
                     }else{// 取消抵扣
                         _self.payInfo.balancePayFlag = 0;