diff --git a/sub-government-affairs-service/src/App.vue b/sub-government-affairs-service/src/App.vue index f4a4aaf..6bbe46c 100644 --- a/sub-government-affairs-service/src/App.vue +++ b/sub-government-affairs-service/src/App.vue @@ -23,7 +23,7 @@ onMounted(() => { if (localStorage.getItem('source')) { router.push('/sub-government-affairs-service/home'); } else { - if (JSON.parse(localStorage.getItem('daimp-front-main_userStore')).token) { + if (localStorage.getItem('daimp-front-main_userStore') && JSON.parse(localStorage.getItem('daimp-front-main_userStore')).token) { router.push('/sub-government-affairs-service/home'); } else { router.push('/sub-government-affairs-service/login'); diff --git a/sub-government-affairs-service/src/layouts/component/Avatar/index.vue b/sub-government-affairs-service/src/layouts/component/Avatar/index.vue index bcec97a..92cefe7 100644 --- a/sub-government-affairs-service/src/layouts/component/Avatar/index.vue +++ b/sub-government-affairs-service/src/layouts/component/Avatar/index.vue @@ -53,7 +53,7 @@ const logOut = async () => { type: 'success', message: '退出登录成功!', }); - localStorage.removeItem('daimp-front-main_user_store'); + localStorage.removeItem('daimp-front-main_userStore'); } else { console.log('退出到门户页'); } diff --git a/sub-operation-service/src/App.vue b/sub-operation-service/src/App.vue index e42b9e4..73549c4 100644 --- a/sub-operation-service/src/App.vue +++ b/sub-operation-service/src/App.vue @@ -22,7 +22,7 @@ onMounted(() => { if (localStorage.getItem('source')) { router.push('/sub-operation-service/dashboard/home'); } else { - if (JSON.parse(localStorage.getItem('daimp-front-main_userStore')).token) { + if (localStorage.getItem('daimp-front-main_userStore') && JSON.parse(localStorage.getItem('daimp-front-main_userStore')).token) { router.push('/sub-operation-service/dashboard/home'); } else { router.push('/sub-operation-service/login'); diff --git a/sub-operation-service/src/layouts/component/Header/index.vue b/sub-operation-service/src/layouts/component/Header/index.vue index 9b0d11a..0b1904a 100644 --- a/sub-operation-service/src/layouts/component/Header/index.vue +++ b/sub-operation-service/src/layouts/component/Header/index.vue @@ -146,12 +146,12 @@ const loginOut = () => { Logout().then((res) => { if (res.code === 200) { if (res.data.source !== 'main') { + localStorage.removeItem('daimp-front-main_userStore'); router.push({ path: '/sub-operation-service/login' }); ElMessage({ type: 'success', message: '退出登录成功!', }); - localStorage.removeItem('daimp-front-main_user_store'); } else { console.log('退出到门户页'); }