Forráskód Böngészése

Merge pull request #272 from John-Hong/John/release-2.18.0/KIP-11259

feat(KIP-11259): 功能优化 | 车辆输入功能优化
John-Hong 1 éve
szülő
commit
07b4fba367

+ 3 - 3
src/components/plate-number/plateNumber.vue

@@ -552,9 +552,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;

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

@@ -228,7 +228,10 @@ export default {
     },
     // 唤起键盘
     clickShowKeyboard(index) {
-      if (this.carType !== 1 && index === 7) return
+      if ( index === 7) {
+        this.carType = 1
+        this.$refs['k-tab'].changeTab(this.carType)
+      }
       this.ind = index;
       this.active = index;
       if (index === 0) {
@@ -837,10 +840,6 @@ export default {
     },
     setVehicleNoType(vehicleNo, vehicles) {
       this.isUnlicensed(vehicles)
-      // if(vehicleNo.indexOf('临') === 0) {
-      //   this.tabbarActive = '无牌缴费'
-      //   return
-      // }
       const item = vehicles.filter(e => e.vehicleNo === vehicleNo)
       if(item.length) {
         let label = LICENSE_PLATE_TYPE_ARR.filter(e => e.value == item[0].licensePlateType)
@@ -851,7 +850,7 @@ export default {
       return false
     },
     isUnlicensed(vehicles) {
-      const unlicensed = vehicles.filter(elm => elm.indexOf('临') === -1)
+      const unlicensed = vehicles.filter(elm => elm.vehicleNo.indexOf('临') > -1)
       if(unlicensed.length) {
         this.tabbarActive = '无牌缴费'  
       }

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

@@ -44,6 +44,7 @@
               <div class="parkingFee-search">
                 <div class="search_tip_1" :style="{paddingTop: supportUnlicensed? '0': '32px'}">
                   <div class="title">车辆类型</div>
+<!--                  <k-tab ref="k-tab" type="fill" @change="toggleType" :tabs="['燃油车牌', '新能源', '特殊车牌']" />-->
                   <k-tab ref="k-tab" type="fill" @change="toggleType" :tabs="['燃油车牌', '新能源', '特殊车牌']" />
                 </div>
                 <!-- <div class="search_tip">
@@ -82,7 +83,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('@/pages/parkingFee/static/images/unlicensed/leaf.svg')">
+<!--                    <img v-else :src="require('@/pages/parkingFee/static/images/unlicensed/leaf.svg')">-->
                   </div>
                 </div>
                 <k-button title="查询缴费" style="margin-top: 46px;margin-bottom: 43px;" :disabled="disabledBtn" disabledColor="#D1D2D9" @click="preHandleSearch" />