Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/src/modules/tpm/NewFooter.js

@@ -19,8 +19,17 @@ class NewFooter extends Component {
     return (
       <div className="newFooter edu-txt-center ">
 				{/*newContainers*/}
+				{this.props.user&&this.props.user.main_site===false?<style>
+					{
+						`
+						.newFooter {
+								height: 50px;
+						}
+						`
+					}
+				</style>:""}
         <div className="inner-footer_con">
-          <div className="footercon">
+					{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">
@@ -37,7 +46,7 @@ class NewFooter extends Component {
               <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>:""}
           <div>
             {this.props.mygetHelmetapi === null ? "" :
 							this.props.mygetHelmetapi===undefined|| this.props.mygetHelmetapi.footer===null||this.props.mygetHelmetapi.footer===undefined?