From 42f545e68bc84aa0fea709c17f815607193c75aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com> Date: Fri, 24 Mar 2023 09:57:00 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=EF=BC=8C=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E4=B8=8D=E5=90=8C=E9=A1=B6=E9=83=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/init/index.tsx | 7 +++++-- src/pages/login/index.tsx | 3 +-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/pages/init/index.tsx b/src/pages/init/index.tsx index 91ab458..bb861b6 100644 --- a/src/pages/init/index.tsx +++ b/src/pages/init/index.tsx @@ -2,7 +2,8 @@ import { useDispatch } from "react-redux"; import { Outlet } from "react-router-dom"; import styles from "./index.module.scss"; import { saveConfigAction } from "../../store/system/systemConfigSlice"; -import { Header } from "../../compenents"; +import { Header, NoHeader } from "../../compenents"; +import { useLocation } from "react-router-dom"; interface Props { config: Map; @@ -11,11 +12,13 @@ interface Props { export const InitPage = (props: Props) => { const dispatch = useDispatch(); dispatch(saveConfigAction(props.config)); + const pathname = useLocation().pathname; return ( <>
-
+ {pathname === "/login" && } + {pathname !== "/login" &&
}
diff --git a/src/pages/login/index.tsx b/src/pages/login/index.tsx index e9c7fc0..07133c9 100644 --- a/src/pages/login/index.tsx +++ b/src/pages/login/index.tsx @@ -7,7 +7,7 @@ import { useNavigate } from "react-router-dom"; import { loginAction, logoutAction } from "../../store/user/loginUserSlice"; import { login, system, user } from "../../api/index"; import { setToken } from "../../utils/index"; -import { Footer, NoHeader } from "../../compenents"; +import { Footer } from "../../compenents"; const LoginPage: React.FC = () => { const dispatch = useDispatch(); @@ -89,7 +89,6 @@ const LoginPage: React.FC = () => { return (
-
学员登录