Merge branches 'dev_Ysl' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl

# Conflicts:
#	public/react/src/modules/message/js/MessagChat.js
#	public/react/src/modules/message/js/Messagerouting.js

public/react/src/modules/message/css/messagemy.css

@@ -20,6 +20,10 @@
 .ant-modal-header{
     border-radius: 0px !important;
 }
+.ridinglist-subs{
+    border-bottom: 1px solid #F5F5F5;
+    padding: 25px 0px;
+}
 .search-new{
     width: 100% !important;
  margin-bottom: 0px !important;

public/react/src/modules/message/js/MessagSub.js

@@ -167,9 +167,9 @@ class MessagSub extends Component{
 							 return    window.open("/managements/subject_authorization")
 						 }
 						 if(item.tiding_type==="System"){
-							 //  实践课程详情页 :identifier = identifier
+							 //  实践课程详情页 :parent_container_id = parent_container_id
 
-							 return    window.open(`/paths/${item.identifier}`)
+							 return  window.open(`/paths/${item.parent_container_id}`)
 						 }
 					 case "TrialAuthorization" :
 						 if(item.tiding_type==="Apply"){
@@ -203,7 +203,7 @@ class MessagSub extends Component{
 				return   window.open(`/shixuns/${item.identifier}/challenges`)
 			case "Subject" :
 				// 实践课程详情页 :id = container_id
-				return  window.open(`/paths/${item.identifier}`)
+				return  window.open(`/paths/${item.container_id}`)
 			case "JournalsForMessage" :
 				 switch (item.parent_container_type) {
 					 case "Principal" :
@@ -224,7 +224,6 @@ class MessagSub extends Component{
 							 //实训作业
 							 return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`)
 						 }
-						 return '';
 					 case "GraduationTopic" :
 					 	// 毕业目标页 parent_container_id
 						 return window.open(`/courses/${item.belong_container_id}/graduation_topics/${item.parent_container_id}/detail`)
@@ -245,7 +244,7 @@ class MessagSub extends Component{
 				 }
 			case "Memo" :
 				// 交流问答页 :id = parent_container_id
-				return   window.open("/forums/categories/all?order=newest")
+				return   window.open(`/forums/${item.parent_container_id}`)
 			case "Watcher" :
 				// 用户个人中心页 :id = item.trigger_user.login
 				return window.open(`/users/${item.trigger_user.login}/courses`)
@@ -255,6 +254,7 @@ class MessagSub extends Component{
 			case "Grade" :
 		    //个人中心页 :id = item.trigger_user.login
 				// return window.open(`/users/${item.trigger_user.login}/courses`;
+				return "";
 			case "JoinProject" :
 				//项目详情-申请加入项目审核页 :id = container_id
 				return window.open(`/projects/${item.container_id}`)
@@ -365,15 +365,15 @@ class MessagSub extends Component{
 				//课堂-作业 :id = container_id
 				if(item.homework_type===1){
 					//普通作业
-					return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`)
+					return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.container_id}/list`)
 				}
 				if(item.homework_type===3){
 					//分组作业
-					return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`)
+					return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.container_id}/list`)
 				}
 				if(item.homework_type===4){
 					//实训作业
-					return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`)
+					return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}/list?tab=0`)
 				}
 			case "StudentWorksScore" :
 				//课堂-作业 :id = parent_container_id
@@ -432,10 +432,10 @@ class MessagSub extends Component{
 				if(item.tiding_type==="Destroyed_end"){
 					return ;
 				}else {
-				// if (item.tiding_type === 'Apply') {
-				// 	///managements/project_package_applies
-				// 	return window.open(`/managements/project_package_applies`;
-				// }
+				if (item.tiding_type === 'Apply') {
+					///managements/project_package_applies
+					return window.open(`/managements/project_package_applies`)
+				}
 				// if(item.tiding_type === 'System'){
 					//众包详情 :id = container_id
 					return window.open(`/crowdsourcing/${item.container_id}`)
@@ -485,10 +485,30 @@ class MessagSub extends Component{
 								 <p className="edu-nodata-p mb20">暂无数据哦~</p>
 							 </div>
 							 :data.map((item,key)=>{
-							 	console.log(data)
+							 	// console.log(data)
+								 // ridinglist-subs
+							   var boolps=true;
+							   if(item.container_type==="PraiseTread"||item.container_type==="Grade"||item.container_type==="ChallengeWorkScore"){
+									 boolps=false;
+								 }
+							   if(item.container_type==="JournalsForMessage"){
+							   	   if(item.parent_container_type==="Principal"){
+											 boolps=false;
+										 }
+								 }
+							   // if(item.container_type==="HomeworkCommon"){
+							   // 	  if(item.parent_container_type==="AnonymousAppeal"){
+									// 		boolps=false;
+									// 	}
+								 // }
+							   if(item.container_type==="ProjectPackage"){
+                    if(item.tiding_type==="Destroyed_end"){
+											boolps=false;
+										}
+								 }
 								 return(
 									 <div className="pl25 ridinglist edu-back-white" key={key}>
-										 <div className="ridinglist-sub clearfix df tiding_item" onClick={()=>this.gettourl(item)}>
+										 <div className={boolps===true?"ridinglist-sub clearfix df tiding_item":"ridinglist-subs clearfix df tiding_item"} onClick={()=>this.gettourl(item)}>
 											 <img   onMouseDown={()=>this.myCome(item)} src={getImageUrl("images/"+item.trigger_user.image_url)} className="radius mr10 fl myimgw48 myimgh48"/>
 											 <div className="fl flex1">
 												 <p>