Explorar o código

Merge pull request #125 from John-Hong/release-2.9.0

Release 2.9.0
Tron %!s(int64=2) %!d(string=hai) anos
pai
achega
77e5021f23

+ 1 - 1
src/api/request.js

@@ -188,7 +188,7 @@ export const createAxiosByinterceptors = (config) => {
       }
       // 错误信息提示
       const { code, langMessage, message,status } = error.response.data;
-      const codeList = ['INTERNAL_SERVER_ERROR', 'VALIDATION_FAILED', 'CAR_HAS_PLATE', "NOT_FOUND", "LOCAL_PARK_ERROR", "LOCK_OCCUPIED", "REMOTE_CALL_FAIL", 'PLEASE_SCAN_QRCODE', 'SUBIN_CAR_IN_DEVICE_EXCEPTION', 'COUPON_UNAVAILABLE', 'COUPON_SELECTION_FAILED']; // 默认处理的错误code
+      const codeList = ['INTERNAL_SERVER_ERROR', 'VALIDATION_FAILED', 'CAR_HAS_PLATE', "NOT_FOUND", "LOCAL_PARK_ERROR", "LOCK_OCCUPIED", "REMOTE_CALL_FAIL", 'PLEASE_SCAN_QRCODE', 'SUBIN_CAR_IN_DEVICE_EXCEPTION', 'COUPON_UNAVAILABLE', 'COUPON_SELECTION_FAILED', 'INOUT_FAILED']; // 默认处理的错误code
       if (codeList.indexOf(code) > -1) {
         uni.showToast({ title: langMessage || message, duration: 3000, icon: 'fail' });
       }

+ 1 - 1
src/pages/parkingFee/mixins/parkingFeeDetail.js

@@ -405,7 +405,7 @@ export default {
                 }, 1000)
               return
             }
-            if ( /CAR_NOT_FOUND/.test(res.code) ) {
+            if ( /CAR_NOT_FOUND|INOUT_FAILED/.test(res.code) ) {
               setTimeout(() => {
                 this.$router.replace({
                   path: 'parkingFeeMsg',

+ 1 - 1
src/utils/index.js

@@ -204,7 +204,7 @@ export function initEnv() {
 export function requestInit() {
   let baseURL = window.profileApi + '/temporary-parking/v1';
   if (window.location.href.indexOf('parking.') < 0) {
-    baseURL = '/msApi';
+    // baseURL = '/msApi';
   }
   window.requestms = createAxiosByinterceptors({
     // baseURL: `https://dev-kip-service-internal.kerryonvip.com/`,