调整

public/react/src/modules/login/EducoderLogin.js

@@ -154,10 +154,7 @@ class EducoderLogin extends Component {
                     }}>
                         <div style={{cursor:"pointer"}}>
                             {
-                                this.props.getHelmetapi===undefined?
-                                  <img style={{cursor:"pointer"}} onClick={()=>this.gohome()} src={educodernet}/>
-                                  :
-                                  this.props.getHelmetapi.login_logo_url===undefined?
+                                this.props.getHelmetapi===undefined||this.props.getHelmetapi.login_logo_url===null|| this.props.getHelmetapi.login_logo_url===undefined?
                                   <img style={{cursor:"pointer"}} onClick={()=>this.gohome()} src={educodernet}/>
                                   :
                                   <img style={{cursor:"pointer"}} onClick={()=>this.gohome()} src={getImageUrl(this.props.getHelmetapi.login_logo_url)}/>

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

@@ -39,6 +39,8 @@ class NewFooter extends Component {
             </ul>
           </div>
           <div>
+						{
+							this.props.getHelmetapi===undefined|| this.props.getHelmetapi.footer===null||this.props.getHelmetapi.footer===undefined?
 								<p className="footer_con-p inline lineh-30  font-14">
 									<span className="font-18 fl">©</span>&nbsp;2019&nbsp;EduCoder
 									<a style={{"color":"#888"}}  target="_blank" href="http://beian.miit.gov.cn/" className="ml15 mr15">湘ICP备17009477号</a>
@@ -49,6 +51,11 @@ class NewFooter extends Component {
 										 target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside. <span
 									className="mr15">版权所有 湖南智擎科技有限公司</span>
 								</p>
+								:
+								<div dangerouslySetInnerHTML={{__html: this.props.getHelmetapi.footer}}></div>
+
+						}
+
           </div>
           <div className="cl"></div>
         </div>

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

@@ -706,9 +706,7 @@ submittojoinclass=(value)=>{
 				/>:""}
 				<Link to="/" className={"fl mr30 ml25 mt10"}>
           {
-            this.props.getHelmetapi===undefined?
-              <img alt="高校智能化教学与实训平台" className="logoimg" src={getImageUrl("images/educoder/headNavLogo.png?1526520218")}></img>
-              :this.props.getHelmetapi.nav_logo_url===undefined?
+            this.props.getHelmetapi===undefined||this.props.getHelmetapi.nav_logo_url===null||this.props.getHelmetapi.nav_logo_url===undefined?
               <img alt="高校智能化教学与实训平台" className="logoimg" src={getImageUrl("images/educoder/headNavLogo.png?1526520218")}></img>
               :
               <img alt="高校智能化教学与实训平台" className="logoimg" src={getImageUrl(this.props.getHelmetapi.nav_logo_url)}></img>
@@ -729,19 +727,26 @@ submittojoinclass=(value)=>{
 				<div className="educontents fl">
           {/*<%= link_to image_tag("/images/educoder/logo.png", alt:"高校智能化教学与实训平台", className:"logoimg"), home_path %>*/}
 
-          <div className="head-nav pr">
 
+            {
+              this.props.getHelmetapi===undefined||this.props.getHelmetapi.navbar===null||this.props.getHelmetapi.navbar===undefined||this.props.getHelmetapi.navbar.length===0?
+               <div className="head-nav pr">
                 <ul id="header-nav">
                     {/*<li className={`${activeIndex === true ? 'active' : ''}`}><a href="/">首页</a></li>*/}
 
                     {/*<li><a href={this.props.Headertop===undefined?"":this.props.Headertop.shixun_paths_url}>实训路径</a></li>*/}
+
+
                     <li className={`${activePaths === true ? 'pr active' : 'pr'}`}>
                       <Link to={this.props.Headertop===undefined?"":'/paths'}>实践课程</Link>
                     </li>
 
                     {/*<li><a href={this.props.Headertop===undefined?"":'/courses'}>课堂</a></li>*/}
+
                     <li className={`${coursestype === true ? 'pr active' : 'pr'}`}>
+
                       {/*<a href={this.props.Headertop===undefined?"":this.props.Headertop.course_url}>课堂</a>*/}
+
                       <Link to={this.props.Headertop===undefined?"":'/courses'}>翻转课堂</Link>
                     </li>
 
@@ -786,9 +791,85 @@ submittojoinclass=(value)=>{
                       style={{display: this.props.Headertop === undefined ? 'none'  : this.props.Headertop.auth===null? 'none' : 'block'}}
                     ><a href={this.props.Headertop===undefined?"":this.props.Headertop.auth}>工程认证</a></li>
                   </ul>
+               </div>
+                :
+                <div className="head-nav pr">
+                <ul id="header-nav">
+                  {/*<li className={`${activeIndex === true ? 'active' : ''}`}><a href="/">首页</a></li>*/}
+
+                  {/*<li><a href={this.props.Headertop===undefined?"":this.props.Headertop.shixun_paths_url}>实训路径</a></li>*/}
+
+                  {/*{*/}
+                  {/*  this.props.getHelmetapi.navbar && this.props.getHelmetapi.navbar.map((item,key)=>{*/}
+
+                  {/*    return(*/}
+
+                  {/*    )*/}
+                  {/*  })*/}
+                  {/*}*/}
+                  <li className={`${activePaths === true ? 'pr active' : 'pr'}`}>
+                    <Link to={this.props.Headertop===undefined?"":'/paths'}>实践课程</Link>
+                  </li>
+
+                  {/*<li><a href={this.props.Headertop===undefined?"":'/courses'}>课堂</a></li>*/}
+
+                  <li className={`${coursestype === true ? 'pr active' : 'pr'}`}>
+
+                    {/*<a href={this.props.Headertop===undefined?"":this.props.Headertop.course_url}>课堂</a>*/}
 
+                    <Link to={this.props.Headertop===undefined?"":'/courses'}>翻转课堂</Link>
+                  </li>
 
+                  <li className={`${activeShixuns === true ? 'pr active' : 'pr'}`}>
+                    <Link to="/shixuns">实训项目</Link>
+                    <img src={getImageUrl("images/educoder/hot-h.png")} className="nav-img">
+                    </img>
+                  </li>
+                  {/*<li className=""><a href={"/libraries"}>教学案例</a></li>*/}
+                  <li className="">
+                    <a href={this.props.Headertop===undefined?"":this.props.Headertop.competitions_url}>在线竞赛</a>
+                    <img className="roundedRectangles"
+                         src={require('./roundedRectangle.png')}
+                    />
+                  </li>
+                  <li className={`${activeMoopCases === true ? 'pr active' : 'pr'}`}> <Link to={`/moop_cases`}>教学案例</Link></li>
+                  {/*<li className={`${activePackages === true ? 'pr active' : 'pr'}`}>*/}
+                  {/*<Link to={'/crowdsourcing'}>众包创新</Link>*/}
+                  {/*</li>*/}
+                  <li className={`${activeForums === true ? 'active' : ''}`}>	<Link to={this.props.Headertop===undefined?"":this.props.Headertop.topic_url}>交流问答</Link></li>
+                  <li
+                    style={{display: this.props.Headertop === undefined ? 'none'  : this.props.Headertop.auth===null? 'none' : 'block'}}
+                  ><a href={this.props.Headertop===undefined?"":this.props.Headertop.auth}>工程认证</a></li>
+
+
+
+
+                  <li className="fl edu-menu-panel  careershover "
+                      style={{display: this.props.Headertop === undefined ?'none'  : this.props.Headertop.career_url.length > 0 ? 'block' : 'none'}}>
+                    <a>职业路径</a>
+                    <div
+                      style={{display: this.props.Headertop === undefined ?'none'  : this.props.Headertop.career_url.length > 0 ? 'block' : 'none'}}>
+                      <ul className="edu-menu-list edu-menu-listnew " style={{top:'60px'}}>
+                        {this.props.Headertop === undefined ? "" : this.props.Headertop.career_url.map((item, key) => {
+                          return(
+                            <li key={key}><i className="iconfont icon-java left careersiconfont"
+                                             style={{color: '#000 important'}}
+                            ></i><a style={{width: '83%'}}
+                                    href={item.url}>{item.name}</a></li>
+                          )
+                        })
+                        }
+                      </ul>
                     </div>
+                  </li>
+
+                </ul>
+                </div>
+            }
+
+
+
+
 				</div>
 
 				<style>