Merge pull request #527 from tron/lock/release-3.7.0/SCRM-6145

Lock/release 3.7.0/scrm 6145

src/common/js/BaseDictionary.js

@@ -36,6 +36,22 @@ const HKC = {
   },
 };
 
+const BKC = {
+  qa: {
+    ...testAppIdInfo,
+    groupId: '8a8884e77cc9e70a017cca09d72a0000',
+    mallId: '8a8884e77cc9e70a017cca4003590008',
+    projectId: '185',
+  },
+  prod: {
+    // TODO: 等待对应公众号上线
+    ...testAppIdInfo,
+    groupId: '8a8884e77cc9e70a017cca09d72a0000',
+    mallId: '8a8884e77cc9e70a017cca4003590008',
+    projectId: '185',
+  },
+};
+
 // 前海
 const QHKC = {
   dev: {
@@ -275,6 +291,9 @@ export const lbsDictionary = {
   },
   "8a8884e77cc9e70a017cca320e730005": {
     ...SZXP
+  },
+  "8a8884e77cc9e70a017cca484c460009": {
+    ...BKC
   }
 
 };

src/pages/parkingFeeV2/mixins/parkingFee.js

@@ -848,7 +848,7 @@ export default {
     fetchData(id) {
       return new Promise(async (resolve, reject) => {
         try {
-          const res = await this.asyncRequest(`${'https://pq.kerryplus.com'}/c/${id}`);
+          const res = await this.asyncRequest(`${window.QR_CODE_BASE_URL}/c/${id}`);
           console.log('baseURLQrCode：：：', res)
           // console.log('baseURLQrCodebaseURLQrCode：：', res.data);
           if (res?.code == 200) {
@@ -860,6 +860,7 @@ export default {
               `/pages/package-parkingFee/parkingFeeWebViewLogin?${res.data.url}`
             
               // resolve(queryStringToObject(`t-page?${res.data.url}`))
+              // #ifdef MP-ALIPAY
               my.navigateTo({
                 url: `/pages/package-parkingFee/parkingFeeWebViewLogin?${res.data.url}`,
                 complete: function (res) {
@@ -872,6 +873,7 @@ export default {
                   console.log('跳转失败::', res)
                 }
               });
+              // #endif
             } else {
               reject(false)
             }

src/pages/parkingFeeV2/parkingFeeMsg.vue

@@ -192,6 +192,7 @@ export default {
               `/pages/package-parkingFee/parkingFeeWebViewLogin?${res.data.url}`
             
               // resolve(queryStringToObject(`t-page?${res.data.url}`))
+              // #ifdef MP-ALIPAY
               my.navigateTo({
                 url: `/pages/package-parkingFee/parkingFeeWebViewLogin?${res.data.url}`,
                 complete: function (res) {
@@ -204,6 +205,7 @@ export default {
                   console.log('跳转失败::', res)
                 }
               });
+              // #endif
             } else {
               reject(false)
             }

src/utils/index.js

@@ -188,6 +188,7 @@ export function initEnv() {
     window.profileApi = 'https://qa-apim.kerryplus.com/c/api';
     window.cmrApi = 'https://qa-crm.kerryplus.com/xcrm-api/api';
     window.api = 'qaApi';
+    window.QR_CODE_BASE_URL = 'https://p.kerryplus.com';
     // window.env = 'dev';
     // window.profileApi = 'https://dev-gateway-kip.kerryonvip.com/api';
     // window.cmrApi = 'https://dev-crm.kerryplus.com/xcrm-api/api';
@@ -204,7 +205,8 @@ export function initEnv() {
     window.profileApi = 'https://dev-gateway-kip.kerryonvip.com/api';
     window.cmrApi = 'https://dev-crm.kerryplus.com/xcrm-api/api';
     window.api = 'devApi';
-    window.wechatOfficialAccountId = 'wxb81a622ed6d60adf'
+    window.wechatOfficialAccountId = 'wxb81a622ed6d60adf';
+    window.QR_CODE_BASE_URL = 'https://pd.kerryplus.com';
     return;
   }
   if ( origin.indexOf('https://qa-') > -1 ) {
@@ -212,7 +214,8 @@ export function initEnv() {
     window.api = 'qaApi';
     window.profileApi = 'https://qa-apim.kerryplus.com/c/api';
     window.cmrApi = 'https://qa-crm.kerryplus.com/xcrm-api/api';
-    window.wechatOfficialAccountId = 'wxb81a622ed6d60adf'
+    window.wechatOfficialAccountId = 'wxb81a622ed6d60adf';
+    window.QR_CODE_BASE_URL = 'https://pq.kerryplus.com';
     return;
   }
   if ( origin.indexOf('https://sl-') > -1 ) {
@@ -221,6 +224,7 @@ export function initEnv() {
     window.cmrApi = 'https://sl-crm.kerryplus.com/xcrm-api/api';
     window.api = 'api';
     window.wechatOfficialAccountId = 'wxb150c7d193e8662d'
+    window.QR_CODE_BASE_URL = 'https://p.kerryplus.com';
     return;
   }
   if ( origin.indexOf('https://lt-') > -1 ) {
@@ -228,14 +232,16 @@ export function initEnv() {
     window.profileApi = 'https://lt-gateway-kip-internal.kerryplus.com/api';
     window.cmrApi = 'https://lt-crm.kerryplus.com/xcrm-api/api';
     window.api = 'api';
-    window.wechatOfficialAccountId = 'wx2bd99ca94d6acd7e'
+    window.wechatOfficialAccountId = 'wx2bd99ca94d6acd7e';
+    window.QR_CODE_BASE_URL = 'https://p.kerryplus.com';
     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 = 'wxb150c7d193e8662d'
+  window.wechatOfficialAccountId = 'wxb150c7d193e8662d';
+  window.QR_CODE_BASE_URL = 'https://p.kerryplus.com';
 }
 
 export function requestInit() {