merge

src/forge/Head/Footer.jsx

@@ -19,10 +19,11 @@ function Footer(){
 
   return(
     <div>
-      {value && showhtml(value)}
+      {/* {value && showhtml(value)} */}
-      {/* <div style={{height:"443px"}}></div>
+      <div style={{height:"483px"}}></div>
       <div className="newFooter edu-txt-center">
-        <div className="footEdition"> 
+      {value && showhtml(value)} 
+        {/* <div className="footEdition"> 
           <div className="footContent">
             <ul className="center">
               <img src={""} alt="Gitlink（确实开源）" height="29px"/>
@@ -57,9 +58,9 @@ function Footer(){
             </ul>
           </div>
           <p className="copyrightDesc">©Copyright 2007～2021 国防科技大学Gitlink团队 & IntelliDE <br/>湘ICP备 17009477号</p>
-        </div> 
         </div>  */}
       </div>
+    </div>
   )
 }
 export default Footer;

src/forge/Index.js

@@ -60,12 +60,6 @@ class Index extends Component {
               <ProjectNew {...this.props} {...props} />
             )}
           ></Route>
-          {/* <Route
-            path="/:owner/:projectsId"
-            render={(props) => (
-              <ProjectDetail {...this.props} {...props} />
-            )}
-          ></Route> */}
           <Route
             path="/explore"
             render={(props) => (
@@ -73,12 +67,12 @@ class Index extends Component {
             )}
           ></Route>
 
-          <Route
+          {/* <Route
             path="/"
             render={(props) => (
               <ProjectIndex {...this.props} {...props} />
             )}
-          ></Route>
+          ></Route> */}
         </Switch>
       </div>
     );
@@ -90,10 +84,3 @@ export default withRouter(
     parentSelector: ".newMain",
   })(CNotificationHOC()(SnackbarHOC()(TPMIndexHOC(Index))))
 );
-
-// export default withRouter(
-//   ImageLayerOfCommentHOC({
-//     imgSelector: ".imageLayerParent img, .imageLayerParent .imageTarget",
-//     parentSelector: ".newMain",
-//   })(Index)
-// );

src/modules/tpm/TPMIndexHOC.js

@@ -150,10 +150,15 @@ export function TPMIndexHOC(WrappedComponent) {
 		}
 		
 		fetchUsers = () => {
+			console.log(this.props.match)
 			if (this.props.match.path === "/") {
 				this.setState({
 					publicNav:false
 				})
+			}else{
+				this.setState({
+					publicNav:true
+				})
 			}
 			let url = `/users/get_user_info.json`;
 			axios.get(url).then((response) => {