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

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