From 23914dd777ed366e4723f65c4d870e6b1734711a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Wed, 29 Jun 2022 14:23:43 +0800
Subject: [PATCH 1/2] =?UTF-8?q?glcc=E5=9C=B0=E5=9D=80=E6=A0=8F=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/glcc/checkResult/index.jsx                  | 2 +-
 src/glcc/openmmlab/projectTab/projectDetail.jsx | 4 ++--
 src/glcc/project/component/projectDetail.jsx    | 4 ++--
 src/glcc/project/taskDetail/index.jsx           | 3 +--
 src/glcc/project/taskList/index.jsx             | 2 +-
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/glcc/checkResult/index.jsx b/src/glcc/checkResult/index.jsx
index 8ca925da..78ac165d 100644
--- a/src/glcc/checkResult/index.jsx
+++ b/src/glcc/checkResult/index.jsx
@@ -60,7 +60,7 @@ function CheckResult({current_user, history}) {
     { title: '学生专业', dataIndex: 'profession', className:"columnsResult taskName", width: '12%', ellipsis: true, render: (text) => <Tooltip title={text} placement="topLeft"><span className='toolTipSpan'>{text}</span></Tooltip>},
     { title: '学生年级', dataIndex: 'grade', className:"columnsResult taskName", width: '10%', ellipsis: true},
     { title: '课题导师', dataIndex: 'tutorName', className:"columnsResult", width: '10%', ellipsis: true},
-    { title: '课题名称', dataIndex: 'taskName', className:"columnsResult", width: '20%', ellipsis: true, render: (text, item) => <Tooltip title={text} placement="topLeft"><span className='toolTipSpan link' onClick={()=>{window.open(`/glcc/subjects/detail/${item.id}?locked=${item.locked}`)}}>{text}</span></Tooltip> },
+    { title: '课题名称', dataIndex: 'taskName', className:"columnsResult", width: '20%', ellipsis: true, render: (text, item) => <Tooltip title={text} placement="topLeft"><span className='toolTipSpan link' onClick={()=>{window.open(`/glcc/subjects/detail/${item.id}`)}}>{text}</span></Tooltip> },
     { title: '项目名称', dataIndex: 'projectName', className:"columnsResult", ellipsis: true, width: '14%', render: (text) => <Tooltip title={text} placement="topLeft"><span className='toolTipSpan'>{text}</span></Tooltip> },
     { title: '操作', dataIndex: 'action', align: 'center', className:"columnsResult actionBox"},
   ]
diff --git a/src/glcc/openmmlab/projectTab/projectDetail.jsx b/src/glcc/openmmlab/projectTab/projectDetail.jsx
index bea1eefb..7178c81d 100644
--- a/src/glcc/openmmlab/projectTab/projectDetail.jsx
+++ b/src/glcc/openmmlab/projectTab/projectDetail.jsx
@@ -26,7 +26,7 @@ export default ({ detail, projectId, applyTaskId, isStudentApplyDate, secondStud
       {info.registrationTaskList && info.registrationTaskList.length > 0 ? info.registrationTaskList.map((item, index)=>{
         return <div className='taskItem mt15' key={index}>
           <div className="left">
-            <div className="taskTitle" onClick={()=>{window.location.href=`/glcc/subjects/detail/${item.id}?locked=${item.locked}`}}><Tooltip title={item.taskName}>{item.taskName}</Tooltip></div>
+            <div className="taskTitle" onClick={()=>{window.location.href=`/glcc/subjects/detail/${item.id}`}}><Tooltip title={item.taskName}>{item.taskName}</Tooltip></div>
             <div className='mt15 oneLine leftWidth'>导师姓名: &nbsp;&nbsp;{item.tutorName}</div>
             {item.tutorMail && <div className='mb15 email oneLine leftWidth'>邮箱地址: &nbsp;&nbsp;<span><Tooltip title={item.tutorMail}>{item.tutorMail}</Tooltip></span></div>}
           </div>
@@ -44,7 +44,7 @@ export default ({ detail, projectId, applyTaskId, isStudentApplyDate, secondStud
               {secondStudentApplyDate && !(applyTaskId && Object.keys(applyTaskId).includes(item.id.toString())) && (item.locked ? <Tooltip title={"该课题已有学生入选"}><Button type='primary' className='mr10' disabled>申请课题</Button></Tooltip> : <Button type='primary' className='applyBut mr10' onClick={()=>{applyTask(item.id)}}>申请课题</Button>)}
 
               {/* 查看课题详情按钮 */}
-              <Button onClick={()=>{window.open(`/glcc/subjects/detail/${item.id}?locked=${item.locked}`)}} className='lookDetail'>课题详情</Button>
+              <Button onClick={()=>{window.open(`/glcc/subjects/detail/${item.id}`)}} className='lookDetail'>课题详情</Button>
             </div>
           </div>
           <div className="right oneLine taskUrl"><span className='taskReward'>￥{item.taskReward}</span></div>
diff --git a/src/glcc/project/component/projectDetail.jsx b/src/glcc/project/component/projectDetail.jsx
index 9ecf11b5..0963c127 100644
--- a/src/glcc/project/component/projectDetail.jsx
+++ b/src/glcc/project/component/projectDetail.jsx
@@ -30,7 +30,7 @@ export default ({ detail, projectId, applyTaskId, isStudentApplyDate, secondStud
       {showTask && (info.registrationTaskList && info.registrationTaskList.length > 0 ? info.registrationTaskList.map((item, index)=>{
         return <div className='taskItem mt20' key={index}>
           <div className="left">
-            <div className="taskTitle" onClick={()=>{window.location.href=`/glcc/subjects/detail/${item.id}?locked=${item.locked}`}}><Tooltip title={item.taskName}>{item.taskName}</Tooltip></div>
+            <div className="taskTitle" onClick={()=>{window.location.href=`/glcc/subjects/detail/${item.id}`}}><Tooltip title={item.taskName}>{item.taskName}</Tooltip></div>
             <div className='mt20 oneLine leftWidth'>导师姓名: &nbsp;&nbsp;{item.tutorName}</div>
             {item.tutorMail && <div className='mb20 email oneLine leftWidth'>邮箱地址: &nbsp;&nbsp;<span><Tooltip title={item.tutorMail}>{item.tutorMail}</Tooltip></span></div>}
           </div>
@@ -48,7 +48,7 @@ export default ({ detail, projectId, applyTaskId, isStudentApplyDate, secondStud
               {secondStudentApplyDate && !(applyTaskId && Object.keys(applyTaskId).includes(item.id.toString())) && (item.locked ? <Tooltip title={"该课题已有学生入选"}><Button type='primary' className='mr10' disabled>申请课题</Button></Tooltip> : <Button type='primary' className='applyBut mr10' onClick={()=>{applyTask(item.id)}}>申请课题</Button>)}
 
               {/* 查看课题详情按钮 */}
-              <Button onClick={()=>{window.open(`/glcc/subjects/detail/${item.id}?locked=${item.locked}`)}} className='lookDetail'>课题详情</Button>
+              <Button onClick={()=>{window.open(`/glcc/subjects/detail/${item.id}`)}} className='lookDetail'>课题详情</Button>
             </div>
           </div>
           <div className="right oneLine taskUrl"><span className='taskReward'>￥{item.taskReward}</span></div>
diff --git a/src/glcc/project/taskDetail/index.jsx b/src/glcc/project/taskDetail/index.jsx
index 9f86363a..1dac4ff5 100644
--- a/src/glcc/project/taskDetail/index.jsx
+++ b/src/glcc/project/taskDetail/index.jsx
@@ -9,7 +9,6 @@ import './index.scss';
 function TaskDetail(props) {
   const {match, location, isStudentApplyDate, secondStudentApplyDate, applyTaskId, applyTask} = props
   const taskId = Number(match.params.taskId);
-  const locked = location.search && location.search.split('=')[1] === 'true';
   const [detail, setDetail] = useState(undefined);
 
   useEffect(()=>{
@@ -55,7 +54,7 @@ function TaskDetail(props) {
             {/* 第一次报名 */}
             {isStudentApplyDate && !(applyTaskId && Object.keys(applyTaskId).includes(taskId.toString())) && <Button type='primary' className='applyBut detailBut' onClick={()=>{applyTask(taskId)}}>申请课题</Button>}
             {/* 第二次报名 锁定状态 */}
-            {secondStudentApplyDate && !(applyTaskId && Object.keys(applyTaskId).includes(taskId.toString())) && (locked ? <Tooltip title={"该课题已有学生入选"}><Button type='primary' className='mr10' disabled>申请课题</Button></Tooltip> : <Button type='primary' className='applyBut mr10' onClick={()=>{applyTask(taskId)}}>申请课题</Button>)}
+            {secondStudentApplyDate && !(applyTaskId && Object.keys(applyTaskId).includes(taskId.toString())) && (detail.locked ? <Tooltip title={"该课题已有学生入选"}><Button type='primary' className='mr10 detailBut' disabled>申请课题</Button></Tooltip> : <Button type='primary' className='applyBut mr10 detailBut' onClick={()=>{applyTask(taskId)}}>申请课题</Button>)}
           </div>
           <img src={bgPng} alt='' className='bgPng1'/>
           <img src={bgPng} alt='' className='bgPng2'/>
diff --git a/src/glcc/project/taskList/index.jsx b/src/glcc/project/taskList/index.jsx
index c9ed0092..c38161de 100644
--- a/src/glcc/project/taskList/index.jsx
+++ b/src/glcc/project/taskList/index.jsx
@@ -24,7 +24,7 @@ function TaskList({applyTaskId, setStudentInfoReset, current_user, showLoginDial
 
   const columns = [
     { title: '序号', dataIndex: 'index', align: 'center', className:"taskTableColumns", width: '6%', render: (text, item, index) => <span>{(current-1)*pageSize+index + 1}</span> },
-    { title: '课题名称', dataIndex: 'taskName', className:"taskTableColumns taskName", width: '24%', ellipsis: true, render: (text, item) => <Tooltip title={text} placement="topLeft"><span onClick={()=>{window.open(`/glcc/subjects/detail/${item.id}?locked=${item.locked}`)}}>{text}</span></Tooltip> },
+    { title: '课题名称', dataIndex: 'taskName', className:"taskTableColumns taskName", width: '24%', ellipsis: true, render: (text, item) => <Tooltip title={text} placement="topLeft"><span onClick={()=>{window.open(`/glcc/subjects/detail/${item.id}`)}}>{text}</span></Tooltip> },
     { title: '课题类型', dataIndex: 'projectType', className:"taskTableColumns", width: '12%', ellipsis: true,  },
     { title: '项目名称', dataIndex: 'projectName', className:"taskTableColumns", width: '24%', ellipsis: true, render: (text) => <Tooltip title={text} placement="topLeft">{text}</Tooltip> },
     { title: '课题奖金', dataIndex: 'taskReward', className:"taskTableColumns", ellipsis: true, width: '10%', render: (text) => <Tooltip title={text} placement="topLeft"><span>{text}</span></Tooltip> },

From c05f9ff8580b86ef93ab45408db739cc72645596 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Thu, 30 Jun 2022 10:55:33 +0800
Subject: [PATCH 2/2] =?UTF-8?q?glcc=E7=BB=93=E6=9E=9C=E5=85=AC=E7=A4=BA?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/glcc/checkResult/index.jsx | 4 ++--
 src/glcc/home/index.jsx        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/glcc/checkResult/index.jsx b/src/glcc/checkResult/index.jsx
index 78ac165d..df66cff3 100644
--- a/src/glcc/checkResult/index.jsx
+++ b/src/glcc/checkResult/index.jsx
@@ -31,7 +31,7 @@ function CheckResult({current_user, history}) {
     }
     hasAuditRole({ userId: current_user.user_id }).then(res => {
       // 7.1之前 普通用户不可以进入此页面
-      if (!(res && res.message == 'success' && res.data.hasRole) && new Date().getTime() < new Date('2022-07-01 1:0').getTime()) {
+      if (!(res && res.message == 'success' && res.data.hasRole) && new Date().getTime() < new Date('2022-07-01 12:0').getTime()) {
         history.push('/glcc');
       }
     })
@@ -108,7 +108,7 @@ function CheckResult({current_user, history}) {
   return (
     <div className="resultListBox">
       {time && <img className="resultBanner" src={resultBanner} alt=""></img>}
-      {new Date().getTime() > new Date('2022-07-01 1:0').getTime() && <img className="resultBanner" src={resultBanner2} alt=""></img>}
+      {new Date().getTime() > new Date('2022-07-01 12:0').getTime() && <img className="resultBanner" src={resultBanner2} alt=""></img>}
       <div className='bgBox'>
         <div className="resultList">
           <div className='goBackBox'><a href='/glcc'>开源夏令营 / </a>入选学生名单{time && '预'}公示</div>
diff --git a/src/glcc/home/index.jsx b/src/glcc/home/index.jsx
index a66a1a5d..a13b7d7e 100644
--- a/src/glcc/home/index.jsx
+++ b/src/glcc/home/index.jsx
@@ -33,7 +33,7 @@ export default (props) => {
 
   const [hasRole, setHhasRole] = useState(false);
   const resultTime1 = new Date().getTime() > new Date('2022-06-28 1:0').getTime() && new Date().getTime() < new Date('2022-07-01 0:0').getTime();
-  const resultTime2 = new Date().getTime() > new Date('2022-07-01 1:0').getTime();
+  const resultTime2 = new Date().getTime() > new Date('2022-07-01 12:0').getTime();
 
   useEffect(() => {
     if (!current_user.user_id) {
@@ -98,7 +98,7 @@ export default (props) => {
         {resultTime2 && <div className="apply" onClick={goToCheckResult}>
           <div>
             <img src={apply2} alt="" className="applyIcon" />
-            <span className="til">名单{resultTime1 && '预'}公示</span>
+            <span className="til">名单{resultTime1 ? '预' : ''}公示</span>
           </div>
           <div className="pt6">查看各课题入选学生名单</div>
         </div>}