From 982536b547d71951eff0a2f19b8d4e3c754f807a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Tue, 23 Nov 2021 17:30:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E4=BA=8E=E6=88=91=E4=BB=AC0.1?=
 =?UTF-8?q?=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.js                     | 12 +++++++++++-
 src/forge/AboutUs/AboutUs.jsx  | 22 ++++++++++++++++++++++
 src/forge/AboutUs/AboutUs.scss | 12 ++++++++++++
 src/forge/Head/Header.js       |  5 ++++-
 4 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 src/forge/AboutUs/AboutUs.jsx
 create mode 100644 src/forge/AboutUs/AboutUs.scss

diff --git a/src/App.js b/src/App.js
index 3072aca5..72116917 100644
--- a/src/App.js
+++ b/src/App.js
@@ -97,13 +97,18 @@ const ProjectIndex = Loadable({
 	loading: Loading,
 });
 
+const AboutUs = Loadable({
+	loader: () => import("./forge/AboutUs/AboutUs"),
+	loading: Loading,
+})
+
 // const CreateMerge = Loadable({
 //   loader: () => import('./forge/Merge/NewMerge'),
 //   loading: Loading,
 // })
 
 // 此处仅维护前端可能的一级路由，不用进行项目或者组织判断的字段。
-const keyWord = ["explore", "settings", "setting", "mulan", "wiki", "issues", "setting", "trending", "code", "projects", "pulls", "mine", "login", "register", "email", "export", "nopage", "404", "403", "500", "501", "search", "organize"];
+const keyWord = ["explore", "settings", "setting", "mulan", "wiki", "issues", "setting", "trending", "code", "projects", "pulls", "mine", "login", "register", "email", "export", "nopage", "404", "403", "500", "501", "search", "organize", "aboutus"];
 
 class App extends Component {
 	constructor(props) {
@@ -330,6 +335,11 @@ class App extends Component {
 								}
 							/>
 
+							{/* 关于我们 */}
+							<Route
+								path = "/aboutus"
+								render = {(props)=><AboutUs {...this.props} {...props}/>}
+							></Route>
 
 							{/* 组织 */}
 							<Route path={"/organize"}
diff --git a/src/forge/AboutUs/AboutUs.jsx b/src/forge/AboutUs/AboutUs.jsx
new file mode 100644
index 00000000..ea0db4f8
--- /dev/null
+++ b/src/forge/AboutUs/AboutUs.jsx
@@ -0,0 +1,22 @@
+import React , { useEffect , useState } from 'react';
+import {TPMIndexHOC} from '../../modules/tpm/TPMIndexHOC';
+import './AboutUs.scss';
+
+function AboutUs(){
+  return(
+    <div className="aboutUs">
+      <div className="aboutUs_head">
+
+      </div>
+      <div className="aboutUs_title">
+        <table><tr>
+          <td>关于我们</td>
+          <td>平台统计</td>
+          <td>加入我们</td>
+          <td>合作单位</td>
+        </tr></table>
+      </div>
+    </div>  
+  )
+}
+export default TPMIndexHOC(AboutUs);
\ No newline at end of file
diff --git a/src/forge/AboutUs/AboutUs.scss b/src/forge/AboutUs/AboutUs.scss
new file mode 100644
index 00000000..f7c284a3
--- /dev/null
+++ b/src/forge/AboutUs/AboutUs.scss
@@ -0,0 +1,12 @@
+.aboutUs{
+  // width: 1200px;
+}
+.aboutUs_head{
+  min-height: 560px;
+  background-color: beige;
+}
+.aboutUs_title{
+  height: 62px;
+  background: #FFFFFF;
+  box-shadow: 0px 2px 7px 2px rgba(7,26,70,0.12);
+}
\ No newline at end of file
diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js
index ac139351..acfdfe59 100644
--- a/src/forge/Head/Header.js
+++ b/src/forge/Head/Header.js
@@ -414,7 +414,10 @@ class NewHeader extends Component {
                     if (user_login && (new_link && new_link.indexOf("homes") > -1)) {
                       new_link = new_link.replace(/homes/g, user_login + "/user_activities")
                     }
-                    
+                    //【关于我们】页面
+                    if(item.name === "关于我们"){
+                      new_link = `/aboutus`;
+                    }
                     var waiLian = (new_link && str.filter(item=>new_link.indexOf(item)>-1) );
                     var wl = waiLian && waiLian.length>0;
                     return (