Parcourir la source

确认订单修改bug

zhengjinyi il y a 3 ans
Parent
commit
640e4dfcdb

+ 2 - 3
src/main/resources/static/js/shopping/confirm.js

@@ -412,13 +412,12 @@ var shoppingConfirm = new Vue({
                             _self.balance.deductMoney = _self.balance.userMoney;
                             _self.balance.surplusMoney = 0;
                         }
-                    }else{
-                        // 取消抵扣
+                    }else{// 取消抵扣
                         _self.payInfo.balancePayFlag = 0;
                         _self.balance.userMoney = _self.balance.originUserMoney;
                         _self.balance.deductMoney = 0;
                         _self.balance.surplusMoney = _self.balance.originUserMoney;
-                        if(_self.balance.isFreight){
+                        if(_self.balance.isFreight){//判断是否有采美豆抵扣运费
                             _self.payInfo.orderShouldPayFee = _self.totalPrice;
                         }else{
                             _self.payInfo.orderShouldPayFee = total;

+ 1 - 1
src/main/resources/static/js/user-center/order/detail.js

@@ -71,7 +71,7 @@ var orderPage = new Vue({
     methods: {
         GetQueryOrderDetailsInfo:function(){//查询订单详情
             var _self = this;
-            OrderApi.QueryOrderDetailsInfo({orderID:_self.orderId},function (response) {
+            OrderApi.QueryOrderDetailsInfo({orderID:_self.orderId , userId:_self.userId},function (response) {
                 if(response.code == 0){
                     var data = response.data;
                     _self.orderInfo = data.order;