Merge branch 'release-2.17.0' of git.kerryprops.com.cn:tron/temporary-parking-frontend into release-2.17.0

src/components/plate-number/plateNumber.vue

@@ -551,9 +551,9 @@ export default {
   margin: 6px 3px;
   box-shadow: 0px 2px 0px #9da0a3;
 }
-.van-overlay {
-  background-color: rgba(0,0,0,0.1);
-}
+// .van-overlay {
+//   background-color: rgba(0,0,0,0.1);
+// }
 .event-box {
   display: flex;
   justify-content: space-around;

src/pages/parkingFee/mixins/parkingFee.js

@@ -249,12 +249,14 @@ export default {
     },
     // 唤起键盘
     clickShowKeyboard(index) {
-      if ( index === 7) {
-        this.currentTabType = 1
-        console.log('this.currentTabType::', this.currentTabType)
-        this.carType = 1
-        console.log()
-      }
+      // KIP-11259
+      // if ( index === 7) {
+      //   this.currentTabType = 1
+      //   console.log('this.currentTabType::', this.currentTabType)
+      //   this.carType = 1
+      //   console.log()
+      // }
+      if ( this.carType !== 1 && index === 7) return // KIP-11259
       this.ind = index;
       this.active = index;
       if (index === 0) {

src/pages/parkingFee/mixins/parkingFeeDetail.js

@@ -337,17 +337,10 @@ export default {
               message: '当前无需缴费',
               confirmButtonColor: '#333',
             }).then(() => {
-              this.$refs.countDown.reset(); // 停车场重置费用倒计时3分钟
-              this.$store.dispatch('order/orderInit', {
-                gateId: this.$route.query?.gateId,
-                vehicleNo: this.$route.query?.vehicleNo,
-                endlessLoop: this.endlessLoop,
-                callback: (res) => {
-                  this.orderInitCallBack(res)
-                },
-              })
-              this.btnLoading = false;
-              this.isPay = false
+              this.$router.replace({
+                // path: 'parkingFeeSuccess?carno=' + this.parkInfo.carno,
+                path: 'home',
+              }); 
               // this.createParkOrder();
             });
           }

src/pages/parkingFee/parkingFee.vue

@@ -45,7 +45,9 @@
               <div class="parkingFee-search">
                 <div class="search_tip_1" :style="{paddingTop: supportUnlicensed? '0': '32px'}">
                   <div class="title">车辆类型</div>
-                  <k-tab :defaultCurrent="currentTabType" type="fill" @change="toggleType" :tabs="['燃油车牌', '新能源', '特殊车牌']" />
+                  <!-- 删除-KIP-11259 -->
+                  <k-tab type="fill" @change="toggleType" :tabs="['普通车牌', '新能源', '特殊车牌']" />
+                  <!-- KIP-11258 <k-tab :defaultCurrent="currentTabType" type="fill" @change="toggleType" :tabs="['燃油车牌', '新能源', '特殊车牌']" /> -->
                 </div>
                 <!-- <div class="search_tip">
                   <div class="title">车辆类型</div>
@@ -83,7 +85,7 @@
                   </div>
                   <div class="li dashed green-active" @click="clickShowKeyboard(7)" :class="[active === 7 ? 'active' : '']" >
                     <span v-if="numArr[7] && carType === 1">{{ numArr[7] }}</span>
-                    <!-- <img v-else :src="require('./static/images/unlicensed/leaf.svg')"> -->
+                    <img v-else :src="require('./static/images/unlicensed/leaf.svg')">
                   </div>
                 </div>
                 <k-button title="查询缴费" style="margin-top: 46px;margin-bottom: 43px;" :disabled="disabledBtn" disabledColor="#D1D2D9" @click="preHandleSearch" />