From fb98e0986aa41ae4a63f5c36acc60e1c99065e96 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 14:25:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E7=94=A8=E5=BA=95=E9=83=A8=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.scss                               |  2 +-
 src/compenents/footer/index.tsx            |  5 ++---
 src/compenents/index.ts                    |  3 ++-
 src/compenents/no-footer/index.module.scss |  0
 src/compenents/no-footer/index.tsx         | 21 +++++++++++++++++++++
 src/pages/index/index.module.scss          | 13 +++++++++++++
 src/pages/index/index.tsx                  |  1 +
 src/pages/init/index.tsx                   |  3 ++-
 src/pages/login/index.tsx                  |  4 ++--
 9 files changed, 44 insertions(+), 8 deletions(-)
 create mode 100644 src/compenents/no-footer/index.module.scss
 create mode 100644 src/compenents/no-footer/index.tsx

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 = () => {
     <Layout.Footer
       style={{
         width: "100%",
-        backgroundColor: "#ffffff",
-        height: 130,
+        backgroundColor: "#333333",
+        height: 90,
         textAlign: "center",
-        paddingBottom: 100,
       }}
     >
       <i
diff --git a/src/compenents/index.ts b/src/compenents/index.ts
index 1105655..ccd15c6 100644
--- a/src/compenents/index.ts
+++ b/src/compenents/index.ts
@@ -1,3 +1,4 @@
 export * from "./footer";
+export * from "./no-footer";
 export * from "./no-header";
-export * from "./header";
\ No newline at end of file
+export * from "./header";
diff --git a/src/compenents/no-footer/index.module.scss b/src/compenents/no-footer/index.module.scss
new file mode 100644
index 0000000..e69de29
diff --git a/src/compenents/no-footer/index.tsx b/src/compenents/no-footer/index.tsx
new file mode 100644
index 0000000..5950e83
--- /dev/null
+++ b/src/compenents/no-footer/index.tsx
@@ -0,0 +1,21 @@
+import React from "react";
+import { Layout } from "antd";
+
+export const NoFooter: React.FC = () => {
+  return (
+    <Layout.Footer
+      style={{
+        width: "100%",
+        backgroundColor: "#ffffff",
+        height: 130,
+        textAlign: "center",
+        paddingBottom: 100,
+      }}
+    >
+      <i
+        style={{ fontSize: 30, color: "#cccccc" }}
+        className="iconfont icon-waterprint"
+      ></i>
+    </Layout.Footer>
+  );
+};
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 = () => {
           ))}
         </div>
       )}
+      <div className={styles["extra"]}>~莫道桑榆晚，为霞尚满天~</div>
     </>
   );
 };
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" && <NoHeader></NoHeader>}
         {pathname !== "/login" && <Header></Header>}
         <Outlet />
+        {pathname !== "/login" && <Footer></Footer>}
       </div>
     </>
   );
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 = () => {
         </div>
       </div>
       <div className={styles["footer"]}>
-        <Footer></Footer>
+        <NoFooter></NoFooter>
       </div>
     </div>
   );