Merge pull request #338 from John-Hong/John/release-2.20.0/SCRM-5068-2

2个提交：给查费接口添加超时时间、把首页根据中文判断的逻辑，改成英文变量

src/api/parking/index.js

@@ -12,7 +12,6 @@
 export function parkingLots(lbsId) {
   // return window.requestms.get(`/parking-lots/buildings/${buildingsId}`, {
   return window.requestms.get(`/parking-lots/lbs/${lbsId}`, {
-    timeout: 10000,
     loading: true,
   });
   // return window.requestms.get(`/`, { params, loading: true });
@@ -25,6 +24,7 @@ export function checkOut(vehicleNo, unlicensed) {
   // 'https://dev-kip-service-internal.kerryonvip.com/temporary-parking-service/parking/check-out?vehicleNo=浙
   return window.requestms.get(`/parking/check-out?vehicleNo=${vehicleNo}&unlicensed=${unlicensed}`, {
     loading: true,
+    timeout: 10000,
     headers: {
       buildingId: window.localStorage.getItem('buildingId'),
     },
@@ -158,7 +158,7 @@ export function invoiceEmails() {
  * @returns {*}
  */
 export function unlicensedCarCheckout(vehicleNo, unlicensed, gateId) {
-  return window.requestms.post(`/parking/unlicensed-car-checkout`, { vehicleNo, gateId }, { loading: true });
+  return window.requestms.post(`/parking/unlicensed-car-checkout`, { vehicleNo, gateId }, { loading: true, timeout: 10000 });
 }
 // 1.25 车场二维码信息查询（通过CodeID）
 /**

src/pages/parkingFee/mixins/parkingFee.js

@@ -57,7 +57,7 @@ export default {
       openId: null,
       options: null,
       preUrl: '',
-      tabbarActive: '手动缴费',
+      tabbarActive: 'manualPayment',
       supportUnlicensed: false, // 控制当前site，是否使用无牌车
       qrCodeHistory: '',
       currentTabType: this.carType,
@@ -249,8 +249,8 @@ export default {
       // debugger
       // const unlicensed = vehicles.filter(elm => elm.vehicleNo.indexOf('临') > -1)
       if (vehicles.length && vehicles[0].vehicleNo.indexOf('临') > -1) {
-        this.tabbarActiveEvent('无牌缴费');
-        // this.tabbarActive = '无牌缴费'
+        this.tabbarActiveEvent('paymentForUnregisteredVehicle');
+        // this.tabbarActive = 'paymentForUnregisteredVehicle'
       }
     },
     setLicensePlateList(arr) {
@@ -766,7 +766,7 @@ export default {
     },
     tabbarActiveEvent(name) {
       this.tabbarActive = name
-      if (name === '无牌缴费') {
+      if (name === 'paymentForUnregisteredVehicle') {
         this.$store.dispatch('order/unlicensedRule', (code) => {
 
           // CAR_NOT_FOUND 车场扫描道闸入口，发现无车

src/pages/parkingFee/parkingFee.vue

@@ -35,15 +35,15 @@
           <!-- 中控 -->
           <div class="parkingFee-bottom">
              <div style="height: 40px; background-color: #FBFCFF;" v-if="source === 'KIP'"></div>
-            <div :class="['parkingFee-tab', tabbarActive === '无牌缴费' && 'unlicensed-box-bottom']" v-if="supportUnlicensed && source !== 'KIP'">
+            <div :class="['parkingFee-tab', tabbarActive === 'paymentForUnregisteredVehicle' && 'unlicensed-box-bottom']" v-if="supportUnlicensed && source !== 'KIP'">
             <!-- <div style="height: 40px; background-color: #FBFCFF;" v-if="source === 'KIP' && !isAlipayClient"></div>
             <div :class="['parkingFee-tab', tabbarActive === '无牌缴费' && 'unlicensed-box-bottom']" v-if="supportUnlicensed && source !== 'KIP' && !isAlipayClient"> -->
-              <div :class="['bar', tabbarActive === '手动缴费' && 'active']" @click="tabbarActiveEvent('手动缴费')">手动缴费</div>
-              <div :class="['bar', tabbarActive === '无牌缴费' && 'active']" @click="tabbarActiveEvent('无牌缴费')">无牌缴费</div>
+              <div :class="['bar', tabbarActive === 'manualPayment' && 'active']" @click="tabbarActiveEvent('manualPayment')">手动缴费</div>
+              <div :class="['bar', tabbarActive === 'paymentForUnregisteredVehicle' && 'active']" @click="tabbarActiveEvent('paymentForUnregisteredVehicle')">无牌缴费</div>
             </div>
 
             <!-- 手动缴费 -->
-            <div class="manual-box" v-if="tabbarActive === '手动缴费'">
+            <div class="manual-box" v-if="tabbarActive === 'manualPayment'">
               <div class="parkingFee-search">
                 <div class="search_tip_1" :style="{paddingTop: supportUnlicensed? '0': '32px'}">
                   <div class="title">车辆类型</div>

src/pages/parkingFeeV2/mixins/parkingFee.js

@@ -51,7 +51,7 @@ export default {
       openId: null,
       options: null,
       preUrl: '',
-      tabbarActive: '手动缴费',
+      tabbarActive: 'manualPayment',
       supportUnlicensed: false, // 控制当前site，是否使用无牌车
       qrCodeHistory: '',
       isAlipayClient: isAlipayClient,
@@ -709,7 +709,7 @@ export default {
     },
     tabbarActiveEvent(name) {
       this.tabbarActive = name
-      if (name === '无牌缴费') {
+      if (name === 'paymentForUnregisteredVehicle') {
         this.$store.dispatch('order/unlicensedRule', (code) => {
 
           // CAR_NOT_FOUND 车场扫描道闸入口，发现无车
@@ -977,8 +977,8 @@ export default {
       // debugger
       // const unlicensed = vehicles.filter(elm => elm.vehicleNo.indexOf('临') > -1)
       if (vehicles.length && vehicles[0].vehicleNo.indexOf('临') > -1) {
-        this.tabbarActiveEvent('无牌缴费');
-        // this.tabbarActive = '无牌缴费'
+        this.tabbarActiveEvent('paymentForUnregisteredVehicle');
+        // this.tabbarActive = 'paymentForUnregisteredVehicle'
       }
     },
     setLicensePlateList(arr) {

src/pages/parkingFeeV2/parkingFee.vue

@@ -34,16 +34,16 @@
           <!-- 中控 -->
           <div class="parkingFee-bottom">
             <div style="height: 40px; background-color: #FBFCFF;" v-if="source === 'KIP'"></div>
-            <div :class="['parkingFee-tab', tabbarActive === '无牌缴费' && 'unlicensed-box-bottom']" v-if="supportUnlicensed && source !== 'KIP'">
+            <div :class="['parkingFee-tab', tabbarActive === 'paymentForUnregisteredVehicle' && 'unlicensed-box-bottom']" v-if="supportUnlicensed && source !== 'KIP'">
             <!-- <div style="height: 40px; background-color: #FBFCFF;" v-if="source === 'KIP' && !isAlipayClient"></div> -->
-            <!-- <div :class="['parkingFee-tab', tabbarActive === '无牌缴费' && 'unlicensed-box-bottom']" v-if="supportUnlicensed && source !== 'KIP' && !isAlipayClient">
+            <!-- <div :class="['parkingFee-tab', tabbarActive === 'paymentForUnregisteredVehicle' && 'unlicensed-box-bottom']" v-if="supportUnlicensed && source !== 'KIP' && !isAlipayClient">
                -->
-              <div :class="['bar', tabbarActive === '手动缴费' && 'active']" @click="tabbarActiveEvent('手动缴费')">手动缴费</div>
-              <div :class="['bar', tabbarActive === '无牌缴费' && 'active']" @click="tabbarActiveEvent('无牌缴费')">无牌缴费</div>
+              <div :class="['bar', tabbarActive === 'manualPayment' && 'active']" @click="tabbarActiveEvent('manualPayment')">手动缴费</div>
+              <div :class="['bar', tabbarActive === 'paymentForUnregisteredVehicle' && 'active']" @click="tabbarActiveEvent('paymentForUnregisteredVehicle')">无牌缴费</div>
             </div>
 
             <!-- 手动缴费 -->
-            <div class="manual-box" v-if="tabbarActive === '手动缴费'">
+            <div class="manual-box" v-if="tabbarActive === 'manualPayment'">
               <div class="parkingFee-search">
                 <div class="search_tip_1" :style="{paddingTop: supportUnlicensed? '0': '32px'}">
                   <div class="title">车辆类型</div>