diff --git a/src/glcc/home/index.jsx b/src/glcc/home/index.jsx index dbc439e58..76bf64f4a 100644 --- a/src/glcc/home/index.jsx +++ b/src/glcc/home/index.jsx @@ -33,7 +33,7 @@ export default (props) => { if(!studentApplyStart){ showNotification("不在报名时间,报名开始时间为5月26日"); }else{ - window.location.href="/glcc/student/2"; + window.location.href="/glcc/subjects"; } } diff --git a/src/glcc/home/lightspot/index.jsx b/src/glcc/home/lightspot/index.jsx index 6c46306e4..ca240cdf8 100644 --- a/src/glcc/home/lightspot/index.jsx +++ b/src/glcc/home/lightspot/index.jsx @@ -32,7 +32,7 @@ function Lightspot(props) { if(!studentApplyStart){ showNotification("不在报名时间,报名开始时间为5月26日"); }else{ - window.location.href="/glcc/student/2"; + window.location.href="/glcc/subjects"; } } diff --git a/src/glcc/index.jsx b/src/glcc/index.jsx index 0654858ee..658065313 100644 --- a/src/glcc/index.jsx +++ b/src/glcc/index.jsx @@ -109,7 +109,15 @@ const Glcc = (propsF) => { > {/* 项目/课题列表 */} ( + + )} + > + + {/* 课题列表 */} + ( )} diff --git a/src/glcc/project/index.jsx b/src/glcc/project/index.jsx index 3b5014f75..c176f61f7 100644 --- a/src/glcc/project/index.jsx +++ b/src/glcc/project/index.jsx @@ -30,8 +30,8 @@ function Project(propsF) {
- 课题列表 - 项目列表 + 课题列表 + 项目列表
开源夏令营 / @@ -40,13 +40,13 @@ function Project(propsF) { ( )} > ( )} diff --git a/src/glcc/project/taskDetail/index.jsx b/src/glcc/project/taskDetail/index.jsx index efbfc7b06..39222459f 100644 --- a/src/glcc/project/taskDetail/index.jsx +++ b/src/glcc/project/taskDetail/index.jsx @@ -44,7 +44,7 @@ function TaskDetail(props) { diff --git a/src/glcc/student/index.jsx b/src/glcc/student/index.jsx index 59d79625f..c17e9841e 100644 --- a/src/glcc/student/index.jsx +++ b/src/glcc/student/index.jsx @@ -58,7 +58,7 @@ function Apply(props) { if (new Date().getTime() < new Date('2022-05-26').getTime()) { // 不在开源夏令营报名时间之内 - window.location.href = "/glcc/student/2"; + window.location.href = "/glcc/subjects"; } else if (current_user && current_user.login) { } else { @@ -193,7 +193,7 @@ function Apply(props) { setStudentInfoReset(Math.random()); setReload(Math.random()); setLoading(false); - history.push(`/glcc/student/2`) + history.push(`/glcc/subjects`) } }); } else { @@ -203,7 +203,7 @@ function Apply(props) { setStudentInfoReset(Math.random()); setReload(Math.random()); setLoading(false); - history.push(`/glcc/student/2`) + history.push(`/glcc/subjects`) } }); } @@ -351,7 +351,7 @@ function Apply(props) {
开源夏令营 - 课题及项目列表 + 课题及项目列表 学生报名