From d6368132106f4b59c495fd89e1b679367c7dbaf9 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Fri, 10 Jan 2025 17:38:54 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E7=A6=81=E7=94=A8=E6=88=96?= =?UTF-8?q?=E6=97=A0=E6=9D=83=E9=99=90=E8=87=AA=E5=8A=A8=E9=80=80=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.js | 8 ++++++-- src/utils/request.js | 11 ++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/main.js b/src/main.js index 3399587d..f8ce36ff 100644 --- a/src/main.js +++ b/src/main.js @@ -403,8 +403,12 @@ async function VueInit() { } _vm.$store.dispatch('user/logout').then(res => { // window.location.href = `/login` - if (_vm.$msgbox) { - _vm.$msgbox.close(); + try { + if (_vm.$msgbox && _vm.$msgbox.close) { + _vm.$msgbox.close(); + } + } catch (err) { + console.log(err) } _vm.$FB.close(); _vm.$FBT.close(); diff --git a/src/utils/request.js b/src/utils/request.js index beb3fca7..a42d08a0 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -1,11 +1,11 @@ import axios from 'axios' -import _vm from '@/main' import { Message, MessageBox, Alert } from 'element-ui' import store from '@/store' import router from '@/router' import WHITELIST from "./whiteList" import moment from 'moment-timezone'; import { encryptConfig } from "@/utils/encrypt" +const ROUTER = require('@/router'); axios.defaults.withCredentials = false const service = axios.create({ baseURL: '/api', @@ -91,8 +91,13 @@ service.interceptors.response.use( const status = error.response.status if (error.response.data && (error.response.data.Code === -1 || error.response.data.Code === -2)) { store.dispatch('user/logout').then(() => { - if (_vm.$msgbox) { - _vm.$msgbox.close(); + let _vm = ROUTER.default.app + try { + if (_vm.$msgbox && _vm.$msgbox.close) { + _vm.$msgbox.close(); + } + } catch (err) { + console.log(err) } router.push(`/login`) this.$i18n.locale = 'zh'