Merge pull request #479 from dataease/pr@v1.1@fix_解决冲突

fix: 解决冲突
2026-06-15 10:31:43 +08:00 · 2021-08-03 11:23:45 +08:00
parent fce416e60e cdb383b529
commit dc789916a4
1 changed files with 3 additions and 4 deletions
--- a/frontend/src/utils/request.js
+++ b/frontend/src/utils/request.js
@@ -52,9 +52,9 @@ service.interceptors.request.use(
  }
 )

-const defaultOptions = {
-  confirmButtonText: i18n.t('login.re_login')
-}
+// const defaultOptions = {
+//   confirmButtonText: i18n.t('login.re_login')
+// }

 const checkAuth = response => {
  // 请根据实际需求修改
@@ -66,7 +66,6 @@ const checkAuth = response => {
      store.dispatch('user/logout').then(() => {
        location.reload()
      })
-
    }, {
      confirmButtonText: i18n.t('login.login_again'),
      showClose: false