Merge pull request #245 from tron/lock/release-2.16.0/SCRM-4268

feat(KIP-11748\KIP-11459):  Temp Parking | Frontend H5｜支付-创建支付订单接口调整

src/components/plate-number/plateNumber.vue

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

src/kui/components/k-tab/k-tab.vue

@@ -103,6 +103,7 @@ export default {
   watch: {
     defaultCurrent(newVal) {
       this.current = newVal;
+      console.log('this.current::::', this.current)
     },
   },
   methods: {

src/pages/parkingFee/mixins/parkingFee.js

@@ -59,7 +59,8 @@ export default {
       preUrl: '',
       tabbarActive: '手动缴费',
       supportUnlicensed: false, // 控制当前site，是否使用无牌车
-      qrCodeHistory: ''
+      qrCodeHistory: '',
+      currentTabType: this.carType
       // custTypeId: 0,
     };
   },
@@ -196,6 +197,7 @@ export default {
       this.ind = 0;
       this.active = 0;
       this.carType = carType;
+      this.currentTabType = carType
       if (carType === 1) {
         this.numArr = [
           this.numArr[0],
@@ -246,7 +248,12 @@ export default {
     },
     // 唤起键盘
     clickShowKeyboard(index) {
-      if ( this.carType !== 1 && index === 7) return
+      if ( index === 7) {
+        this.currentTabType = 1
+        console.log('this.currentTabType::', this.currentTabType)
+        this.carType = 1
+        console.log()
+      }
       this.ind = index;
       this.active = index;
       if (index === 0) {

src/pages/parkingFee/mixins/parkingFeeDetail.js

@@ -207,6 +207,7 @@ export default {
       const { coupons, points, memberGrade = [], paperCoupons = [], consume = [] } = discountInfo
       const { hourPrice } = parkingRule
       try {
+        const unlicensed = parkingRecord.vehicleNo.indexOf('临') > -1 || !parkingRecord.vehicleNo;
         const params = {
           // vehicleNo: '', // 车牌号
           // points
@@ -219,6 +220,8 @@ export default {
             serviceMin: parkingRecord.serviceMin,
             totalFee: parkingRecord.totalFeeInYuan, //应缴
             actualPayFee: this.actualPayFee, //应付金额
+            unlicensed: unlicensed // 判断当前车是否是无牌车
+
           },
           discountInfo: {
             usingTotalDiscount: discountInfo?.usingTotalDiscount || 0, //优惠金额"

src/pages/parkingFee/parkingFee.vue

@@ -45,7 +45,7 @@
               <div class="parkingFee-search">
                 <div class="search_tip_1" :style="{paddingTop: supportUnlicensed? '0': '32px'}">
                   <div class="title">车辆类型</div>
-                  <k-tab type="fill" @change="toggleType" :tabs="['普通车牌', '新能源', '特殊车牌']" />
+                  <k-tab :defaultCurrent="currentTabType" type="fill" @change="toggleType" :tabs="['燃油车牌', '新能源', '特殊车牌']" />
                 </div>
                 <!-- <div class="search_tip">
                   <div class="title">车辆类型</div>
@@ -83,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('./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" />
@@ -1027,4 +1027,10 @@ export default {
     border-radius: 40px;
   }
 }
+// 遮罩层
+.plate-keyboard {
+  .van-overlay {
+        background-color: rgba(0,0,0,.1);
+  }
+}
 </style>