Browse Source

Merge pull request #369 from John-Hong/release-2.23.0

fix(SCRM-5349): 增加对合集车场的支持
Tron 1 year ago
parent
commit
2a4ebe0611
1 changed files with 4 additions and 3 deletions
  1. 4 3
      src/pages/parkingFeeV2/mixins/parkingFeeCoupon.js

+ 4 - 3
src/pages/parkingFeeV2/mixins/parkingFeeCoupon.js

@@ -137,6 +137,7 @@ export default {
           this.remainPrice = this.remainPrice - this.couponList[index].discountFee
           this.remainPrice = this.remainPrice - this.couponList[index].discountFee
           this.newAvailableDiscountFee = this.newAvailableDiscountFee + this.couponList[index].discountFee
           this.newAvailableDiscountFee = this.newAvailableDiscountFee + this.couponList[index].discountFee
           this.newGroupedCouponData()
           this.newGroupedCouponData()
+          this.setAllDisabled()
           this.isDisabledByRule(coupon, index, 'showMsg');
           this.isDisabledByRule(coupon, index, 'showMsg');
         }, 100)
         }, 100)
         return;
         return;
@@ -208,7 +209,7 @@ export default {
         }
         }
       }
       }
       // 杭州、福州电子券选择上限判断
       // 杭州、福州电子券选择上限判断
-      if ( (parkMallCode === 2 || parkMallCode === 8) && this.checkedCouponList.length === this.remainCoupons ) {
+      if ( (parkMallCode === 2 || parkMallCode === 8 || parkMallCode === 7 || parkMallCode === 9) && this.checkedCouponList.length >= this.remainCoupons ) {
         this.couponList = this.couponList.map(( elm,iemi ) => {
         this.couponList = this.couponList.map(( elm,iemi ) => {
           if ( !elm.disabled && this.checkedCouponList.indexOf(`coupon${ iemi }`) < 0 ) {
           if ( !elm.disabled && this.checkedCouponList.indexOf(`coupon${ iemi }`) < 0 ) {
             elm.disabled = true
             elm.disabled = true
@@ -229,7 +230,7 @@ export default {
         return
         return
       }
       }
       // 如果杭州、福州的使用券打到上限则不自动计算其余券是否可选
       // 如果杭州、福州的使用券打到上限则不自动计算其余券是否可选
-      if ( this.checkedCouponList.length >= this.remainCoupons && (this.parkMallCode === 2 || this.parkMallCode === 8) ) {
+      if ( this.checkedCouponList.length >= this.remainCoupons && (this.parkMallCode === 2 || this.parkMallCode === 8 || this.parkMallCode === 7 || this.parkMallCode === 9) ) {
         return
         return
       }
       }
       // console.log(292,this.couponList);
       // console.log(292,this.couponList);
@@ -284,7 +285,7 @@ export default {
         });
         });
       }
       }
       // 电子券上限判断(杭州、福州)
       // 电子券上限判断(杭州、福州)
-      if ( this.checkedCouponList.length >= this.remainCoupons && (this.parkMallCode === 2 || this.parkMallCode === 8) ) {
+      if ( this.checkedCouponList.length >= this.remainCoupons && (this.parkMallCode === 2 || this.parkMallCode === 8 || this.parkMallCode === 7 || this.parkMallCode === 9) ) {
         if ( showMsg ) return true
         if ( showMsg ) return true
         return Toast({
         return Toast({
           className: 'top300',
           className: 'top300',