diff --git a/src/App.js b/src/App.js index 3072aca5b..721169179 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 { } /> + {/* 关于我们 */} + } + > {/* 组织 */} +
+ +
+
+ + + + + +
关于我们平台统计加入我们合作单位
+
+ + ) +} +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 000000000..f7c284a37 --- /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 ac139351e..acfdfe59a 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 (