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

public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js

@@ -537,7 +537,7 @@ class GraduationTaskssettingapp extends Component{
     if(moment(end_time)<=moment(publish_time)){
       this.setState({
         endTimetypes:true,
-        endTimetypesval:"截止时间不能早于发布时间"
+        endTimetypesval:"截止时间必须晚于发布时间"
       })
       return
     }else{
@@ -549,13 +549,13 @@ class GraduationTaskssettingapp extends Component{
     if(moment(latetime)<=moment(publish_time)){
       this.setState({
         latetimetype:true,
-        latetimetypeval:"结束时间不能早于发布时间"
+        latetimetypeval:"结束时间必须晚于发布时间"
       })
       return
     }else if(moment(latetime)<=moment(end_time)){
       this.setState({
         latetimetype:true,
-        latetimetypeval:"结束时间不能早于截止时间"
+        latetimetypeval:"结束时间必须晚于截止时间"
       })
       return
     }else{

public/react/src/modules/courses/graduation/tasks/index.js

@@ -88,7 +88,7 @@ class GraduationTasks extends Component{
 
   savedelete=()=>{
     this.setState({
-      Modalstype:false,
+			Modalstype:false,
     })
     let {checkAllValue,checkBoxValues,search,page,order} = this.state;
     // let all_check;
@@ -107,9 +107,10 @@ class GraduationTasks extends Component{
         if (response.data.status == 0) {
           // {"status":1,"message":"删除成功"}
           this.fetchAll(search,page,order)
+					this.props.showNotification(response.data.message);
           this.setState({
-            Modalstype:true,
-            Modalstopval:response.data.message,
+            // Modalstype:true,
+            // Modalstopval:response.data.message,
             ModalsBottomval:"",
             ModalSave:this.cancelmodel,
             Loadtype:true,

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?"subhead mb100":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?"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"}>
 				{AccountProfiletype===true?<AccountProfile
 					hideAccountProfile={()=>this.hideAccountProfile()}
 					{...this.props}

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

@@ -621,7 +621,10 @@ class PathDetailIndex extends Component{
 																{/*}*/}
 															</p>
 															<div className="clearfix">
-																<p className="color-grey-9 font-12 fl"><span className="mr10">{item.school}</span><span>{item.identity}</span></p>
+																<p className="color-grey-9 font-12 fl">
+																	<span className="mr10">{item.school}</span>
+																	{/*<span>{item.identity}</span>*/}
+																</p>
 															</div>
 														</div>
 													</div>
@@ -645,7 +648,9 @@ class PathDetailIndex extends Component{
 																	}
 																</p>
 																<div className="clearfix">
-																	<p className="color-grey-9 font-12 fl"><span className="mr10">{item.school}</span><span>{item.identity}</span></p>
+																	<p className="color-grey-9 font-12 fl"><span className="mr10">{item.school}</span>
+																		{/*<span>{item.identity}</span>*/}
+																	</p>
 																</div>
 																{
 																	detailInfoList===undefined?"":detailInfoList.allow_add_member===true? <div>
@@ -674,7 +679,9 @@ class PathDetailIndex extends Component{
 																{/*}*/}
 															</p>
 															<div className="clearfix">
-																<p className="color-grey-9 font-12 fl"><span className="mr10">{item.school}</span><span>{item.identity}</span></p>
+																<p className="color-grey-9 font-12 fl"><span className="mr10">{item.school}</span>
+																	{/*<span>{item.identity}</span>*/}
+																</p>
 															</div>
 														</div>
 													</div>

public/react/src/modules/user/usersInfo/InfosBanner.js

@@ -43,10 +43,10 @@ class InfosBanner extends Component{
             <div className="fl">
               <p className="clearfix mt20">
                 <span className="username task-hide" style={{"maxWidth":'370px'}}>{data && data.name}</span>
-                {
-                  data && is_current == false && data.identity =="学生" ? "" : 
-                  <span className="userpost"><label>{data && data.identity}</label></span>
-                }
+                {/*{*/}
+                  {/*data && is_current == false && data.identity =="学生" ? "" : */}
+                  {/*<span className="userpost"><label>{data && data.identity}</label></span>*/}
+                {/*}*/}
               </p>
               <p className="mt15">
                 <Tooltip placement='bottom' title={ data && data.professional_certification ?"已职业认证":"未职业认证"}>