From 76d943ca02585c0b161853b2675ee837895f0c6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Thu, 1 Jun 2023 20:12:58 +0800
Subject: [PATCH] =?UTF-8?q?glcc=20=E6=8A=A5=E5=90=8D=E4=B8=A4=E4=B8=AA?=
 =?UTF-8?q?=E8=AF=BE=E9=A2=98+=E8=AF=BE=E9=A2=98=E9=A1=B9=E7=9B=AEurl?=
 =?UTF-8?q?=E5=B1=8F=E8=94=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/glcc/index.jsx         | 10 +++++-----
 src/glcc/project/index.jsx |  5 ++++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/glcc/index.jsx b/src/glcc/index.jsx
index a8b310fe3..cf616cf48 100644
--- a/src/glcc/index.jsx
+++ b/src/glcc/index.jsx
@@ -172,9 +172,9 @@ const Glcc = (propsF) => {
       // 判断该学生是否已经被某位导师选中
       if(lockedTaskName){
         message.error(`由于你已入选 ${lockedTaskName} 课题，无法申请其他课题`);
-      }else if(applyTaskId && Object.keys(applyTaskId).length >= 3){
-        // 判断用户是否已经报名三个课题
-        message.error('最多只能同时报名三个课题');
+      }else if(applyTaskId && Object.keys(applyTaskId).length >= 2){
+        // 判断用户是否已经报名两个课题
+        message.error('最多只能同时报名两个课题');
       }else{
         // 跳转到学生报名页
         window.location.href=`/glcc/student/apply/${id}`;
@@ -225,7 +225,7 @@ const Glcc = (propsF) => {
         <Route
           path="/glcc/:id/projects"
           render={(props) => (
-            <Project period={period} round={round} {...propsF} {...props} isStudentApplyDate={isStudentApplyDate} secondStudentApplyDate={secondStudentApplyDate} applyTaskId={applyTaskId} setStudentInfoReset={setStudentInfoReset} applyTask={applyTask}/>
+            <Project repoPublic={repoPublic} period={period} round={round} {...propsF} {...props} isStudentApplyDate={isStudentApplyDate} secondStudentApplyDate={secondStudentApplyDate} applyTaskId={applyTaskId} setStudentInfoReset={setStudentInfoReset} applyTask={applyTask}/>
           )}
         ></Route>
 
@@ -233,7 +233,7 @@ const Glcc = (propsF) => {
         <Route
           path="/glcc/:id/subjects"
           render={(props) => (
-            <Project period={period} round={round} {...propsF} {...props} isStudentApplyDate={isStudentApplyDate} secondStudentApplyDate={secondStudentApplyDate} applyTaskId={applyTaskId} setStudentInfoReset={setStudentInfoReset} cancelCount={cancelCount} applyTask={applyTask}/>
+            <Project repoPublic={repoPublic} period={period} round={round} {...propsF} {...props} isStudentApplyDate={isStudentApplyDate} secondStudentApplyDate={secondStudentApplyDate} applyTaskId={applyTaskId} setStudentInfoReset={setStudentInfoReset} cancelCount={cancelCount} applyTask={applyTask}/>
           )}
         ></Route>
 
diff --git a/src/glcc/project/index.jsx b/src/glcc/project/index.jsx
index 32bbe7315..606030306 100644
--- a/src/glcc/project/index.jsx
+++ b/src/glcc/project/index.jsx
@@ -20,8 +20,11 @@ const TaskList = Loadable({
 });
 
 function Project(propsF) {
-  const {location, match:{params:{id}}} = propsF;
+  const {location, match:{params:{id}}, repoPublic, history} = propsF;
   const {pathname} = location;
+  if(id==="2023" && !repoPublic){
+    history.go(-1);
+  }
   useEffect(()=>{
     window.scrollTo(0, 0);
   },[])