Merge pull request #404 from tron/lock/release-3.1.0/KIP-13638-2

Lock/release 3.1.0/kip 13638 2

src/pages/parkingFeeV2/mixins/parkingFindCar.js

@@ -121,12 +121,12 @@ export default {
       }
     },
     isQHKC() {
-        const lbsList = ['8a88a9fd7f73ffcd017f968739870006','8a8486a37f48f7bd017f4e5bddd10000','8a8486a37f48f7bd017f4e5bddd10000']
+        const lbsList = ['8a88a9fd7f73ffcd017f968739870006','8a8486a37f48f7bd017f4e5bddd10000','8a8486a37f48f7bd017f4e5bddd10000', '8aaa82ea804d07cd0180516ff03b0008']
         return lbsList.indexOf(this.mallid) > -1
       },
       findcarNum (){
          // 如果是北京的ETCP 微信支付宝通用版
-         if (this.isQHKC()) {
+        //  if (this.isQHKC()) {
             wx.miniProgram.navigateTo({
               url: `/pages/package-parkingFee/findCar?lotId=${encodeURIComponent(
                 this.dataObject.parkId
@@ -147,7 +147,7 @@ export default {
             });
             // this.$router.back()
             return
-          }
+        //   }
       },
   },
 };

src/pages/parkingFeeV2/mixins/parkingFindCarFirst.js

@@ -333,10 +333,10 @@ export default {
     },
     // 校验车牌号
     async preHandleSearch() {
-    this.$router.push({
-        path: 'parkingFindCar',
-        });
-        return
+    // this.$router.push({
+    //     path: 'parkingFindCar',
+    //     });
+    //     return
       if (this.disabledBtn) return
       // 不是杭州的车牌 或者 用户拒绝登陆的场景
       this.toParkingFeeDetail()

src/utils/index.js

@@ -182,15 +182,15 @@ export function wxToLoginCallback( path,callback ) {
 export function initEnv() {
   const origin = window.location.origin;
   console.log('当前页面的url地址  ',origin);
-  if (origin.indexOf('http://127.0.0.1') > -1 || origin.indexOf('http://localhost:') > -1) {
-    window.env = 'qa';
-    window.profileApi = 'https://qa-apim.kerryplus.com/c/api';
-    window.cmrApi = 'https://qa-crm.kerryplus.com/xcrm-api/api';
-    window.api = 'qaApi';
-    // window.env = 'dev';
-    // window.profileApi = 'https://dev-gateway-kip.kerryonvip.com/api';
-    // window.cmrApi = 'https://dev-crm.kerryplus.com/xcrm-api/api';
-    // window.api = 'devApi';
+  if ( origin.indexOf('https://dev-') > -1  || origin.indexOf('http://127.0.0.1') > -1 || origin.indexOf('http://localhost:') > -1) {
+    // window.env = 'qa';
+    // window.profileApi = 'https://qa-apim.kerryplus.com/c/api';
+    // window.cmrApi = 'https://qa-crm.kerryplus.com/xcrm-api/api';
+    // window.api = 'qaApi';
+    window.env = 'dev';
+    window.profileApi = 'https://dev-gateway-kip.kerryonvip.com/api';
+    window.cmrApi = 'https://dev-crm.kerryplus.com/xcrm-api/api';
+    window.api = 'devApi';
     // window.env = 'prod';
     // window.profileApi = 'https://sl-apim.kerryplus.com/c/api';
     // window.cmrApi = 'https://sl-crm.kerryplus.com/xcrm-api/api';