From 08031c0b39110be2b6b4e22f5af785e0fcb3f18b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Mon, 14 Oct 2019 16:37:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../react/src/modules/login/EducoderLogin.js  |   5 +-
 public/react/src/modules/tpm/NewFooter.js     |  25 ++-
 public/react/src/modules/tpm/NewHeader.js     | 191 +++++++++++++-----
 3 files changed, 153 insertions(+), 68 deletions(-)

diff --git a/public/react/src/modules/login/EducoderLogin.js b/public/react/src/modules/login/EducoderLogin.js
index a23b42ec6..c6045fb5c 100644
--- a/public/react/src/modules/login/EducoderLogin.js
+++ b/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)}/>
diff --git a/public/react/src/modules/tpm/NewFooter.js b/public/react/src/modules/tpm/NewFooter.js
index be1a1ed29..b258a001d 100644
--- a/public/react/src/modules/tpm/NewFooter.js
+++ b/public/react/src/modules/tpm/NewFooter.js
@@ -39,16 +39,23 @@ class NewFooter extends Component {
             </ul>
           </div>
           <div>
-							<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>
-								<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
+						{
+							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>
+									<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>
+								</p>
+								:
+								<div dangerouslySetInnerHTML={{__html: this.props.getHelmetapi.footer}}></div>
+
+						}
+
           </div>
           <div className="cl"></div>
         </div>
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 019726296..bc45f45fe 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/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,66 +727,149 @@ submittojoinclass=(value)=>{
 				<div className="educontents fl">
           {/*<%= link_to image_tag("/images/educoder/logo.png", alt:"高校智能化教学与实训平台", className:"logoimg"), home_path %>*/}
 
-          <div className="head-nav pr">
 
-            <ul id="header-nav">
-              {/*<li className={`${activeIndex === true ? 'active' : ''}`}><a href="/">首页</a></li>*/}
+            {
+              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?"":this.props.Headertop.shixun_paths_url}>实训路径</a></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="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>
-                      )
-                    })
-                    }
+                    <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="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>
+
+                    {/*<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>
                   </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>
-              </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>
-            </ul>
+            }
+
+
 
 
-          </div>
 				</div>
 
 				<style>