Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
yuping
2023-03-17 03:08:43 +08:00
14 changed files with 172 additions and 147 deletions

View File

@@ -58,7 +58,9 @@ http.interceptors.response.use(
return response;
}
if (code === 1000) {
(process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'alpine') ? router.push({path: 'login'}) : (window.location.href = process.env.VUE_APP_LOGIN_URL)
(process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'alpine') ?
router.push({path: 'login', query: { returnUrl: router.currentRoute.value.fullPath }}) :
(window.location.href = process.env.VUE_APP_LOGIN_URL + encodeURIComponent(window.location.protocol + import.meta.env.VUE_APP_BOE_API_URL + import.meta.env.VUE_APP_BASE + router.currentRoute.value.fullPath))
return Promise.reject(response);
}
show && message.error(msg);