Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/public/css/edu-all.css

@@ -6,7 +6,7 @@
     float: left;
     width: 97px;}
 .head-nav{float: left;width: 780px;text-align: center;height: 60px;box-sizing: border-box;  min-width: 400px;}
-.head-nav ul#header-nav{position: absolute;top: 0px;z-index: 3;height: 60px;box-sizing: border-box;padding-left: 30px;}
+.head-nav ul#header-nav{position: absolute;top: 0px;z-index: 3;height: 60px;box-sizing: border-box;}
 .head-nav ul#header-nav li{float: left;height: 60px;line-height: 60px;margin-right: 30px;cursor: pointer;position: relative;font-size: 16px}
 .head-nav ul#header-nav li a{display: block;height: 100%;width: 100%;color: #fff}
 .head-nav ul#header-nav li a:hover{color: #cccccc;}

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

@@ -649,20 +649,21 @@ submittojoinclass=(value)=>{
 					{...this.state}
 					{...this.props}
 				/>:""}
-
+				<a href="/" className={" fl"}>
-				<div className="educontent clearfix">
+					<img alt="高校智能化教学与实训平台" className="logoimg" src={getImageUrl("images/educoder/headNavLogo.png?1526520218")}></img>
+				</a>
+				<div className="educontent">
           {/*<%= link_to image_tag("/images/educoder/logo.png", alt:"高校智能化教学与实训平台", className:"logoimg"), home_path %>*/}
-          <a href="/">
+
-            <img alt="高校智能化教学与实训平台" className="logoimg" src={getImageUrl("images/educoder/headNavLogo.png?1526520218")}></img>
-          </a>
           <div className="head-nav pr">
 
             <ul id="header-nav">
-              {/*<li className={`${activeIndex === true ? 'active' : ''}`}><a href="/">首页</a></li>*/}
+              <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'}`}>
-                <a href={this.props.Headertop===undefined?"":'/paths'}>实践课程</a></li>
+                <a href={this.props.Headertop===undefined?"":'/paths'}>实践课程</a>
+              </li>
 
               {/*<li><a href={this.props.Headertop===undefined?"":'/courses'}>课堂</a></li>*/}
               <li className={`${coursestype === true ? 'pr active' : 'pr'}`}>

public/stylesheets/educoder/edu-all.css

@@ -6,7 +6,7 @@
     float: left;
     width: 97px;}
 .head-nav{float: left;width: 780px;text-align: center;height: 60px;box-sizing: border-box;  min-width: 400px;}
-.head-nav ul#header-nav{position: absolute;top: 0px;z-index: 3;height: 60px;box-sizing: border-box;padding-left: 30px;}
+.head-nav ul#header-nav{position: absolute;top: 0px;z-index: 3;height: 60px;box-sizing: border-box;}
 .head-nav ul#header-nav li{float: left;height: 60px;line-height: 60px;margin-right: 30px;cursor: pointer;position: relative;font-size: 16px}
 .head-nav ul#header-nav li a{display: block;height: 100%;width: 100%;color: #fff}
 .head-nav ul#header-nav li a:hover{color: #cccccc;}