Explorar o código

Merge pull request #46 from John-Hong/John/release-2.4.0/SCRM-3423

fix(SCRM-3423): 【DE】【C端】临时停车微服务。未登录状态下,页面先进入临时停车页面,再进入登陆页面
Tron %!s(int64=2) %!d(string=hai) anos
pai
achega
5e1786e3d3
Modificáronse 2 ficheiros con 12 adicións e 8 borrados
  1. 4 1
      src/api/request.js
  2. 8 7
      src/pages/parkingFee/mixins/parkingFee.js

+ 4 - 1
src/api/request.js

@@ -176,11 +176,14 @@ export const createAxiosByinterceptors = (config) => {
         }
       }
       // 错误信息提示
-      const { code, langMessage, message } = error.response.data;
+      const { code, langMessage, message,status } = error.response.data;
       const codeList = ['INTERNAL_SERVER_ERROR', 'VALIDATION_FAILED', 'CAR_NOT_FOUND', 'CAR_HAS_PLATE', "NOT_FOUND", "LOCAL_PARK_ERROR", "LOCK_OCCUPIED", "REMOTE_CALL_FAIL", 'PLEASE_SCAN_QRCODE']; // 默认处理的错误code
       if (codeList.indexOf(code) > -1) {
         uni.showToast({ title: langMessage || message, duration: 3000, icon: 'fail' });
       }
+      if ( status === 500 ) {
+        uni.showToast({ title: error.response.data.error, duration: 3000, icon: 'fail' });
+      }
       // Message.error(error?.response?.data?.message || '服务端异常');
       return Promise.reject(error.response.data);
     }

+ 8 - 7
src/pages/parkingFee/mixins/parkingFee.js

@@ -97,8 +97,8 @@ export default {
     },
     unlicensedInfo:{
       handler(){
-        const member = uni.getStorageSync('member');
-        if(!member) return // 如果用户走未登录流程的话
+        // const member = uni.getStorageSync('member');
+        // if(!member) return // 如果用户走未登录流程的话
         // 不论是否出入场,都使用此函数获取 gateId(闸口机器的ID)
         if (this.unlicensedInfo?.type && /unlicensedOut|unlicensedIn/.test(this.unlicensedInfo.type) && this.endlessLoop.length === 0) {
           // 此处记录扫码流程执行次数。如果超过一次则不再执行
@@ -122,9 +122,11 @@ export default {
       await initWxJsSdkConfig(['checkJsApi', 'scanQRCode']);
     }
     const member = uni.getStorageSync('member');
+    const openid= uni.getStorageSync('openid');
+    // console.log(openid)
     // 如果用户未登录的话,返回之后,重新获取数据用户的基础数据
     if (!member && window?.toWXSendMsg) {
-      wxToLoginCallback('parkingFee', (options) => {
+      /*wxToLoginCallback('parkingFee', (options) => {
         console.log('用户是扫码进来的125', this.unlicensedInfo);
         console.log('用户是扫码进来的126', options);
         this.$store.commit('SET_IS_INIT', false);
@@ -153,11 +155,10 @@ export default {
             },
           });
         });
-      });
-      // return
+      });*/
     }
-    console.log(136, this.openid);
-    if (this.openid) {
+    // console.log(136, this.openid);
+    if (openid) {
       this.getParkInfo();
       this.showSq = false;
     } else {