Merge pull request #414 from John-Hong/release-3.2.0

fix(SCRM-5668): 完善车牌管理交互，在燃油tab下点击绿叶，跳转到新能源tab、feat(SCRM-5671): 纸质券补充过期判断状态

src/common/js/BaseDictionary.js

@@ -183,16 +183,16 @@ const SZXP = {
   },
   qa: {
     ...testAppIdInfo,
-    groupId: '8a888caf8809f52401880ea8c3fe0005',
-    mallId: '8a88817a8a629b5f018a838a0f6e001f',
+    groupId: '8a888a087cc59dc0017cc622f9ad0000',
+    mallId: '8a888abd8ceb6c70018d117f469c0010',
     projectId: 'SZXP',
   },
   prod: {
     // TODO: 等待对应公众号上线
     ...testAppIdInfo,
     // TODO: 获取生产环境的 groupId和mallId
-    groupId: '8a888caf8809f52401880ea8c3fe0005',
-    mallId: '8a88817a8a629b5f018a838a0f6e001f',
+    groupId: '8a888a087cc59dc0017cc622f9ad0000',
+    mallId: '8a888abd8ceb6c70018d117f469c0010',
     projectId: 'SZXP',
   },
 }
@@ -272,6 +272,9 @@ export const lbsDictionary = {
   // 深圳建设广场
   "8a84819f7c6e260e017c7f27940401ce": {
     ...SZXP
+  },
+  "8a8884e77cc9e70a017cca320e730005": {
+    ...SZXP
   }
 
 };

src/pages/parkingFee/mixins/parkingFeePaperCoupon.js

@@ -152,6 +152,12 @@ export default {
         "used": "0",
         "content": "嘉里卡券测试"
       }*/
+      /* [DE][C端]临时停车，静安纸质优惠券过期以后，扫码，依然可以扫出来金额 https://kerryprops.atlassian.net/browse/SCRM-5671 */
+      if ( res.hasOwnProperty('expired') && /1/.test(res?.expired)) {
+        return Toast({
+          message: '该纸质优惠已过期',
+        });
+      }
       if ( /0/.test(res.status)) {
         return Toast({
           message: '该纸质优惠券未激活',

src/pages/parkingFee/mixins/vehicleAddOrEdit.js

@@ -117,8 +117,6 @@ export default {
         this.carType = 1
         this.$refs['k-tab-edit'].changeTab(this.carType)
       }
-      this.ind = index;
-      this.active = index;
       this.$nextTick(() => {
         // return;
         if (index === 0) {

src/pages/parkingFeeV2/mixins/parkingFeePaperCoupon.js

@@ -173,6 +173,12 @@ export default {
         "used": "0",
         "content": "嘉里卡券测试"
       }*/
+      /* [DE][C端]临时停车，静安纸质优惠券过期以后，扫码，依然可以扫出来金额 https://kerryprops.atlassian.net/browse/SCRM-5671 */
+      if ( res.hasOwnProperty('expired') && /1/.test(res?.expired)) {
+        return Toast({
+          message: '该纸质优惠已过期',
+        });
+      }
       if ( /0/.test(res.status)) {
         return Toast({
           message: '该纸质优惠券未激活',

src/pages/parkingFeeV2/mixins/vehicleAddOrEdit.js

@@ -87,9 +87,13 @@ export default {
     },
     // 唤起键盘
     clickShowKeyboard(index) {
-      if (this.carType !== 1 && index === 7) return
+      // if (this.carType !== 1 && index === 7) return
       this.ind = index;
       this.active = index;
+      if ( index === 7) {
+        this.carType = 1
+        this.$refs['k-tab'].changeTab(this.carType)
+      }
       // console.log('唤起键盘', this.ind, this.active);
       this.$nextTick(() => {
         // return;