|
@@ -171,7 +171,7 @@ export default {
|
|
|
// 获取还需支付金额
|
|
|
getAmountToBePaid() {
|
|
|
let amountToBePaid = this.totalFee - this.paperDiscountFee - this.remainPrice;
|
|
|
- if([ 5, 8, 10 ].indexOf(this.parkMallCode) > -1 && this.orderDetail.discountInfo?.points?.[0]?.discountFee) {
|
|
|
+ if([ 5, 6, 8, 10 ].indexOf(this.parkMallCode) > -1 && this.orderDetail.discountInfo?.points?.[0]?.discountFee) {
|
|
|
amountToBePaid = amountToBePaid - this.orderDetail.discountInfo?.points?.[0]?.discountFee
|
|
|
}
|
|
|
if ([4, 6].indexOf(this.parkMallCode) > -1 && this.orderDetail.discountInfo?.points?.[0]?.discountFee) {
|
|
@@ -185,7 +185,7 @@ export default {
|
|
|
const { parkMallCode } = parkInfo;
|
|
|
const {maxOneTimeDiscountTime,oneTimeLimitation,oneDayLimitation,hourPrice,remainConsumeTime} = parkingRule
|
|
|
// 设置深圳、福州的达到优惠金额的上限,置灰剩下未选择的金额
|
|
|
- if ( [5, 8, 10].indexOf(parkMallCode) > -1 && this.remainPrice >= this.newAvailableDiscountFee) {
|
|
|
+ if ( [5, 6, 8, 10].indexOf(parkMallCode) > -1 && this.remainPrice >= this.newAvailableDiscountFee) {
|
|
|
this.couponList = this.couponList.map((elm,iemi) => {
|
|
|
if ( !elm.disabled && this.checkedCouponList.indexOf(`coupon${iemi}`) < 0) {
|
|
|
elm.disabled = true
|
|
@@ -195,7 +195,7 @@ export default {
|
|
|
return true
|
|
|
}
|
|
|
// 单日上限限制
|
|
|
- if ( oneDayLimitation && [5, 8, 10].indexOf(parkMallCode) < 0) {
|
|
|
+ if ( oneDayLimitation && [5, 6, 8, 10].indexOf(parkMallCode) < 0) {
|
|
|
const maxOneTimeDiscountFee = maxOneTimeDiscountTime * hourPrice
|
|
|
const remainConsumeTimeFee = remainConsumeTime * hourPrice
|
|
|
|
|
@@ -212,7 +212,7 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
// 单次上限限制
|
|
|
- if ( oneTimeLimitation && [5, 8, 10].indexOf(parkMallCode) < 0 ) {
|
|
|
+ if ( oneTimeLimitation && [5, 6, 8, 10].indexOf(parkMallCode) < 0 ) {
|
|
|
const maxOneTimeDiscountFee = maxOneTimeDiscountTime * hourPrice
|
|
|
// const remainConsumeTimeFee = remainConsumeTime * hourPrice
|
|
|
// 计算单日剩余 remainConsumeTime
|
|
@@ -227,8 +227,8 @@ export default {
|
|
|
})
|
|
|
}
|
|
|
}
|
|
|
- // 杭州、福州、深圳前海 电子券选择上限判断
|
|
|
- if ( (parkMallCode === 2 || parkMallCode === 8 || parkMallCode === 7 || parkMallCode === 9 || parkMallCode === 5 || parkMallCode === 8) && this.checkedCouponList.length >= this.remainCoupons ) {
|
|
|
+ // 杭州、福州、深圳前海 电子券选择上限判断 +天津 20240911
|
|
|
+ if ( (parkMallCode === 6 || parkMallCode === 2 || parkMallCode === 8 || parkMallCode === 7 || parkMallCode === 9 || parkMallCode === 5 || parkMallCode === 8) && this.checkedCouponList.length >= this.remainCoupons ) {
|
|
|
this.couponList = this.couponList.map(( elm,iemi ) => {
|
|
|
if ( !elm.disabled && this.checkedCouponList.indexOf(`coupon${ iemi }`) < 0 ) {
|
|
|
elm.disabled = true
|
|
@@ -248,8 +248,8 @@ export default {
|
|
|
})
|
|
|
return
|
|
|
}
|
|
|
- // 如果杭州、福州的使用券打到上限则不自动计算其余券是否可选
|
|
|
- if (this.checkedCouponList.length >= this.remainCoupons && (this.parkMallCode === 2 || this.parkMallCode === 8 || this.parkMallCode === 7 || this.parkMallCode === 9 || this.parkMallCode === 5)) {
|
|
|
+ // 如果杭州、福州的使用券打到上限则不自动计算其余券是否可选 +天津 20240911
|
|
|
+ if (this.checkedCouponList.length >= this.remainCoupons && (this.parkMallCode === 6 || this.parkMallCode === 2 || this.parkMallCode === 8 || this.parkMallCode === 7 || this.parkMallCode === 9 || this.parkMallCode === 5)) {
|
|
|
return
|
|
|
}
|
|
|
const index = this.item2Number(this.checkedCouponList[0])
|
|
@@ -346,13 +346,13 @@ export default {
|
|
|
} = this.orderDetail.parkingRecord;
|
|
|
// 剩余可使用的优惠金额,支持动态计算; 优惠时长,不可能全部使用,不能超过车费减去优惠的金额;不能超过单次的应付金额
|
|
|
let remainPrice = remainConsumeTime * hourPrice;
|
|
|
- if (parkMallCode === 5 || parkMallCode === 8 || parkMallCode === 10) {
|
|
|
+ if (parkMallCode === 5 || parkMallCode === 6 || parkMallCode === 8 || parkMallCode === 10) {
|
|
|
if (remainPrice - this.paperDiscountFee > actualPayFee) {
|
|
|
remainPrice = actualPayFee;
|
|
|
}
|
|
|
}
|
|
|
- // 深圳超限处理
|
|
|
- if ([5, 8, 10].indexOf(parkMallCode) > -1 && this.remainPrice >= this.availableDiscountFee) {
|
|
|
+ // 深圳超限处理 +天津 20240911
|
|
|
+ if ([5, 6, 8, 10].indexOf(parkMallCode) > -1 && this.remainPrice >= this.availableDiscountFee) {
|
|
|
if ( showMsg ) return true
|
|
|
return Toast({
|
|
|
message: `优惠券已达当日使用上限,不可再用`,
|
|
@@ -361,18 +361,18 @@ export default {
|
|
|
});
|
|
|
}
|
|
|
|
|
|
- // 单日上限
|
|
|
+ // 单日上限 +天津20240911
|
|
|
if (oneDayLimitation && this.remainPrice >= this.availableDiscountFee) {
|
|
|
if (showMsg) return true
|
|
|
return Toast({
|
|
|
- message: [5, 8, 10].indexOf(parkMallCode) > -1 ? '当日优惠已达上限,不可再用' : `每日最高可抵扣${maxOneDayDiscountFee}元`,
|
|
|
+ message: [5, 6, 8, 10].indexOf(parkMallCode) > -1 ? '当日优惠已达上限,不可再用' : `每日最高可抵扣${maxOneDayDiscountFee}元`,
|
|
|
className: "white-space",
|
|
|
icon: 'none',
|
|
|
});
|
|
|
}
|
|
|
const maxOneTimeDiscountFee = maxOneTimeDiscountTime * hourPrice
|
|
|
- // 单次上限限制
|
|
|
- if ( oneTimeLimitation && [5, 8, 10].indexOf(parkMallCode) < 0 && this.remainPrice >= maxOneTimeDiscountFee) {
|
|
|
+ // 单次上限限制 +天津 20240911
|
|
|
+ if ( oneTimeLimitation && [5, 6, 8, 10].indexOf(parkMallCode) < 0 && this.remainPrice >= maxOneTimeDiscountFee) {
|
|
|
if ( showMsg ) return true
|
|
|
return Toast({
|
|
|
message: `超出抵扣上限,每次最高可抵扣${maxOneTimeDiscountTime}小时`,
|