商品兑换券更新
This commit is contained in:
@@ -61,7 +61,7 @@
|
||||
</view>
|
||||
<view class="favorable_right" v-if="item.type=='coupon'">
|
||||
<text class="favorable_right_text">{{item.value}}</text>
|
||||
<u-icon name="arrow-right" color="#575B66" size="28"></u-icon>
|
||||
<u-icon name="arrow-right" color="#575B66" size="28" v-if="listinfo.status == 'unpaid' || listinfo.status == 'paying'"></u-icon>
|
||||
</view>
|
||||
<view class="favorable_right" :class="{column:item.value.length>0}" v-if="item.type=='product'">
|
||||
<view class="favorable_right_text" v-for="(items,indexs) in item.value" :key="indexs">
|
||||
@@ -69,7 +69,7 @@
|
||||
<text>X{{items.num}}</text>
|
||||
<text>-¥{{items.discountAmount || 0}}</text>
|
||||
</view>
|
||||
<u-icon v-if="item.value.length <= 0" name="arrow-right" color="#575B66" size="28"></u-icon>
|
||||
<u-icon v-if="item.value.length <= 0 && (listinfo.status == 'unpaid' || listinfo.status == 'paying')" name="arrow-right" color="#575B66" size="28"></u-icon>
|
||||
</view>
|
||||
<view class="favorable_right" v-if="item.type=='points'" @click.stop="pointsChange">
|
||||
<text class="favorable_right_text" style="color: #666;margin-right: 16rpx;" v-if="calcUsablePointsData.usable">
|
||||
@@ -211,7 +211,12 @@
|
||||
_this.pointsChange()
|
||||
_this.getCalcUsablePoints()
|
||||
}
|
||||
this.$emit("setPayAmount",_this.listinfo.payAmount)
|
||||
this.$emit("setPayAmount",{
|
||||
payAmount: this.listinfo.payAmount,
|
||||
userCouponInfos: this.userCouponInfos,
|
||||
calcUsablePointsData: this.calcUsablePointsData,
|
||||
isPointsChecked: this.isPointsChecked,
|
||||
})
|
||||
} else {
|
||||
uni.showToast({
|
||||
title: "优惠券满减金额大于订单金额不可使用",
|
||||
@@ -219,7 +224,8 @@
|
||||
})
|
||||
}
|
||||
} else { //商品券
|
||||
|
||||
//不包含商品券的金额
|
||||
let currentPayAmount = 0;
|
||||
// 筛选选中商品券商品列表
|
||||
let couponList = _this.listinfo.details.filter(v => v.productId == couponData.proId);
|
||||
//金额从小到大排序
|
||||
@@ -227,31 +233,43 @@
|
||||
let productTicketList = _this.userCouponInfos.filter(v => v.productId == couponData.proId);
|
||||
//商品券抵扣的数量
|
||||
let productNum = couponData.num;
|
||||
// 使用数量
|
||||
let num = 0;
|
||||
let productPayAmount = 0;
|
||||
let productTicketNum = 0;
|
||||
let productNumber = 0;
|
||||
productTicketList.map((item,index) => {
|
||||
console.log(item)
|
||||
productTicketNum += item.num
|
||||
_this.listinfo.payAmount = Number(_this.listinfo.payAmount) + item.discountAmount
|
||||
})
|
||||
console.log(productTicketList)
|
||||
console.log(minCouponList)
|
||||
console.log(productTicketNum)
|
||||
let productTicketNumber = 0;
|
||||
minCouponList.map((item,index) => {
|
||||
// productNumber += item.num
|
||||
if ( productNum > 0) {
|
||||
item.num = (item.num - productTicketNum) <= 0 ? 0 : (item.num - productTicketNum)
|
||||
console.log("productTicketNum==",productTicketNum)
|
||||
if ( productNum > 0 && productTicketNum > 0) {
|
||||
productTicketNumber = productTicketNum
|
||||
productTicketNum = (item.num - productTicketNum) <= 0 ? (productTicketNum - item.num) : item.num - productTicketNum
|
||||
console.log(productTicketNum)
|
||||
console.log("item.num - productTicketNumber===",item.num - productTicketNumber)
|
||||
|
||||
}
|
||||
if ( productNum > 0 && productTicketNum > 0) {
|
||||
item.num = (item.num - productTicketNumber) <= 0 ? 0 : (item.num - productTicketNumber)
|
||||
}
|
||||
console.log("productTicketNum==",productTicketNum)
|
||||
console.log("item.num===",item.num)
|
||||
if ( productNum > 0 && item.num > 0) {
|
||||
console.log("index===",index)
|
||||
let num = productNum >= item.num ? item.num : productNum
|
||||
productNum = (productNum - item.num) >= 0 ? (productNum - item.num) : 0;
|
||||
productPayAmount = productPayAmount + (num*(item.memberPrice > 0 ? item.memberPrice : item.price))
|
||||
// let num = productNum >= item.num ? item.num : productNum
|
||||
// productNum = (productNum - item.num) >= 0 ? (productNum - item.num) : 0;
|
||||
|
||||
// productNum = num <= productNum ? num : productNum;
|
||||
productPayAmount = productPayAmount + (num*(item.memberPrice > 0 ? item.memberPrice : item.price))
|
||||
}
|
||||
})
|
||||
if ( productPayAmount > _this.listinfo.payAmount) {
|
||||
|
||||
}
|
||||
_this.userCouponInfos.push({
|
||||
userCouponId: couponData.id,
|
||||
type: couponData.type,
|
||||
@@ -268,11 +286,11 @@
|
||||
num: productNum == 0 ? couponData.num : (couponData.num - productNum),
|
||||
})
|
||||
console.log(productNum)
|
||||
console.log(productNum == 0 ? couponData.num : productNum)
|
||||
if ( _this.isPointsChecked) {
|
||||
_this.pointsChange()
|
||||
}
|
||||
this.setPayAmount()
|
||||
}
|
||||
|
||||
_this.setPayAmount()
|
||||
}
|
||||
uni.$off('couponItem')
|
||||
},
|
||||
@@ -285,9 +303,9 @@
|
||||
console.log(this.userCouponInfos)
|
||||
this.userCouponInfos.forEach(item => {
|
||||
if ( item.type == 1 ) {
|
||||
if ( item.discountAmount && item.discountAmount > 0 ) {
|
||||
this.listinfo.payAmount = (this.listinfo.payAmount - item.discountAmount).toFixed(2)
|
||||
}
|
||||
// if ( item.discountAmount && item.discountAmount > 0 ) {
|
||||
// this.listinfo.payAmount = (this.listinfo.payAmount - item.discountAmount).toFixed(2)
|
||||
// }
|
||||
} else {
|
||||
if ( item.discountAmount && item.discountAmount > 0 ) {
|
||||
this.listinfo.payAmount = (this.listinfo.payAmount - item.discountAmount).toFixed(2)
|
||||
@@ -299,7 +317,12 @@
|
||||
|
||||
this.isPointsChecked = false;
|
||||
this.getCalcUsablePoints()
|
||||
this.$emit("setPayAmount",this.listinfo.payAmount)
|
||||
this.$emit("setPayAmount",{
|
||||
payAmount: this.listinfo.payAmount,
|
||||
userCouponInfos: this.userCouponInfos,
|
||||
calcUsablePointsData: this.calcUsablePointsData,
|
||||
isPointsChecked: this.isPointsChecked,
|
||||
})
|
||||
},
|
||||
/**
|
||||
* 积分状态监听
|
||||
@@ -318,34 +341,45 @@
|
||||
this.listinfo.payAmount = (Number(this.listinfo.payAmount)+(this.calcUsablePointsData.pointsNum/this.calcUsablePointsData.equivalentPoints)).toFixed(2);
|
||||
}
|
||||
console.log(this.listinfo.payAmount)
|
||||
this.$emit("setPayAmount",this.listinfo.payAmount)
|
||||
this.$emit("setPayAmount",{
|
||||
payAmount: this.listinfo.payAmount,
|
||||
userCouponInfos: this.userCouponInfos,
|
||||
calcUsablePointsData: this.calcUsablePointsData,
|
||||
isPointsChecked: this.isPointsChecked,
|
||||
})
|
||||
},
|
||||
goUrl(item){
|
||||
switch (item.type){
|
||||
case 'coupon':
|
||||
let payAmount = this.listinfo.payAmount;
|
||||
let couponList = this.userCouponInfos.filter(v => v.type == 1);
|
||||
if ( couponList.length > 0 ) {
|
||||
payAmount = payAmount + couponList.discountAmount;
|
||||
}
|
||||
uni.pro.navigateTo('/pages/user/coupon', {
|
||||
type: "confirm_order_coupon",
|
||||
payAmount: payAmount,
|
||||
shoppingCart: JSON.stringify(this.listinfo.details)
|
||||
})
|
||||
break;
|
||||
case 'product':
|
||||
let productList = this.userCouponInfos.filter(v => v.type == 2);
|
||||
uni.pro.navigateTo('/pages/user/coupon', {
|
||||
type: "confirm_order_product",
|
||||
payAmount: this.listinfo.payAmount,
|
||||
shoppingCart: JSON.stringify(this.listinfo.details),
|
||||
productList: JSON.stringify(productList)
|
||||
})
|
||||
break;
|
||||
if ( this.listinfo.status == 'unpaid' || this.listinfo.status == 'paying') {
|
||||
switch (item.type){
|
||||
case 'coupon':
|
||||
let payAmount = this.listinfo.payAmount;
|
||||
let couponList = this.userCouponInfos.filter(v => v.type == 1);
|
||||
if ( couponList.length > 0 ) {
|
||||
payAmount = payAmount + couponList.discountAmount;
|
||||
}
|
||||
|
||||
uni.pro.navigateTo('/pages/user/coupon', {
|
||||
type: "confirm_order_coupon",
|
||||
shopId: this.listinfo.shopId,
|
||||
payAmount: payAmount,
|
||||
shoppingCart: JSON.stringify(this.listinfo.details)
|
||||
})
|
||||
break;
|
||||
case 'product':
|
||||
let productList = this.userCouponInfos.filter(v => v.type == 2);
|
||||
uni.pro.navigateTo('/pages/user/coupon', {
|
||||
type: "confirm_order_product",
|
||||
shopId: this.listinfo.shopId,
|
||||
payAmount: this.listinfo.payAmount,
|
||||
shoppingCart: JSON.stringify(this.listinfo.details),
|
||||
productList: JSON.stringify(productList)
|
||||
})
|
||||
break;
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user