From 83d8ce461067a5fd856fddeae608ce3c3e5ae2c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Mon, 3 Jun 2024 11:22:40 +0800
Subject: [PATCH] =?UTF-8?q?glcc=E8=AF=BE=E9=A2=98=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=A5=96=E9=87=91=E5=85=B7=E4=BD=93=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/glcc/project/component/projectDetail.jsx | 2 +-
 src/glcc/project/taskList/index.jsx          | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/glcc/project/component/projectDetail.jsx b/src/glcc/project/component/projectDetail.jsx
index d61756fd5..9772bd6d0 100644
--- a/src/glcc/project/component/projectDetail.jsx
+++ b/src/glcc/project/component/projectDetail.jsx
@@ -45,7 +45,7 @@ export default ({ detail, projectId, applyTaskId, period, showTask=true, applyTa
             <div className="center">
               <div className="taskDesc">{item.taskDesc}</div>
               {item.taskUrl && <div className="taskUrl oneLine">课题链接: &nbsp;&nbsp;<a href={item.taskUrl} target={"_blank"}>{item.taskUrl}</a></div>}
-              {round >= rewardSettingRound && item.settingRewardValue !== rewardMoney && <div className="taskUrl oneLine"><span className="labelInfoBox">奖励备注: &nbsp;&nbsp;</span>{item.settingRewardRemark}</div>}
+              {round >= rewardSettingRound && item.settingRewardValue !== rewardMoney && <div className="taskUrl oneLine mb10"><span className="labelInfoBox">奖励备注: &nbsp;&nbsp;</span>{item.settingRewardRemark}</div>}
               <div>
                 {/* 报名详情按钮 */}
                 {round === 2 && applyTaskId && Object.keys(applyTaskId).includes(item.id.toString()) && <Button onClick={()=>{window.location.href=`/glcc/student/apply/${item.id}`}} className='lookDetail mr10'>报名详情</Button>}
diff --git a/src/glcc/project/taskList/index.jsx b/src/glcc/project/taskList/index.jsx
index 3a3aed04c..3f6aab7d9 100644
--- a/src/glcc/project/taskList/index.jsx
+++ b/src/glcc/project/taskList/index.jsx
@@ -1,7 +1,7 @@
 import React, { Fragment, useEffect, useState } from 'react';
 import { Checkbox, Input, message, Modal, Table, Tooltip } from 'antd';
 import './index.scss';
-import { cancelTaskApply, rewardSettingRound, taskList } from '../../api';
+import { cancelTaskApply, rewardMoney, rewardSettingRound, taskList } from '../../api';
 import ProjectDetail from '../component/projectDetail';
 import bgPng from "../../img/bgPng.png";
 const { Search } = Input;
@@ -29,7 +29,10 @@ function TaskList({applyTaskId, setStudentInfoReset, current_user, showLoginDial
     { title: '课题名称', dataIndex: 'taskName', className:"taskTableColumns taskName", width: '24%', ellipsis: true, render: (text, item) => <Tooltip title={text} placement="topLeft"><span onClick={()=>{window.open(`/glcc/${id}/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: round >= rewardSettingRound ? '课题奖励' : '课题奖金', dataIndex: round >= rewardSettingRound ? 'settingRewardValue' : 'taskReward', className:"taskTableColumns", ellipsis: true, width: '10%', render: (text) => <Tooltip title={text} placement="topLeft"><span>{text}</span></Tooltip> },
+    { title: round >= rewardSettingRound ? '课题奖励' : '课题奖金', dataIndex: round >= rewardSettingRound ? 'settingRewardValue' : 'taskReward', className:"taskTableColumns", ellipsis: true, width: '10%', render: (text, item) => {
+      const reward = round >= rewardSettingRound && text === rewardMoney && `￥ ${item.settingRewardRemark}`;
+      return <Tooltip title={text} placement="topLeft"><span>{reward || text}</span></Tooltip>
+    } },
     {
       title: '操作', dataIndex: 'action', align: 'center', className:"actionColumns taskTableColumns", render: ((text, item, index) => {
         return (