Merge pull request #252 from John-Hong/John/release-2.17.0/KIP-11937

fix(KIP-11958): 【DE】【C端】临时停车。用户无法去开票

src/pages/parkingFee/components/base/parkingFee.vue

@@ -89,7 +89,7 @@
                   :class="carType == 0 ? 'search_tip_pt_index' : ''"
                   @click="toggleType(0)"
                 >
-                  普通车牌
+                燃油车牌
                 </div>
                 <div
                   :class="carType == 1 ? 'search_tip_pt_index' : ''"

src/pages/parkingFee/components/purple/parkingFee.vue

@@ -41,12 +41,12 @@
             <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 type="fill" @change="toggleType" :tabs="['燃油车牌', '新能源', '特殊车牌']" />
               </div>
               <!-- <div class="search_tip">
                 <div class="title">车辆类型</div>
                 <div class="search_tip_pt">
-                  <div :class="carType == 0 ? 'search_tip_pt_index' : ''" @click="toggleType(0)">普通车牌</div>
+                  <div :class="carType == 0 ? 'search_tip_pt_index' : ''" @click="toggleType(0)">燃油车牌</div>
                   <div :class="carType == 1 ? 'search_tip_pt_index' : ''" @click="toggleType(1)">新能源</div>
                   <div :class="carType == 2 ? 'search_tip_pt_index' : ''" @click="toggleType(2)">特殊车牌</div>
                 </div>

src/pages/parkingFee/components/purple/vehicleAddOrEdit.vue

@@ -4,7 +4,7 @@
     <div>
       <div class="search_tip_1">
         <div class="title">车辆类型</div>
-        <k-tab type="fill" @change="toggleType" :tabs="['普通车牌', '新能源', '特殊车牌']" />
+        <k-tab type="fill" @change="toggleType" :tabs="['燃油车牌', '新能源', '特殊车牌']" />
       </div>
       <div class="input-box">
         <!-- <div v-for="i in carType === 1 ? 8 : 7" class="li" :key="`numArr${i}`" @click="clickShowKeyboard(i)" :class="[active === i ? 'active' : '']">

src/pages/parkingFee/mixins/parkingFee.js

@@ -60,7 +60,8 @@ export default {
       tabbarActive: '手动缴费',
       supportUnlicensed: false, // 控制当前site，是否使用无牌车
       qrCodeHistory: '',
-      currentTabType: this.carType
+      currentTabType: this.carType,
+      isAlipayClient: isAlipayClient
       // custTypeId: 0,
     };
   },

src/pages/parkingFee/parkingFee.vue

@@ -34,8 +34,8 @@
           
           <!-- 中控 -->
           <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 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>
@@ -50,7 +50,7 @@
                 <!-- <div class="search_tip">
                   <div class="title">车辆类型</div>
                   <div class="search_tip_pt">
-                    <div :class="carType == 0 ? 'search_tip_pt_index' : ''" @click="toggleType(0)">普通车牌</div>
+                    <div :class="carType == 0 ? 'search_tip_pt_index' : ''" @click="toggleType(0)">燃油车牌</div>
                     <div :class="carType == 1 ? 'search_tip_pt_index' : ''" @click="toggleType(1)">新能源</div>
                     <div :class="carType == 2 ? 'search_tip_pt_index' : ''" @click="toggleType(2)">特殊车牌</div>
                   </div>

src/pages/parkingFee/vehicleAddOrEdit.vue

@@ -4,7 +4,7 @@
     <div>
       <div class="search_tip_1">
         <div class="title">车辆类型</div>
-        <k-tab type="fill" @change="toggleType" :tabs="['普通车牌', '新能源', '特殊车牌']" />
+        <k-tab type="fill" @change="toggleType" :tabs="['燃油车牌', '新能源', '特殊车牌']" />
       </div>
       <div class="input-box">
         <!-- <div v-for="i in carType === 1 ? 8 : 7" class="li" :key="`numArr${i}`" @click="clickShowKeyboard(i)" :class="[active === i ? 'active' : '']">

src/pages/parkingFeeV2/mixins/parkingFee.js

@@ -59,7 +59,8 @@ export default {
       preUrl: '',
       tabbarActive: '手动缴费',
       supportUnlicensed: false, // 控制当前site，是否使用无牌车
-      qrCodeHistory: ''
+      qrCodeHistory: '',
+      isAlipayClient: isAlipayClient
       // custTypeId: 0,
     };
   },
@@ -164,11 +165,12 @@ export default {
       this.showSq = true;
     }
     try {
-      if(!isAlipayClient) {
-        setTimeout(async () => {
-          await initWxJsSdkConfig(['checkJsApi', 'scanQRCode']);
-        }, 1500)
-      }
+      // const href = window.location.href;
+      // if(!isAlipayClient && !/808[0-9]/.test(href)) {
+      //   setTimeout(async () => {
+      //     await initWxJsSdkConfig(['checkJsApi', 'scanQRCode']);
+      //   }, 1500)
+      // }
     } catch (e) {
       console.log(e)
     }

src/pages/parkingFeeV2/mixins/parkingFeeDetail.js

@@ -348,7 +348,7 @@ export default {
             })
          }
         console.log('下单时的参数', params);
-        const unlicensed = this.$route.query?.vehicleNo ? this.$route.query?.vehicleNo.indexOf('临') > -1 : false; // true: 临时车牌；false：普通车牌
+        const unlicensed = this.$route.query?.vehicleNo ? this.$route.query?.vehicleNo.indexOf('临') > -1 : false; // true: 临时车牌；false：燃油车牌
         const res = await ordersAndPrepay(params, unlicensed);
         // console.log('orderDetail', res);
         if (res?.paymentType === 'NO_FEE_PAY') {

src/pages/parkingFeeV2/mixins/parkingReceipt/parkingApplication.js

@@ -1,5 +1,5 @@
 const app = {};
-import arrowIcon from '../../static/images/arrows.png';
+import arrowIcon from '@/pages/parkingFee/static/images/arrows.png';
 import { mapState } from 'vuex';
 import uni from '@/utils/uniHooks';
 import { getUrlParams } from '@/utils/index.js';

src/pages/parkingFeeV2/parkingFee.vue

@@ -33,8 +33,8 @@
           
           <!-- 中控 -->
           <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 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>
@@ -44,12 +44,12 @@
               <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 type="fill" @change="toggleType" :tabs="['燃油车牌', '新能源', '特殊车牌']" />
                 </div>
                 <!-- <div class="search_tip">
                   <div class="title">车辆类型</div>
                   <div class="search_tip_pt">
-                    <div :class="carType == 0 ? 'search_tip_pt_index' : ''" @click="toggleType(0)">普通车牌</div>
+                    <div :class="carType == 0 ? 'search_tip_pt_index' : ''" @click="toggleType(0)">燃油车牌</div>
                     <div :class="carType == 1 ? 'search_tip_pt_index' : ''" @click="toggleType(1)">新能源</div>
                     <div :class="carType == 2 ? 'search_tip_pt_index' : ''" @click="toggleType(2)">特殊车牌</div>
                   </div>

src/pages/parkingFeeV2/vehicleAddOrEdit.vue

@@ -4,7 +4,7 @@
     <div>
       <div class="search_tip_1">
         <div class="title">车辆类型</div>
-        <k-tab type="fill" @change="toggleType" :tabs="['普通车牌', '新能源', '特殊车牌']" />
+        <k-tab type="fill" @change="toggleType" :tabs="['燃油车牌', '新能源', '特殊车牌']" />
       </div>
       <div class="input-box">
         <!-- <div v-for="i in carType === 1 ? 8 : 7" class="li" :key="`numArr${i}`" @click="clickShowKeyboard(i)" :class="[active === i ? 'active' : '']">

src/routes/indexV2.js

@@ -50,7 +50,7 @@ export const routes = [
     },{
         path: '/parkingApplication',
         name: 'parkingApplication',
-        component: () => import('@/pages/parkingFeeV2/parkingReceipt/parkingChangeHeader.vue'),
+        component: () => import('@/pages/parkingFeeV2/parkingReceipt/parkingApplication.vue'),
     },{
         path: '/parkingFeeDetail',
         name: 'parkingFeeDetail',

src/utils/index.js

@@ -211,14 +211,14 @@ export function initEnv() {
     window.profileApi = 'https://sl-apim.kerryplus.com/c/api';
     window.cmrApi = 'https://sl-crm.kerryplus.com/xcrm-api/api';
     window.api = 'api';
-    window.wechatOfficialAccountId = 'wxb81a622ed6d60adf'
+    window.wechatOfficialAccountId = 'wxb150c7d193e8662d'
     return;
   }
   window.env = 'prod';
   window.profileApi = 'https://apim.kerryplus.com/c/api';
   window.cmrApi = 'https://crm.kerryplus.com/xcrm-api/api';
   window.api = 'api';
-  window.wechatOfficialAccountId = 'wxb81a622ed6d60adf'
+  window.wechatOfficialAccountId = 'wxb150c7d193e8662d'
 }
 
 export function requestInit() {