From 2ce686aae2381c6faae67b98c0edb4b86ceff764 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <hetongchong@csxjy.com>
Date: Thu, 26 May 2022 14:57:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E5=8F=8A?=
 =?UTF-8?q?=E8=AF=BE=E9=A2=98=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/glcc/home/index.jsx               |  2 +-
 src/glcc/home/lightspot/index.jsx     |  2 +-
 src/glcc/index.jsx                    | 10 +++++++++-
 src/glcc/project/index.jsx            |  8 ++++----
 src/glcc/project/taskDetail/index.jsx |  2 +-
 src/glcc/student/index.jsx            |  8 ++++----
 6 files changed, 20 insertions(+), 12 deletions(-)

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) => {
           ></Route>
         {/* 项目/课题列表 */}
         <Route
-          path="/glcc/student"
+          path="/glcc/projects"
+          render={(props) => (
+            <Project {...propsF} {...props} isStudentApplyDate={isStudentApplyDate} studentApplyEnd={studentApplyEnd} applyTaskId={applyTaskId} setStudentInfoReset={setStudentInfoReset}/>
+          )}
+        ></Route>
+
+        {/* 课题列表 */}
+        <Route
+          path="/glcc/subjects"
           render={(props) => (
             <Project {...propsF} {...props} isStudentApplyDate={isStudentApplyDate} studentApplyEnd={studentApplyEnd} applyTaskId={applyTaskId} setStudentInfoReset={setStudentInfoReset}/>
           )}
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) {
     <div className="glcc_project">
       <img className="glcc-banner" src={banner} alt=''></img>
       <div className='head'>
-        <Link to="/glcc/student/2" className={!pathname.endsWith('/1') ? 'active' : ''}>课题列表</Link>
-        <Link to="/glcc/student/1" className={pathname.endsWith('/1') ? 'active' : ''}>项目列表</Link>
+        <Link to="/glcc/subjects" className={!pathname.endsWith('projects') ? 'active' : ''}>课题列表</Link>
+        <Link to="/glcc/projects" className={pathname.endsWith('projects') ? 'active' : ''}>项目列表</Link>
       </div>
       <div className='gobackBox'>
         <a href='/glcc'>开源夏令营 / </a>
@@ -40,13 +40,13 @@ function Project(propsF) {
       <Spin spinning={false}>
         <Switch {...propsF}>
           <Route
-            path="/glcc/student/1"
+            path="/glcc/projects"
             render={(props) => (
               <ProjectList applyTaskId={applyTaskId} current_user={current_user} showLoginDialog={showLoginDialog} isStudentApplyDate={isStudentApplyDate} studentApplyEnd={studentApplyEnd}/>
             )}
           ></Route>
           <Route
-            path="/glcc/student/2"
+            path="/glcc/subjects"
             render={(props) => (
               <TaskList applyTaskId={applyTaskId} setStudentInfoReset={setStudentInfoReset} current_user={current_user} showLoginDialog={showLoginDialog} isStudentApplyDate={isStudentApplyDate} studentApplyEnd={studentApplyEnd}/>
             )}
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) {
           <div className="detailBox">
             <div className='goBackBox'>
               <a href='/glcc'>开源夏令营 / </a>
-              <a href='/glcc/student/2'>课题及项目列表 / </a>
+              <a href='/glcc/subjects'>课题及项目列表 / </a>
               课题详情
             </div>
           </div>
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) {
         <div className='apply'>
           <Breadcrumb className='glcc_breadcrumb font-16'>
             <Breadcrumb.Item><Link to="/glcc">开源夏令营</Link></Breadcrumb.Item>
-            <Breadcrumb.Item><Link to="/glcc/student/2">课题及项目列表</Link></Breadcrumb.Item>
+            <Breadcrumb.Item><Link to="/glcc/subjects">课题及项目列表</Link></Breadcrumb.Item>
             <Breadcrumb.Item style={{ color: '#202D40' }}>学生报名</Breadcrumb.Item>
           </Breadcrumb>