Merge pull request #128 from John-Hong/John/release-2.9.0/SCRM-3886

fix(SCRM-3886): [DE][C端]临时停车，无法调起特殊车牌的键盘

src/api/errorCode.js

@@ -0,0 +1,3 @@
+export default {
+    PLEASE_SCAN_QRCODE: '无牌车停没有扫入场码的情况下，停在出口扫码'
+}

src/api/mockData/checkout.pd11.response.json

@@ -105,6 +105,6 @@
     "parkName": "浦东嘉里停车场",
     "description": "深圳停车场最新描述涨价到10块一小时",
     "parkMallCode": 1,
-    "buildingId": "PKC-P1"
+    "buildingId": "184-100035"
   }
 }

src/pages/parkingFee/mixins/parkingFee.js

@@ -657,7 +657,7 @@ export default {
         if (/CAR_HAS_PLATE/.test(err.code)) {
           return
         }
-        if (/CAR_NOT_FOUND|INOUT_FAILED/.test(err.code)) {
+        if (/CAR_NOT_FOUND|INOUT_FAILED|UNLICENSED_PLATE_ACQUISITION_FAILED/.test(err.code)) {
           // 如果是其他错误的话，则继续往下执行
           this.$router.push({
             path: 'parkingFeeMsg',

src/pages/parkingFee/mixins/parkingFeeDiscounts.js

@@ -140,7 +140,7 @@ export default {
       }
       // console.log(140, this.consume, this.consume.hasOwnProperty('selected'), JSON.stringify(this.consume) !== '{}' && this.consume.hasOwnProperty('selected') ? this.consume.selected : this.consume.defaultSelected, this.consume.defaultSelected)
       // console.log(143, JSON.stringify(this.consume) !== '{}' && this.consume.hasOwnProperty('selected') ? this.consume.selected !== undefined : this.consume.defaultSelected !== undefined);
-      if (JSON.stringify(this.consume) !== '{}' && this.consume.hasOwnProperty('selected') ? this.consume.selected !== undefined : this.consume.defaultSelected !== undefined) {
+      if (JSON.stringify(this.consume) !== '{}' && this.consume.hasOwnProperty('selected') ? this.consume.selected : this.consume.defaultSelected !== undefined) {
         this.checkedList.push('reduces');
         this.isReduces = false;
         // 如果存在拆分逻辑的话
@@ -175,7 +175,7 @@ export default {
         }
         return;
       }
-      if (type === 'minus') {
+      if (type === 'minus' && this.reduceHours > 1) {
         this.reduceHours = this.reduceHours - 1;
         this.remainPrice = this.remainPrice - hourPrice;
         return;
@@ -214,7 +214,7 @@ export default {
       } else {
         this.remainPrice = this.remainPrice - hourPrice;
         this.maxReduceDiscount = maxConsumeTime;
-        this.reduceHours = 0;
+        // this.reduceHours = maxConsumeTime;
       }
       const [isCrossMessage = false, maxReduceDiscount = 0] = this.crossMessage();
       if (isCrossMessage) {

src/pages/parkingFee/parkingFee.vue

@@ -142,7 +142,7 @@
           <div class="top_down" @click="top_display" v-else><van-icon name="arrow-up" /></div>
         </div>
       </div>
-      <plate-number ref="plateKeyboard" :noDisBtn="[36, 37]" :carType="carType" :active="active" :ind="ind" :numArr="numArr" @carnoArr="updateCarno"></plate-number>
+      <plate-number ref="plateKeyboard" :noDisBtn="[32, 33, 34,35, 36, 37]" :carType="carType" :active="active" :ind="ind" :numArr="numArr" @carnoArr="updateCarno"></plate-number>
     </div>
   </scroll-view>
 </template>

src/pages/parkingFee/parkingFeeDiscounts.vue

@@ -18,7 +18,7 @@
             <div class="content" v-if="orderDetail.parkInfo.parkMallCode !== 1">
               {{ todayReduceDiscountMessage }}
             </div>
-            <van-stepper v-if="enableConsumeSplit || true" :min="0" name="reduces" :disabled="isReduces" :max="maxReduceDiscount" :value="reduceHours" @plus="onReduceHoursChange('plus')" @minus="onReduceHoursChange('minus')" async-change />
+            <van-stepper v-if="enableConsumeSplit || true" :min="0" name="reduces" :disabled="isReduces || !maxReduceDiscount" :max="maxReduceDiscount" :value="reduceHours" @plus="onReduceHoursChange('plus')" @minus="onReduceHoursChange('minus')" async-change />
             <!--            reduceHours: {{ reduceHours }}; maxReduceDiscount:{{ maxReduceDiscount }}-->
             <!--            <uni-number-box
                           v-if="enableConsumeSplit || true"
@@ -28,7 +28,7 @@
                           @input="reducesChange"
                         ></uni-number-box>-->
           </div>
-          <van-checkbox name="reduces" color="#fff" checked-color="var(--k-color-primary)" :disabled="isReduces" @click="reducesClick" />
+          <van-checkbox name="reduces" color="#fff" checked-color="var(--k-color-primary)" :disabled="isReduces || !maxReduceDiscount" @click="reducesClick" />
         </div>
       </van-checkbox-group>
     </div>

src/pages/parkingFee/parkingFeeMsg.vue

@@ -195,7 +195,7 @@ export default {
         if (/CAR_HAS_PLATE/.test(err.code)) {
           return
         }
-        if (/CAR_NOT_FOUND/.test(err.code)) {
+        if (/CAR_NOT_FOUND|UNLICENSED_PLATE_ACQUISITION_FAILED/.test(err.code)) {
           setTimeout(() => {
             // 如果是其他错误的话，则继续往下执行
             this.$router.replace({