diff --git a/src/App.scss b/src/App.scss index db8071f..25a8670 100644 --- a/src/App.scss +++ b/src/App.scss @@ -1,7 +1,7 @@ #root { width: 100%; margin: 0 auto; - // text-align: center; + text-align: center; } .logo { diff --git a/src/compenents/footer/index.tsx b/src/compenents/footer/index.tsx index 9b82fee..44b1481 100644 --- a/src/compenents/footer/index.tsx +++ b/src/compenents/footer/index.tsx @@ -6,10 +6,9 @@ export const Footer: React.FC = () => { { + return ( + + + + ); +}; diff --git a/src/pages/index/index.module.scss b/src/pages/index/index.module.scss index 63bd03c..75e6da0 100644 --- a/src/pages/index/index.module.scss +++ b/src/pages/index/index.module.scss @@ -74,3 +74,16 @@ grid-template-columns: repeat(3, minmax(0, 1fr)); position: relative; } + +.extra { + width: 1200px; + margin: 0 auto; + margin-top: 80px; + margin-bottom: 80px; + text-align: center; + height: 40px; + font-size: 16px; + font-weight: 400; + color: rgba(0, 0, 0, 0.2); + line-height: 40px; +} diff --git a/src/pages/index/index.tsx b/src/pages/index/index.tsx index 7319e1d..34c14b1 100644 --- a/src/pages/index/index.tsx +++ b/src/pages/index/index.tsx @@ -206,6 +206,7 @@ const IndexPage = () => { ))} )} +
~莫道桑榆晚,为霞尚满天~
); }; diff --git a/src/pages/init/index.tsx b/src/pages/init/index.tsx index bb861b6..e00ac95 100644 --- a/src/pages/init/index.tsx +++ b/src/pages/init/index.tsx @@ -2,7 +2,7 @@ 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, NoHeader } from "../../compenents"; +import { Header, NoHeader, Footer } from "../../compenents"; import { useLocation } from "react-router-dom"; interface Props { @@ -20,6 +20,7 @@ export const InitPage = (props: Props) => { {pathname === "/login" && } {pathname !== "/login" &&
} + {pathname !== "/login" &&
} ); diff --git a/src/pages/login/index.tsx b/src/pages/login/index.tsx index 07133c9..5a0d134 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 } from "../../compenents"; +import { NoFooter } from "../../compenents"; const LoginPage: React.FC = () => { const dispatch = useDispatch(); @@ -156,7 +156,7 @@ const LoginPage: React.FC = () => {
-
+
);