Merge remote-tracking branch 'origin/dev_cs' into dev_cs

# Conflicts:
#	public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
#	public/react/src/modules/paths/PathDetail/DetailTop.js

app/views/users/_user.json.jbuilder

@@ -4,5 +4,5 @@ json.name user.full_name
 json.grade user.grade
 json.identity user&.user_extension&.identity
 # json.email user.mail # 邮箱原则上不暴露的，如果实在需要的话只能对某些具体的接口公开
-json.image_url url_to_avatar(user)
+json.image_url image_tag(url_to_avatar(user))
 json.school user.school_name

app/views/users/homepage_info.json.jbuilder

@@ -1,6 +1,6 @@
 json.id @user.id
 json.name @user.full_name
-json.avatar_url url_to_avatar(@user)
+json.avatar_url image_tag("/" + url_to_avatar(@user))
 json.is_logged_user @user.logged_user?
 json.experience @user.experience
 json.grade @user.grade

public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js

@@ -1700,7 +1700,7 @@ class Trainingjobsetting extends Component {
                     whethertopays=false;
                 }
                 if(this.state.jobsettingsdata!==undefined){
-                    
+
                 }
 
                 try {

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

@@ -372,7 +372,7 @@ class DetailTop extends Component{
 
 		return(
 
-			<div className={this.props.courses===undefined?"subhead":this.props.courses.length===0?applypath===true?"subhead mb100":"subhead":applypath===false?detailInfoList.name.length>40?"subhead mb100":"subhead mb70":this.state.MenuItemskey===this.props.courses.length?"subhead mb120":detailInfoList.name.length>40?"subhead mb100":"subhead mb80"}>
+			<div className={this.props.courses===undefined||this.props.courses.length===0?"subhead":applypath===false?"subhead mb70":this.state.MenuItemskey===this.props.courses.length?"subhead mb100":"subhead mb70"}>
 				{AccountProfiletype===true?<AccountProfile
 					hideAccountProfile={()=>this.hideAccountProfile()}
 					{...this.props}