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

# Conflicts:
#	public/react/src/modules/courses/exercise/Testpapersettinghomepage.js

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

@@ -127,6 +127,7 @@ class MessagSub extends Component{
 				 // 账号管理页-认证信息
 				 return   window.open("/account/certification")
 			 }
+			 return ;
 			case "CancelUserAuthentication" :
 				// 账号管理页-认证信息
 				return  window.open("/account/certification")
@@ -142,6 +143,7 @@ class MessagSub extends Component{
 					// 账号管理页/account/profile
 					return    window.open("/account/profile")
 				}
+				return ;
 			case "ApplyAddSchools" :
 				if(item.tiding_type==="Apply"){
 					// 单位审批
@@ -151,6 +153,7 @@ class MessagSub extends Component{
 					//  账号管理页
 					return   window.open("/account/profile")
 				}
+				return ;
 			case "ApplyAction" :
 				 switch (item.parent_container_type) {
 					 case "ApplyShixun" :
@@ -181,6 +184,7 @@ class MessagSub extends Component{
 							 return    window.open("/account/profile")
 						 }
 				 }
+				 return ;
 			case 'JoinCourse' :
 				// 课堂详情页 :id =
 				return    window.open(`/courses/${item.belong_container_id}/teachers`)
@@ -256,7 +260,10 @@ class MessagSub extends Component{
 				 }
 			case "Memo" :
 				// 交流问答页 :id = parent_container_id
-				return   window.open(`/forums/${item.parent_container_id}`)
+				return   window.open(`/forums/${item.parent_container_id}`);
+			case "Message" :
+				// 交流问答页 :id = parent_container_id
+				return   window.open(`/forums/`);
 			case "Watcher" :
 				// 用户个人中心页 :id = item.trigger_user.login
 				return window.open(`/users/${item.trigger_user.login}/courses`)
@@ -446,6 +453,9 @@ class MessagSub extends Component{
 					return window.open(`/moop_cases/${item.container_id}`)
 				}
 			case "ProjectPackage" :
+				if(item.tiding_type==="Destroyed"){
+					return ;
+				}
 				if(item.tiding_type==="Destroyed_end"){
 					return ;
 				}else {
@@ -529,6 +539,9 @@ class MessagSub extends Component{
                     if(item.tiding_type==="Destroyed_end"){
 											boolps=false;
 										}
+                    if(item.tiding_type==="Destroyed"){
+											boolps=false;
+										}
 								 }
 								 if(item.container_type==="Course"){
 									 if(item.tiding_type==="Delete"){