Merge branches 'dev_Ysm' and 'dev_hjm_a' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm

# Conflicts:
#	public/react/public/css/iconfont.css
#	public/react/src/modules/user/usersInfo/InfosShixun.js

public/react/src/modules/paths/PathDetail/DetailTop.css

@@ -16,3 +16,19 @@
     border-radius: 4px;
     box-sizing: border-box;
 }
+.userNavs{
+    height: 54px;
+    line-height: 54px;
+    background: #fff;
+    -webkit-box-shadow: 0 9px 16px -1px #e6e6e6;
+    box-shadow: 0 9px 16px -1px #e6e6e6;
+    border-radius: 7px;
+    padding: 0 10px;
+}
+
+.userNav li {
+    display: inline-block;
+    padding: 0 30px;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+}

public/react/src/modules/paths/PathDetail/DetailTop.js

@@ -268,8 +268,21 @@ class DetailTop extends Component{
 							</div>
 
             </div>
+
+						<div className="userNavs">
+							<li className="active"><a href="/users/innov/courses">翻转课堂</a></li>
+							<li className=""><a href="/users/innov/shixuns">开发社区</a></li>
+							<li className=""><a href="/users/innov/paths">实践课程</a></li>
+							<li className=""><a href="/users/innov/projects">项目</a></li>
+							<li className=""><a href="/users/innov/package">众包</a></li>
+							<li className=""><a href="/users/innov/videoes">视频</a></li>
+						</div>
+
           </div>
         }
+
+
+
         
       </div>
     )

public/react/src/modules/paths/PathDetail/PathDetailIndex.js

@@ -369,7 +369,7 @@ class PathDetailIndex extends Component{
 			courses,
     } = this.state
 
-     console.log(this.props.checkIfLogin())
+
     return(
       <div className="newContainer">
 				<style>