Bläddra i källkod

fix(KIP-12667): 【DE】【C端】临时停车。在”历史查询车辆“中,查询缴费时,应和通过输入车牌查询有一致的提示

john 1 år sedan
förälder
incheckning
95cdbfe045

+ 14 - 4
src/pages/parkingFee/mixins/parkingFee.js

@@ -364,7 +364,7 @@ export default {
         }
       }
     },
-    async checkEligibility() {
+    async checkEligibility(vehicleNumber = this.vehicleNumber) {
       try {
         /*
         * 如果是杭州,并且是登陆情况
@@ -384,7 +384,7 @@ export default {
         * 
         * */
         // 如果是杭州,并且是登陆情况
-        this.eligibility = await checkEligibility(this.vehicleNumber)
+        this.eligibility = await checkEligibility(vehicleNumber)
         /*this.eligibility = {
           "eligible": false, // 是否优惠车
           "isBound": false, // 是否绑定
@@ -410,9 +410,9 @@ export default {
                   userId: this.kipUserId,
                   licensePlateType: LICENSE_PLATE_TYPE_ARR[this.carType].value,
                   vehicleNo: this.vehicleNumber,
-                })
+              })
               if(res?.id) {
-                this.toParkingFeeDetail()
+                this.toParkingFeeDetail()  
               }
             },
             bottomBtnFn: () => {
@@ -491,6 +491,16 @@ export default {
       })
     },
     // 历史车牌快速查询
+    async toHandleSearchBefore(vehicleNo) {
+      // 不是杭州的车牌 或者 用户拒绝登陆的场景
+      if (!isHZ(this.mallId) || this.$route.query.isLogin === 'loginDenied')  {
+        this.toHandleSearch(vehicleNo)
+        return
+      }
+      // 查询车辆优惠资格并提示跳转页面
+      await this.checkEligibility(vehicleNo)
+      
+    },
     toHandleSearch(vehicleNo) {
       uni.setStorageSync('carList', [...new Set([vehicleNo, ...this.carList])].slice(0, 6));
       this.$store.commit('cachedViews/DEL_CACHED_VIEW', {

+ 1 - 1
src/pages/parkingFee/parkingFee.vue

@@ -97,7 +97,7 @@
                   <!-- <image src="./static/images/icon5.png" class="vehicleMgt-title-img"/> -->
                 </div>
                 <div class="vehicleMgt-content" v-if="carList.length">
-                  <div class="item" v-for="(item, index) in carList" :key="index" @click="toHandleSearch(item, 1)" :class="vehicleNumber == item ? 'vehicleMgt-content_cls' : ''">
+                  <div class="item" v-for="(item, index) in carList" :key="index" @click="toHandleSearchBefore(item, 1)" :class="vehicleNumber == item ? 'vehicleMgt-content_cls' : ''">
                     {{ item | formatCarno }}
                   </div>
                 </div>

+ 14 - 5
src/pages/parkingFeeV2/mixins/parkingFee.js

@@ -210,9 +210,8 @@ export default {
         title: '加载中',
       });
       try {
-        // console.log('加载车场信息', this.$store.state.lbsId);
-        // const res = await parkingLots('8aaa82ea804d07cd0180516ff03b0008'); // TODO: 临时写死
-        const res = await parkingLots(this.$store.state.lbsId); // TODO: 临时写死
+        // 加载车场信息
+        const res = await parkingLots(this.$store.state.lbsId);
         // console.log(res);
         let reg = /[;;]/g;
         this.description = res?.description?.replace(reg, '\r\n').replace(/\r\n/g, '<br/>').replace(/\n/g, '<br/>');
@@ -271,7 +270,7 @@ export default {
         }
       }
     },
-    async checkEligibility() {
+    async checkEligibility(vehicleNumber = this.vehicleNumber) {
       try {
         /*
         * 如果是杭州,并且是登陆情况
@@ -291,7 +290,7 @@ export default {
         * 
         * */
         // 如果是杭州,并且是登陆情况
-        this.eligibility = await checkEligibility(this.vehicleNumber)
+        this.eligibility = await checkEligibility(vehicleNumber)
         /*this.eligibility = {
           "eligible": false, // 是否优惠车
           "isBound": false, // 是否绑定
@@ -398,6 +397,16 @@ export default {
       })
     },
     // 历史车牌快速查询
+    async toHandleSearchBefore(vehicleNo) {
+      // 不是杭州的车牌 或者 用户拒绝登陆的场景
+      if (!isHZ(this.mallId) || this.$route.query.isLogin === 'loginDenied')  {
+        this.toHandleSearch(vehicleNo)
+        return
+      }
+      // 查询车辆优惠资格并提示跳转页面
+      await this.checkEligibility(vehicleNo)
+      
+    },
     toHandleSearch(vehicleNo) {
       uni.setStorageSync('carList', [...new Set([vehicleNo, ...this.carList])].slice(0, 6));
       this.$store.commit('cachedViews/DEL_CACHED_VIEW', {

+ 1 - 1
src/pages/parkingFeeV2/parkingFee.vue

@@ -95,7 +95,7 @@
                   <!-- <image src="./static/images/icon5.png" class="vehicleMgt-title-img"/> -->
                 </div>
                 <div class="vehicleMgt-content" v-if="carList.length">
-                  <div class="item" v-for="(item, index) in carList" :key="index" @click="toHandleSearch(item, 1)" :class="vehicleNumber == item ? 'vehicleMgt-content_cls' : ''">
+                  <div class="item" v-for="(item, index) in carList" :key="index" @click="toHandleSearchBefore(item, 1)" :class="vehicleNumber == item ? 'vehicleMgt-content_cls' : ''">
                     {{ item | formatCarno }}
                   </div>
                 </div>