Merge pull request #313 from John-Hong/release-2.19.0

fix(SCRM-4969): hkc绑定车牌的传参修复

src/pages/parkingFee/mixins/parkingFee.js

@@ -396,27 +396,27 @@ export default {
         }*/
         // 是否优惠车 是否绑定, 或者 直接去查费，带优惠
         if(this.eligibility.eligible && this.eligibility.isBound || this.eligibility.redirectTo === 'CHECK_OUT') {
-          this.toParkingFeeDetail()
+          this.toParkingFeeDetail(vehicleNumber)
           return
         }
         // 是否绑定
         if(this.eligibility.redirectTo === 'BIND_NEW' && this.eligibility.maxBindingCount > this.eligibility.userBindingCount) {
           this.$refs['checkCarPopup'].open({
             redirectTo: this.eligibility.redirectTo,
-            vehicleNo: this.vehicleNumber,
+            vehicleNo: vehicleNumber,
             topBtnFn: async () => {
               const res = await  addVehicles(this.kipUserId,
                 {
                   userId: this.kipUserId,
                   licensePlateType: LICENSE_PLATE_TYPE_ARR[this.carType].value,
-                  vehicleNo: this.vehicleNumber,
+                  vehicleNo: vehicleNumber,
               })
               if(res?.id) {
-                this.toParkingFeeDetail()  
+                this.toParkingFeeDetail(vehicleNumber)  
               }
             },
             bottomBtnFn: () => {
-              this.toParkingFeeDetail()
+              this.toParkingFeeDetail(vehicleNumber)
             }
           })
           return
@@ -425,14 +425,14 @@ export default {
         if(this.eligibility.redirectTo === 'CHANGE_BINDING' && this.eligibility.userRemainingChangeCount) {
           this.$refs['checkCarPopup'].open({
             redirectTo: this.eligibility.redirectTo,
-            vehicleNo: this.vehicleNumber,
+            vehicleNo: vehicleNumber,
             topBtnName: '去换绑（可享停车优惠）',
             topBtnFn: async () => {
               this.doRouter2()
             },
             bottomBtnName: '放弃换绑（无停车优惠）',
             bottomBtnFn: () => {
-              this.toParkingFeeDetail()
+              this.toParkingFeeDetail(vehicleNumber)
             }
           })
           return
@@ -444,10 +444,10 @@ export default {
         this.$refs['checkCarPopup'].open({
           // redirectTo: this.eligibility.redirectTo,
           redirectTo: 'PAY_WITHOUT_DISCOUNT',
-          vehicleNo: this.vehicleNumber,
+          vehicleNo: vehicleNumber,
           topBtnName: '继续缴费（无停车优惠）',
           topBtnFn: () => {
-            this.toParkingFeeDetail()
+            this.toParkingFeeDetail(vehicleNumber)
           },
           bottomBtnName: '放弃缴费 ',
         })
@@ -467,9 +467,9 @@ export default {
       await this.checkEligibility()
     },
     // 去缴费详情
-    toParkingFeeDetail() {
+    toParkingFeeDetail(vehicleNumber = this.vehicleNumber) {
       uni.setStorageSync('carList', [
-        ...new Set([this.vehicleNumber, ...this.carList]),
+        ...new Set([vehicleNumber, ...this.carList]),
       ].slice(0, 6));
       this.$store.commit('cachedViews/DEL_CACHED_VIEW', {
         name: 'parkingFeeDetail',
@@ -478,7 +478,7 @@ export default {
       this.$nextTick(() => {
         const query = {
           ...this.$route.query,
-          vehicleNo: this.vehicleNumber,
+          vehicleNo: vehicleNumber,
         }
         // fromPage && format && unlicensed
         query.fromPage = ''

src/pages/parkingFeeV2/mixins/parkingFee.js

@@ -302,27 +302,27 @@ export default {
         }*/
         // 是否优惠车 是否绑定, 或者 直接去查费，带优惠
         if(this.eligibility.eligible && this.eligibility.isBound || this.eligibility.redirectTo === 'CHECK_OUT') {
-          this.toParkingFeeDetail()
+          this.toParkingFeeDetail(vehicleNumber)
           return
         }
         // 是否绑定
         if(this.eligibility.redirectTo === 'BIND_NEW' && this.eligibility.maxBindingCount > this.eligibility.userBindingCount) {
           this.$refs['checkCarPopup'].open({
             redirectTo: this.eligibility.redirectTo,
-            vehicleNo: this.vehicleNumber,
+            vehicleNo: vehicleNumber,
             topBtnFn: async () => {
               const res = await  addVehicles(this.kipUserId,
                 {
                   userId: this.kipUserId,
                   licensePlateType: LICENSE_PLATE_TYPE_ARR[this.carType].value,
-                  vehicleNo: this.vehicleNumber,
+                  vehicleNo: vehicleNumber,
               })
               if(res?.id) {
-                this.toParkingFeeDetail()  
+                this.toParkingFeeDetail(vehicleNumber)  
               }
             },
             bottomBtnFn: () => {
-              this.toParkingFeeDetail()
+              this.toParkingFeeDetail(vehicleNumber)
             }
           })
           return
@@ -331,14 +331,14 @@ export default {
         if(this.eligibility.redirectTo === 'CHANGE_BINDING' && this.eligibility.userRemainingChangeCount) {
           this.$refs['checkCarPopup'].open({
             redirectTo: this.eligibility.redirectTo,
-            vehicleNo: this.vehicleNumber,
+            vehicleNo: vehicleNumber,
             topBtnName: '去换绑（可享停车优惠）',
             topBtnFn: async () => {
               this.doRouter2()
             },
             bottomBtnName: '放弃换绑（无停车优惠）',
             bottomBtnFn: () => {
-              this.toParkingFeeDetail()
+              this.toParkingFeeDetail(vehicleNumber)
             }
           })
           return
@@ -350,10 +350,10 @@ export default {
         this.$refs['checkCarPopup'].open({
           // redirectTo: this.eligibility.redirectTo,
           redirectTo: 'PAY_WITHOUT_DISCOUNT',
-          vehicleNo: this.vehicleNumber,
+          vehicleNo: vehicleNumber,
           topBtnName: '继续缴费（无停车优惠）',
           topBtnFn: () => {
-            this.toParkingFeeDetail()
+            this.toParkingFeeDetail(vehicleNumber)
           },
           bottomBtnName: '放弃缴费 ',
         })
@@ -373,9 +373,9 @@ export default {
       await this.checkEligibility()
     },
     // 去缴费详情
-    toParkingFeeDetail() {
+    toParkingFeeDetail(vehicleNumber = this.vehicleNumber) {
       uni.setStorageSync('carList', [
-        ...new Set([this.vehicleNumber, ...this.carList]),
+        ...new Set([vehicleNumber, ...this.carList]),
       ].slice(0, 6));
       this.$store.commit('cachedViews/DEL_CACHED_VIEW', {
         name: 'parkingFeeDetail',
@@ -384,7 +384,7 @@ export default {
       this.$nextTick(() => {
         const query = {
           ...this.$route.query,
-          vehicleNo: this.vehicleNumber,
+          vehicleNo: vehicleNumber,
         }
         // fromPage && format && unlicensed
         query.fromPage = ''