From 2736bbbe6188dd66e236956a021ae13027117de8 Mon Sep 17 00:00:00 2001 From: chenglb Date: Mon, 30 Oct 2023 04:02:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=80=80=E5=87=BA=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E5=87=BA=E9=94=99=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/layout/Header/index.jsx | 8 ++++---- src/components/layout/SideBar/index.jsx | 5 +++++ src/config/ajax.js | 8 ++++---- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/components/layout/Header/index.jsx b/src/components/layout/Header/index.jsx index 51843ab..a60770b 100644 --- a/src/components/layout/Header/index.jsx +++ b/src/components/layout/Header/index.jsx @@ -77,8 +77,8 @@ export default function Header(props) { dispatch(setTabList([])) setSessionTabList([]) // message.success('退出登录') - // window.location = sysConfig.logout_url - window.location = '/#/login' + window.location = sysConfig.logout_url + // window.location = '/#/login' }else{ message.error(res.message) } @@ -189,8 +189,8 @@ export default function Header(props) { ajax.logout(params).then().then(res=>{ if(res.status == 20000){ removeToken() - // window.location = sysConfig.logout_url - window.location = '/#/login' + window.location = sysConfig.logout_url + // window.location = '/#/login' }else{ message.error(res.message) } diff --git a/src/components/layout/SideBar/index.jsx b/src/components/layout/SideBar/index.jsx index 380c8ce..875f494 100644 --- a/src/components/layout/SideBar/index.jsx +++ b/src/components/layout/SideBar/index.jsx @@ -59,6 +59,7 @@ export default function SideBar() { }, [location]); useEffect(() => { + let path = location.pathname if (collapsed) { return @@ -74,6 +75,10 @@ export default function SideBar() { } }, [flatMenus]); + useEffect(()=>{ + console.log(openKey) + }, []) + /** * @description 解析菜单栏数据 * @param {Array} data 原始菜单栏数据 diff --git a/src/config/ajax.js b/src/config/ajax.js index c71f890..f281898 100644 --- a/src/config/ajax.js +++ b/src/config/ajax.js @@ -55,8 +55,8 @@ function ajax(ajaxData = {}) { .then(res => { if (res.data.status === 30009 || res.data.status === 40006 || res.data.status === 40005 ) { removeToken() - // window.location.replace(sysConfig.logout_url) - window.location.replace("/#/login") + window.location.replace(sysConfig.logout_url) + // window.location.replace("/#/login") message.error(res.data.message) reject(res) } else { @@ -69,8 +69,8 @@ function ajax(ajaxData = {}) { switch (response.status) { case 401: removeToken() - // window.location.replace(sysConfig.logout_url) - window.location.replace("/#/login") + window.location.replace(sysConfig.logout_url) + // window.location.replace("/#/login") message.error('登录失效') break case 500: