|
@@ -135,7 +135,7 @@ var shoppingConfirm = new Vue({
|
|
var data = response.data;
|
|
var data = response.data;
|
|
_self.listData = data.list;
|
|
_self.listData = data.list;
|
|
_self.totalPrice = data.totalPrice;
|
|
_self.totalPrice = data.totalPrice;
|
|
- _self.totalDiscountAmount = _self.reducedPrice = data.reducedPrice;
|
|
|
|
|
|
+ _self.reducedPrice = data.reducedPrice;
|
|
_self.totalCount = data.totalCount;
|
|
_self.totalCount = data.totalCount;
|
|
_self.kindCount = data.kindCount;
|
|
_self.kindCount = data.kindCount;
|
|
_self.balance.userMoney = data.userMoney;
|
|
_self.balance.userMoney = data.userMoney;
|
|
@@ -144,10 +144,15 @@ var shoppingConfirm = new Vue({
|
|
_self.getAddressList(_self.userId,20);
|
|
_self.getAddressList(_self.userId,20);
|
|
if( data.couponList && data.couponList.length>0){
|
|
if( data.couponList && data.couponList.length>0){
|
|
_self.isCouponShow = true;
|
|
_self.isCouponShow = true;
|
|
|
|
+ _self.couponAmount = data.couponList[0].couponAmount;
|
|
|
|
+ _self.clubCouponId = data.couponList[0].clubCouponId;
|
|
data.couponList.forEach((el) => {
|
|
data.couponList.forEach((el) => {
|
|
_self.couponList.push(Object.assign(el,{ischecked:false}))
|
|
_self.couponList.push(Object.assign(el,{ischecked:false}))
|
|
})
|
|
})
|
|
|
|
+ _self.couponList[0].ischecked = true;
|
|
|
|
+ _self.payInfo.orderShouldPayFee = data.totalPrice - _self.couponAmount;
|
|
}
|
|
}
|
|
|
|
+ _self.totalDiscountAmount = _self.reducedPrice + _self.couponAmount;
|
|
if(data.invoice){
|
|
if(data.invoice){
|
|
data.invoice.type = 0;
|
|
data.invoice.type = 0;
|
|
_self.invoice = data.invoice;
|
|
_self.invoice = data.invoice;
|