From 879b5eb5fec29e98372348e105c9f0864e2bbefe Mon Sep 17 00:00:00 2001
From: Jasder <2053003901@@qq.com>
Date: Sat, 14 Mar 2020 16:25:11 +0800
Subject: [PATCH] =?UTF-8?q?FIX=20=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=8B=E6=8B=89=E6=97=A0=E6=95=88=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/forge/Main/Index.js      |  2 +-
 public/react/src/modules/tpm/NewFooter.js | 71 +++++++----------------
 2 files changed, 22 insertions(+), 51 deletions(-)

diff --git a/public/react/src/forge/Main/Index.js b/public/react/src/forge/Main/Index.js
index 6f9970745..fe5d065da 100644
--- a/public/react/src/forge/Main/Index.js
+++ b/public/react/src/forge/Main/Index.js
@@ -201,7 +201,7 @@ class Index extends Component{
       </div>:""
     )
     return(
-      <div style={{background:"#fafafa",height:"100vh"}}>
+      <div style={{background:"#fafafa"}}>
         <p className="t_project_banner"></p>
         <div className="main ProjectListIndex">
           <div className="list-left">
diff --git a/public/react/src/modules/tpm/NewFooter.js b/public/react/src/modules/tpm/NewFooter.js
index 9a69d522b..051bfadc7 100644
--- a/public/react/src/modules/tpm/NewFooter.js
+++ b/public/react/src/modules/tpm/NewFooter.js
@@ -4,20 +4,9 @@ import { Link } from 'react-router-dom';
 
 
 class NewFooter extends Component {
-  constructor(props) {
-    super(props)
-
-  }
-
-  componentWillReceiveProps(newProps, newContext) {
-
-  }
-
-
   render() {
     return (
       <div className="newFooter edu-txt-center ">
-
 				<style>
 					{
 						`
@@ -33,47 +22,29 @@ class NewFooter extends Component {
 					}
 				</style>
 
-				{/*newContainers*/}
         <div className="inner-footer_con">
-					{this.props.user&&this.props.user.main_site===true?<div className="footercon">
-            {/* <div className="inline mt40 mb5">
-              <a href="/" className="fl" style={{height:'70px'}}>
-                <img alt="高校智能化教学与实训平台" src={getImageUrl(`images/educoder/headNavLogo.png?1526520218`)} width="70px">
-                </img>
-              </a>
-              <span className="fl color-grey-c cdefault font-28 ml22" style={{lineHeight:'74px'}}>EduCoder.net</span>
-            </div> */}
-            <ul className="clearfix inner-footernav">
-              <li><a href="/" className="fl" target="_blank">网站首页</a></li>
-              <li><Link to="/help/about_us" className="fl" target="_blank">关于我们</Link></li>
-              <li><Link to="/help/contact_us" className="fl" target="_blank">联系我们</Link></li>
-              <li><Link to="/help/cooperatives" className="fl" target="_blank">合作伙伴</Link></li>
-              <li><Link to="/help/agreement" className="fl" target="_blank">服务协议</Link></li>
-              <li><Link to="/help/help_center" className="fl" target="_blank">帮助中心</Link></li>
-              <li><Link to="/help/feedback" className="fl" target="_blank">意见反馈</Link></li>
-            </ul>
-          </div>:""}
-          <div>
-            {this.props.mygetHelmetapi === null ? "" :
-							this.props.mygetHelmetapi===undefined|| this.props.mygetHelmetapi.footer===null||this.props.mygetHelmetapi.footer===undefined?
-								<p className="footer_con-p inline lineh-30  font-14">
-									<span className="font-18 fl">©</span>&nbsp;{moment().year()}&nbsp;EduCoder
-									<a style={{"color":"#888"}}  target="_blank" href="http://beian.miit.gov.cn/" className="ml15 mr15">湘ICP备17009477号</a>
-									<a style={{"color":"#888"}}  target="_blank" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=43019002000962"  className="mr15">
-										<img className="vertical4" src={require('./beian.png')}/>湘公网安备43019002000962号
-									</a>
-									<a href="https://team.trustie.net" style={{"color":"#888"}}
-										 target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside. <span
-									className="mr15">版权所有 湖南智擎科技有限公司</span>
-								</p>
-								:
-								<div dangerouslySetInnerHTML={{__html: this.props.mygetHelmetapi.footer}}></div>
-
-						}
-
-          </div>
-          <div className="cl"></div>
+          <ul className="clearfix inner-footernav">
+            <li><a href="/" className="fl" target="_blank">网站首页</a></li>
+            <li><Link to="/help/about_us" className="fl" target="_blank">关于我们</Link></li>
+            <li><Link to="/help/contact_us" className="fl" target="_blank">联系我们</Link></li>
+            <li><Link to="/help/cooperatives" className="fl" target="_blank">合作伙伴</Link></li>
+            <li><Link to="/help/agreement" className="fl" target="_blank">服务协议</Link></li>
+            <li><Link to="/help/help_center" className="fl" target="_blank">帮助中心</Link></li>
+            <li><Link to="/help/feedback" className="fl" target="_blank">意见反馈</Link></li>
+          </ul>
         </div>
+        <div>
+          <p className="footer_con-p inline lineh-30  font-14">
+            <span className="font-18 fl">©</span>&nbsp;{moment().year()}&nbsp;EduCoder
+            <a style={{"color":"#888"}}  target="_blank" href="http://beian.miit.gov.cn/" className="ml15 mr15">湘ICP备17009477号</a>
+            <a style={{"color":"#888"}}  target="_blank" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=43019002000962"  className="mr15">
+              <img className="vertical4" src={require('./beian.png')}/>湘公网安备43019002000962号
+            </a>
+            <a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside. <span
+            className="mr15">版权所有 湖南智擎科技有限公司</span>
+          </p>
+        </div>
+        <div className="cl"></div>
       </div>
     );
   }