退出跳转bug修复

This commit is contained in:
yj 2024-09-04 14:33:12 +08:00
parent b27b338e39
commit 22c655174c
6 changed files with 12 additions and 2 deletions

View File

@ -43,6 +43,7 @@ const App: React.FC = () => {
}).then(async (res) => { }).then(async (res) => {
if (res.code === 200) { if (res.code === 200) {
storage.setItem('user', JSON.stringify(res.data)) storage.setItem('user', JSON.stringify(res.data))
storage.setItem('userLogin', true)
toSrc('/home') toSrc('/home')
await startSignalr() await startSignalr()
} else { } else {
@ -199,6 +200,7 @@ const App: React.FC = () => {
switch (path) { switch (path) {
case '/login': case '/login':
storage.removeItem('user') storage.removeItem('user')
storage.setItem('userLogin', false)
navigate('/login') navigate('/login')
break; break;
case '/home': case '/home':
@ -229,6 +231,10 @@ const App: React.FC = () => {
if (Boolean(e.value)) { if (Boolean(e.value)) {
onEventSignalr() onEventSignalr()
} }
} else if (e.key === 'userLogin') {
if (!Boolean(e.value)) {
navigate('/login')
}
} }
}; };

View File

@ -84,6 +84,7 @@ const JoinSetting = forwardRef((_props: any, ref: any) => {
await PostRefresh(user.refresh_token).then(res => { await PostRefresh(user.refresh_token).then(res => {
if (res.code === 200) { if (res.code === 200) {
storage.setItem('user', JSON.stringify(res.data)) storage.setItem('user', JSON.stringify(res.data))
storage.setItem('userLogin', true)
callBack(res.data) callBack(res.data)
} }
}) })

View File

@ -83,6 +83,7 @@ const Index: React.FC = () => {
await PostRefresh(user.refresh_token).then(res => { await PostRefresh(user.refresh_token).then(res => {
if (res.code === 200) { if (res.code === 200) {
storage.setItem('user', JSON.stringify(res.data)) storage.setItem('user', JSON.stringify(res.data))
storage.setItem('userLogin', true)
callBack(res.data) callBack(res.data)
} }
}) })

View File

@ -139,8 +139,8 @@ const Home: React.FC = () => {
title="提示" title="提示"
description="确认退出吗?" description="确认退出吗?"
onConfirm={() => { onConfirm={() => {
navigate('/login')
storage.removeItem('user') storage.removeItem('user')
storage.setItem('userLogin', false)
}} }}
onCancel={() => { onCancel={() => {

View File

@ -140,6 +140,7 @@ const Login: React.FC = () => {
optionsValue: operation.optionsValue, optionsValue: operation.optionsValue,
})) }))
storage.setItem('user', JSON.stringify(res.data)) storage.setItem('user', JSON.stringify(res.data))
storage.setItem('userLogin', true)
try { try {
window.electron.setMainWindowSize({ window.electron.setMainWindowSize({
width: 1200, width: 1200,

View File

@ -113,7 +113,7 @@ class Request {
} }
function toLogin() { function toLogin() {
storage.removeItem('user') storage.removeItem('user')
location.href = location.origin + '/#/login' storage.setItem('userLogin', false)
} }
function updatePostRefresh() { function updatePostRefresh() {
let user = JSON.parse(storage.getItem('user') as string); let user = JSON.parse(storage.getItem('user') as string);
@ -121,6 +121,7 @@ function updatePostRefresh() {
PostRefresh(user.refresh_token).then((res) => { PostRefresh(user.refresh_token).then((res) => {
if (res.code == 200) { if (res.code == 200) {
storage.setItem('user', JSON.stringify(res.data)) storage.setItem('user', JSON.stringify(res.data))
storage.setItem('userLogin', true)
} else { } else {
toLogin() toLogin()
} }