Merge pull request #390 from John-Hong/John/release-3.0.0/KIP-13277

feat(KIP-13277): 当前车辆无需缴费状态调整

src/pages/parkingFee/mixins/parkingFeeDetail.js

@@ -32,7 +32,9 @@ export default {
       popup: false,
       msData: {},
       orderTimeEvent: null,
-      orderTime: null
+      orderTime: null,
+      // 关闭倒计时
+      isShowCountDown: true
     };
   },
   beforeRouteLeave(to, from, next) {
@@ -809,14 +811,23 @@ export default {
         if (res?.orderDetail?.parkingRecord?.totalFee <= 0) {
           this.$store.dispatch('order/orderInitRule', res.orderDetail);
             setTimeout(() => {
+              // 暂停倒计时
+              this.$refs.countDown.pause()
+              // 隐藏倒计时组件
+              this.isShowCountDown = false
               Dialog.alert({
                 message: '当前无需缴费',
+                showConfirmButton: false,
                 confirmButtonColor: '#333',
               }).then(() => {
                 this.clearOrderTimeEvent()
                 this.$router.back()
               });
-            }, 1000)
+              setTimeout(() => {
+                this.clearOrderTimeEvent()
+                this.$router.back()
+              }, 3300);
+            }, 300)
           return
         }
         if ( /CAR_NOT_FOUND|INOUT_FAILED/.test(res.code) ) {

src/pages/parkingFee/parkingFeeDetail.vue

@@ -97,7 +97,7 @@
             >
             <!-- <van-count-down :time="3 * 60 * 1000" /> -->
           </div>
-          <div class="count-down-box">
+          <div class="count-down-box" v-show="isShowCountDown">
             <van-count-down
               v-if="orderDetail.parkingRecord.vehicleNo"
               format="mm:ss"

src/pages/parkingFeeV2/mixins/parkingFeeDetail.js

@@ -32,7 +32,9 @@ export default {
       popup: false,
       msData: {},
       orderTimeEvent: null,
-      orderTime: null
+      orderTime: null,
+      // 关闭倒计时
+      isShowCountDown: true
     };
   },
   beforeRouteLeave(to, from, next) {
@@ -926,14 +928,23 @@ export default {
         if (res?.orderDetail?.parkingRecord?.totalFee <= 0) {
           this.$store.dispatch('order/orderInitRule', res.orderDetail);
             setTimeout(() => {
+              // 暂停倒计时
+              this.$refs.countDown.pause()
+              // 隐藏倒计时组件
+              this.isShowCountDown = false
               Dialog.alert({
                 message: '当前无需缴费',
+                showConfirmButton: false,
                 confirmButtonColor: '#333',
               }).then(() => {
                 this.clearOrderTimeEvent()
                 this.$router.back()
               });
-            }, 1000)
+              setTimeout(() => {
+                this.clearOrderTimeEvent()
+                this.$router.back()
+              }, 3300);
+            }, 300)
           return
         }
         if ( /CAR_NOT_FOUND|INOUT_FAILED/.test(res.code) ) {

src/pages/parkingFeeV2/parkingFeeDetail.vue

@@ -97,7 +97,7 @@
             >
             <!-- <van-count-down :time="3 * 60 * 1000" /> -->
           </div>
-          <div class="count-down-box">
+          <div class="count-down-box" v-show="isShowCountDown">
             <van-count-down
               v-if="orderDetail.parkingRecord.vehicleNo"
               format="mm:ss"