头部,底部样式和gitlink统一

public/css/edu-purge.css

@@ -3947,7 +3947,7 @@ html>body #ajax-indicator {
 
 .head-nav {
   text-align: center;
-  height: 70px;
+  height: 58px;
   box-sizing: border-box;
   min-width: 780px;
   overflow: hidden;
@@ -3960,14 +3960,14 @@ html>body #ajax-indicator {
   position: absolute;
   top: 0px;
   z-index: 3;
-  height: 70px;
+  height: 100%;
   box-sizing: border-box;
 }
 
 .head-nav ul#header-nav li {
   float: left;
-  height: 70px;
-  line-height: 70px;
+  height: 58px;
+  line-height: 58px;  
   cursor: pointer;
   position: relative;
   font-size: 16px;
@@ -3978,7 +3978,7 @@ html>body #ajax-indicator {
   display: block;
   height: 100%;
   width: 100%;
-  color: #333;
+  color: #fff;
   font-size: 16px;
 }
 
@@ -6705,4 +6705,76 @@ ul.count_ul li:not(:last-child):after {
 }
 input.ant-input-lg::placeholder{
 font-size: 14px !important;
+}
+
+.newFooter {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  background: #323232;
+  clear: both;
+  min-width: 1200px;
+  z-index: 8;
+  left: 0;
+}
+.footEdition {
+  background-color: #171b23;
+}
+.footEdition .footContent {
+  display: flex;
+  align-items: flex-start;
+  padding: 86px 0;
+  justify-content: space-around;
+  width: 1200px;
+  margin: 0 auto;
+}
+.footEdition .footContent ul {
+  min-width: 120px;
+  text-align: left;
+  margin-right: 80px
+}
+.footEdition .footContent ul.center {
+  text-align: center;
+}
+.footEdition .footContent ul>img {
+  width: 100px;
+  height: 100%;
+  margin-bottom: 30px;
+  margin-top: 25px;
+  border-radius: 10px;
+}
+.footEdition .footContent ul li {
+  height: 20px;
+  font-size: 14px;
+  font-weight: 400;
+  line-height: 20px;
+  color: #bdc2d1;
+  margin-bottom: 15px!important;
+}
+.footEdition .footContent ul li.thehead {
+  height: 25px;
+  font-size: 18px;
+  font-weight: 600;
+  color: #fff;
+  line-height: 25px;
+  margin-bottom: 20px!important;
+}
+.footEdition .footContent ul li a {
+  color: #bdc2d1!important;
+}
+.copyrightDesc {
+  font-size: 12px;
+  font-weight: 400;
+  color: #bdc2d1;
+  line-height: 28px;
+  padding: 15px 0;
+  text-align: center;
+  background-color: #1b212c;
+}
+.newFooter p {
+  margin-top: 0;
+  margin-bottom: 0!important;
+}
+.copyrightDesc a {
+  color: #bdc2d1!important;
 }

src/AppConfig.js

@@ -59,7 +59,7 @@ export function initAxiosInterceptors(props) {
   // TODO 避免重复的请求 https://github.com/axios/axios#cancellation
   var
     proxy = "http://localhost:3000"
-    proxy = "https://forum.trustie.net"
+    proxy = "https://testforum.trustie.net"
 
   const requestMap = {};
   window.setfalseInRequestMap = function (keyName) {

src/Nav/Footer.jsx

@@ -19,8 +19,6 @@ function Footer(){
 
   return(
     <div>
-      <div style={{height:"483px"}}></div>
-      <div className="newFooter edu-txt-center">
         {value && showhtml(value)}
         {/* <div className="footerInfos">
           <ul>
@@ -59,8 +57,7 @@ function Footer(){
           </ul>
         </div>
         <p className="footerCopy">© Copyright 2007~2021 国防科技大学Trustie团队 & IntelliDE <a href="https://beian.miit.gov.cn">湘ICP备 17009477号</a></p> */}
-      </div>
-    </div>
+        </div>
   )
 }
 export default Footer;

src/modules/tpm/NewHeader.js

@@ -576,7 +576,10 @@ class NewHeader extends Component {
     const { match } = this.props;
     if(url){
       if (url.indexOf('forums') > -1 && match.path.indexOf('forums') > -1) {
-        return true
+        let splitStr = url.split('/forums');
+        if(!splitStr[1]){
+          return true
+        }
       } else if (url.indexOf('projects') > -1 && match.path.indexOf('projects') > -1) {
         return true
       } else if (url.indexOf('users') > -1 && match.path.indexOf('users') > -1) {
@@ -754,7 +757,7 @@ class NewHeader extends Component {
           <div className="head-right">
             {this.props.user && this.props.user.login &&
               <div className="edu-menu-panel">
-                <i className="iconfont icon-tianjiafangda color-grey-6"></i>
+                <i className="iconfont icon-tianjiafangda color-white"></i>
                 <div className="edu-menu-list" style={{ top: '48px' }}>
                   <div className="overPart"></div>
                   {
@@ -772,7 +775,7 @@ class NewHeader extends Component {
               <div className="ml30 edu-menu-panel">
                 {user && user.login &&
                   <a href={`${mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.tiding_url}`} style={{ position: 'relative' }} target="_blank">
-                    <i className="iconfont icon-xiaoxilingdang color-grey-6"></i>
+                    <i className="iconfont icon-xiaoxilingdang color-white"></i>
                     <span className="newslight" style={{ display: this.props.Headertop === undefined ? "none" : this.props.Headertop.new_message === true ? "block" : "none" }}>
                     </span>
                   </a>
@@ -808,18 +811,18 @@ class NewHeader extends Component {
           </div>
           {user === undefined ?
             <span className="font-15">
-              <a onClick={() => this.educoderlogin()} className="mr5 color-grey-6">登录</a>
+              <a onClick={() => this.educoderlogin()} className="mr5 color-white">登录</a>
               {
                 mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.register_url &&
-                <span><em className="vertical-line"></em><a className="ml5 color-grey-6" href={`${mygetHelmetapi2.new_course.register_url}`} target="_blank">注册</a></span>
+                <span><em className="vertical-line"></em><a className="ml5 color-white" href={`${mygetHelmetapi2.new_course.register_url}`} target="_blank">注册</a></span>
               }
             </span>
             : user.login === "" ?
             <span className="font-15">
-              <a onClick={() => this.educoderlogin()} className="mr5 color-grey-6">登录</a>
+              <a onClick={() => this.educoderlogin()} className="mr5 color-white">登录</a>
               {
                 mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.register_url &&
-                <span><em className="vertical-line"></em><a className="color-grey-6 ml5" href={`${mygetHelmetapi2.new_course.register_url}`} target="_blank">注册</a></span>
+                <span><em className="vertical-line"></em><a className="color-white ml5" href={`${mygetHelmetapi2.new_course.register_url}`} target="_blank">注册</a></span>
               }
             </span>
             :

src/modules/tpm/TPMIndex.css

@@ -27,15 +27,16 @@ body>.-task-title {
 .newHeaders{
   max-width: unset;
   width: 100%;
-  height:70px;
+  height:58px;
   min-width: 1200px;
   z-index: 10000;
-  background:rgba(255,255,255,1);
+  background:#1b2440;
   position: fixed;
 }
 .headerContent{
-  width:1200px;
+  width:100%;
   margin:0px auto;
+  padding:0px 30px;
   display: flex;
   align-items: center;
   height: 100%;