From 84cbf79f395239f876256695fad3b50225bf3275 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 2 Aug 2019 19:36:34 +0800
Subject: [PATCH] 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/js/MessagSub.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js
index de23f4764..469d94914 100644
--- a/public/react/src/modules/message/js/MessagSub.js
+++ b/public/react/src/modules/message/js/MessagSub.js
@@ -214,7 +214,7 @@ class MessagSub extends Component{
 					 	//学生作业页 homework = parent_container_id
 						 if(item.homework_type===1){
 							 //普通作业
-							 return window.open(`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`)
+							 return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`)
 						 }
 						 if(item.homework_type===3){
 							 //分组作业
@@ -231,7 +231,7 @@ class MessagSub extends Component{
 					 	//学生作业页
 						 if(item.homework_type===1){
 							 //普通作业
-							 return window.open(`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`)
+							 return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`)
 						 }
 						 if(item.homework_type===3){
 							 //分组作业
@@ -310,7 +310,7 @@ class MessagSub extends Component{
 						// 课堂-作业列表 homework = container_id
 						if(item.homework_type===1){
 							//普通作业
-							return window.open(`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`)
+							return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`)
 						}
 						if(item.homework_type===3){
 							//分组作业
@@ -323,7 +323,7 @@ class MessagSub extends Component{
 					case "HomeworkPublish" :
 						if(item.homework_type===1){
 							//普通作业
-							return window.open(`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`)
+							return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`)
 						}
 						if(item.homework_type===3){
 							//分组作业
@@ -336,7 +336,7 @@ class MessagSub extends Component{
 					case "AnonymousAppeal" :
 						if(item.homework_type===1){
 							//普通作业
-							return window.open(`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`)
+							return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`)
 						}
 						if(item.homework_type===3){
 							//分组作业
@@ -350,7 +350,7 @@ class MessagSub extends Component{
 						// 课堂-作业列表 homework = container_id
 						if(item.homework_type===1){
 							//普通作业
-							return window.open(`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`)
+							return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`)
 						}
 						if(item.homework_type===3){
 							//分组作业
@@ -379,7 +379,7 @@ class MessagSub extends Component{
 				//课堂-作业 :id = parent_container_id
 				if(item.homework_type===1){
 					//普通作业
-					return window.open(`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`)
+					return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`)
 				}
 				if(item.homework_type===3){
 					//分组作业
@@ -392,7 +392,7 @@ class MessagSub extends Component{
 			case "StudentWorksScoresAppeal" :
 				if(item.homework_type===1){
 					//普通作业
-					return window.open(`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`)
+					return window.open(`courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`)
 				}
 				if(item.homework_type===3){
 					//分组作业