+ {hasRole && new Date().getTime() < new Date('2022-07-01').getTime() &&
导师审核
diff --git a/src/glcc/home/index.scss b/src/glcc/home/index.scss
index 3b70fbd8..a23775ab 100644
--- a/src/glcc/home/index.scss
+++ b/src/glcc/home/index.scss
@@ -42,7 +42,7 @@
flex-direction: column;
justify-content: center;
width: 355px;
-
+ height: 118px;
&:not(:first-child){
margin-left: 35px;
}
diff --git a/src/glcc/img/resultBanner.png b/src/glcc/img/resultBanner.png
new file mode 100644
index 00000000..e589b239
Binary files /dev/null and b/src/glcc/img/resultBanner.png differ
diff --git a/src/glcc/img/resultBanner2.png b/src/glcc/img/resultBanner2.png
new file mode 100644
index 00000000..e3f598e1
Binary files /dev/null and b/src/glcc/img/resultBanner2.png differ
diff --git a/src/glcc/index.jsx b/src/glcc/index.jsx
index e4e8fc32..d82d56b6 100644
--- a/src/glcc/index.jsx
+++ b/src/glcc/index.jsx
@@ -57,7 +57,11 @@ const Openmmlab = Loadable({
loader: () => import("./openmmlab"),
loading: Loading,
});
-
+// 开源夏令营审核结果页面
+const Result = Loadable({
+ loader: () => import("./checkResult"),
+ loading: Loading,
+});
const Glcc = (propsF) => {
const {current_user} = propsF;
// 判断时间是否在开源夏令营报名时间内(4月15日~5月20日)
@@ -150,6 +154,14 @@ const Glcc = (propsF) => {
)}
>
+ {/* 审核结果页面 */}
+
(
+
+ )}
+ >
+
{/* 首页 */}
{
+export default ({ detail, projectId, applyTaskId, current_user, showLoginDialog, isStudentApplyDate, studentApplyEnd, showTask=true }) => {
const [info, setInfo] = useState(detail);
// 申请课题按钮点击函数
@@ -36,13 +36,14 @@ export default ({ detail, projectId, applyTaskId, current_user, showLoginDialog,
return (
info ?
-
+
{info.projectName}
{info.projectType &&
{info.projectType}}
GitLink项目地址: {info.gitlinkUrl}
项目简介: {info.projectIntro}
- {info.registrationTaskList && info.registrationTaskList.length > 0 ? info.registrationTaskList.map((item, index)=>{
+ {/* 从项目、课题列表展开的显示课题列表,结果公示页展开的不显示课题列表 */}
+ {showTask && (info.registrationTaskList && info.registrationTaskList.length > 0 ? info.registrationTaskList.map((item, index)=>{
return
{window.location.href=`/glcc/subjects/detail/${item.id}`}}>{item.taskName}
@@ -53,13 +54,14 @@ export default ({ detail, projectId, applyTaskId, current_user, showLoginDialog,
{item.taskDesc}
{item.taskUrl &&
}
- {(isStudentApplyDate || studentApplyEnd) && (applyTaskId && item.id && Object.keys(applyTaskId).includes(item.id.toString()) ? : isStudentApplyDate && )}
+ {/* {(isStudentApplyDate || studentApplyEnd) && (applyTaskId && item.id && Object.keys(applyTaskId).includes(item.id.toString()) ? : isStudentApplyDate && )} */}
+ {applyTaskId && item.id && Object.keys(applyTaskId).includes(item.id.toString()) && }
¥{item.taskReward}
- }) :
}
+ }) : )}
:
)
}
\ No newline at end of file
diff --git a/src/glcc/project/index.scss b/src/glcc/project/index.scss
index 7bb5ca0f..8f07e342 100644
--- a/src/glcc/project/index.scss
+++ b/src/glcc/project/index.scss
@@ -108,6 +108,10 @@
padding-bottom: 12px;
border-bottom: 1px dashed #bec5d5;
line-height: 36px;
+ &.byResult{
+ margin: -15px -10px -40px;
+ border-bottom: none;
+ }
.name{
font-weight:700;
color:#3753c5;
diff --git a/src/glcc/project/taskDetail/index.jsx b/src/glcc/project/taskDetail/index.jsx
index 39222459..607c7abc 100644
--- a/src/glcc/project/taskDetail/index.jsx
+++ b/src/glcc/project/taskDetail/index.jsx
@@ -64,7 +64,8 @@ function TaskDetail(props) {
课题简介
{detail.taskDesc}
- {(isStudentApplyDate || studentApplyEnd) && (applyTaskId && taskId && Object.keys(applyTaskId).includes(taskId.toString()) ? : isStudentApplyDate && )}
+ {/* {(isStudentApplyDate || studentApplyEnd) && (applyTaskId && taskId && Object.keys(applyTaskId).includes(taskId.toString()) ? : isStudentApplyDate && )} */}
+ {applyTaskId && taskId && Object.keys(applyTaskId).includes(taskId.toString()) && }

diff --git a/src/glcc/project/taskList/index.jsx b/src/glcc/project/taskList/index.jsx
index d3b66f99..ed72ba40 100644
--- a/src/glcc/project/taskList/index.jsx
+++ b/src/glcc/project/taskList/index.jsx
@@ -32,11 +32,12 @@ function TaskList({applyTaskId, setStudentInfoReset, current_user, showLoginDial
title: '操作', dataIndex: 'action', align: 'center', className:"actionColumns taskTableColumns", render: ((text, item, index) => {
return (
- {(isStudentApplyDate || studentApplyEnd) && (applyTaskId && Object.keys(applyTaskId).includes(item.id.toString()) ?
+ {applyTaskId && Object.keys(applyTaskId).includes(item.id.toString()) && {window.location.href=`/glcc/student/apply/${item.id}`}}>报名详情}
+ {/* {(isStudentApplyDate || studentApplyEnd) && (applyTaskId && Object.keys(applyTaskId).includes(item.id.toString()) ?
{window.location.href=`/glcc/student/apply/${item.id}`}}>报名详情
{deleteItem(item.id)}}>
:isStudentApplyDate &&
- {applyTask(item.id)}}>申请课题)}
+ {applyTask(item.id)}}>申请课题)} */}
)
})
diff --git a/src/glcc/student/index.jsx b/src/glcc/student/index.jsx
index fdb47d7c..a548fce5 100644
--- a/src/glcc/student/index.jsx
+++ b/src/glcc/student/index.jsx
@@ -553,9 +553,9 @@ function Apply(props) {
}
-
+ {/*
-
+ */}