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

fix: 解决冲突
This commit is contained in:
fit2cloud-chenyw 2021-08-03 11:23:45 +08:00 committed by GitHub
commit dc789916a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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