From a9170a9fa9b3f9e9ab469a27d401f73241261a23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Fri, 30 Jun 2023 13:35:47 +0800
Subject: [PATCH] =?UTF-8?q?0=E5=85=83=E8=AF=BE=E9=A2=98=E4=B8=8D=E8=BF=9B?=
 =?UTF-8?q?=E5=85=A5=E8=AF=BE=E9=A2=98=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/glcc/freeProject/component/projectDetail.jsx | 9 +++------
 src/glcc/freeProject/index.scss                  | 1 -
 src/glcc/freeProject/taskList/index.jsx          | 2 +-
 src/glcc/freeProject/taskList/index.scss         | 1 -
 src/glcc/project/taskDetail/index.jsx            | 4 ++--
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/glcc/freeProject/component/projectDetail.jsx b/src/glcc/freeProject/component/projectDetail.jsx
index e05dfb3c8..636e718dd 100644
--- a/src/glcc/freeProject/component/projectDetail.jsx
+++ b/src/glcc/freeProject/component/projectDetail.jsx
@@ -30,17 +30,14 @@ export default ({ detail, projectId }) => {
       {info.registrationTaskList && info.registrationTaskList.length ? info.registrationTaskList.map((item, index)=>{
         return <div className='taskItem mt20' key={index}>
           <div className="left">
-            <div className="taskTitle" onClick={()=>{window.open(`/glcc/2023/subjects/detail/${item.id}`)}}><Tooltip title={item.taskName}>{item.taskName}</Tooltip></div>
+            <div className="taskTitle"><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>
           <div className="center">
-            <div className="taskDesc">{item.taskDesc}</div>
+            <div className="taskDesc"><Tooltip title={item.taskDesc}>{item.taskDesc}</Tooltip></div>
             {item.taskUrl && <div className="taskUrl oneLine">课题链接: &nbsp;&nbsp;<a href={item.taskUrl} target={"_blank"}>{item.taskUrl}</a></div>}
-            {/* 查看课题详情按钮 */}
-            <div>
-              <Button onClick={()=>{window.open(`/glcc/2023/subjects/detail/${item.id}`)}} className='lookDetail'>课题详情</Button>
-            </div>
+            <div></div>
           </div>
           <div className="right oneLine taskUrl"><span className='taskReward'>￥{item.taskReward}</span></div>
         </div>
diff --git a/src/glcc/freeProject/index.scss b/src/glcc/freeProject/index.scss
index fc503136f..b9551b814 100644
--- a/src/glcc/freeProject/index.scss
+++ b/src/glcc/freeProject/index.scss
@@ -110,7 +110,6 @@
       padding: 22px 20px;
       color:#25304a;
       .taskTitle{
-        cursor: pointer;
         color:#1834a7;
         font-size:18px;
         display: -webkit-box;
diff --git a/src/glcc/freeProject/taskList/index.jsx b/src/glcc/freeProject/taskList/index.jsx
index 5fa2103de..10925832a 100644
--- a/src/glcc/freeProject/taskList/index.jsx
+++ b/src/glcc/freeProject/taskList/index.jsx
@@ -17,7 +17,7 @@ function TaskList() {
 
   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: '28%', ellipsis: true, render: (text, item) => <Tooltip title={text} placement="topLeft"><span onClick={()=>{window.open(`/glcc/2023/subjects/detail/${item.id}`)}}>{text}</span></Tooltip> },
+    { title: '课题名称', dataIndex: 'taskName', className:"taskTableColumns taskName", width: '28%', ellipsis: true, render: (text, item) => <Tooltip title={text} placement="topLeft"><span>{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> },
diff --git a/src/glcc/freeProject/taskList/index.scss b/src/glcc/freeProject/taskList/index.scss
index 328786cff..f1c77ad72 100644
--- a/src/glcc/freeProject/taskList/index.scss
+++ b/src/glcc/freeProject/taskList/index.scss
@@ -28,7 +28,6 @@
 }
 .ant-table-tbody .taskTableColumns.taskName span{
   color: #2545c9;
-  cursor: pointer;
 }
 .ant-table-thead > tr > .taskTableColumns, .ant-table-tbody > tr > .taskTableColumns{
   background-color:#F1F6FF;
diff --git a/src/glcc/project/taskDetail/index.jsx b/src/glcc/project/taskDetail/index.jsx
index f551a5d0a..ee812529b 100644
--- a/src/glcc/project/taskDetail/index.jsx
+++ b/src/glcc/project/taskDetail/index.jsx
@@ -52,9 +52,9 @@ function TaskDetail(props) {
 
             {/* 课题申请时间范围内： 申请课题 */}
             {/* 第一次报名 */}
-            {round === currentRound && period==="stuApply" && !(applyTaskId && Object.keys(applyTaskId).includes(taskId.toString())) && <Button type='primary' className='applyBut detailBut' onClick={()=>{applyTask(taskId)}}>申请课题</Button>}
+            {detail.taskReward > 0 && round === currentRound && period==="stuApply" && !(applyTaskId && Object.keys(applyTaskId).includes(taskId.toString())) && <Button type='primary' className='applyBut detailBut' onClick={()=>{applyTask(taskId)}}>申请课题</Button>}
             {/* 第二次报名 锁定状态 */}
-            {round === currentRound && period === "stuApply1" && !(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>)}
+            {detail.taskReward > 0 && round === currentRound && period === "stuApply1" && !(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'/>