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

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

@@ -186,7 +186,7 @@ class MessagSub extends Component{
 				return    window.open(`/courses/${item.belong_container_id}/teachers`)
 			case 'StudentJoinCourse':
 				// 课堂详情页 :id = container_id
-				return   window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`)
+				return   window.open(`/courses/${item.belong_container_id}`)
 			case  'DealCourse':
 				// 课堂详情页 :id = container_id
 				return   window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`)
@@ -195,6 +195,10 @@ class MessagSub extends Component{
 				return   window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`)
 			case  'Course' :
 				// 课堂详情页 :id = container_id
+				if(item.tiding_type==="Delete"){
+
+        return;
+				}
 				return   window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`)
 			case 'ArchiveCourse' :
 				// 课堂详情页 :id = container_id
@@ -414,7 +418,7 @@ class MessagSub extends Component{
 				return window.open(`/managements/mirror_repository`)
 			case "Journal" :
 				//项目Issue页 :id = parent_container_id
-				return window.open(`/issues/${item.parent_container_id}`)
+				return window.open(`/issues/${item.parent_container_id}`);
 			case "Issue" :
 				//项目Issue页 :id = container_id
 				return window.open(`/issues/${item.container_id}`)
@@ -518,6 +522,12 @@ class MessagSub extends Component{
 											boolps=false;
 										}
 								 }
+								 if(item.container_type==="Course"){
+									 if(item.tiding_type==="Delete"){
+										 boolps=false;
+									 }
+								 }
+
 								 return(
 									 <div className="pl25 ridinglist edu-back-white" key={key}>
 										 <div className={boolps===true?"ridinglist-sub clearfix df tiding_item":"ridinglist-subs clearfix df tiding_item"} onClick={()=>this.gettourl(item)}>