diff --git a/src/glcc/home/award/index.jsx b/src/glcc/home/award/index.jsx index 4e8c1e47..70626de6 100644 --- a/src/glcc/home/award/index.jsx +++ b/src/glcc/home/award/index.jsx @@ -10,7 +10,7 @@ function Award() {
丰厚现金奖励
-
根据课题开发耗时,对应奖金从6000元至12000元不等。详细可以课题详情中具体奖金标准
+
根据课题开发耗时,对应奖金从6000元至12000元不等。可在课题详情中查看具体奖金标准
diff --git a/src/glcc/home/timerShaft/index.jsx b/src/glcc/home/timerShaft/index.jsx index a4f6b12a..aafad773 100644 --- a/src/glcc/home/timerShaft/index.jsx +++ b/src/glcc/home/timerShaft/index.jsx @@ -46,7 +46,7 @@ const stepArr = [{ { title: "Step2", date: "10.21-11.11", - content: "评选公布优秀项目和学员&学员", + content: "评选公布优秀项目和学员", noArrow: true, } ] diff --git a/src/glcc/project/component/projectDetail.jsx b/src/glcc/project/component/projectDetail.jsx index b52ebe06..70be8b80 100644 --- a/src/glcc/project/component/projectDetail.jsx +++ b/src/glcc/project/component/projectDetail.jsx @@ -56,8 +56,8 @@ export default ({ detail, projectId, applyTaskId, current_user, showLoginDialog,
{info.projectName} {info.projectType && {info.projectType}} -

GitLink项目地址: {info.gitlinkUrl}

-
项目简介: {info.projectIntro}
+

GitLink项目地址:  {info.gitlinkUrl}

+
项目简介:  {info.projectIntro}
{info.registrationTaskList && info.registrationTaskList.length > 0 ? info.registrationTaskList.map(item=>{ return
@@ -68,7 +68,7 @@ export default ({ detail, projectId, applyTaskId, current_user, showLoginDialog,
{item.taskDesc}
-
课题链接:   {item.taskUrl}
+
课题链接:   {item.taskUrl}
{(isStudentApplyDate || studentApplyEnd) && (applyTaskId && item.id && Object.keys(applyTaskId).includes(item.id.toString()) ? : isStudentApplyDate && )}
¥ {item.taskReward}
diff --git a/src/glcc/project/index.jsx b/src/glcc/project/index.jsx index 29024186..a5d558ec 100644 --- a/src/glcc/project/index.jsx +++ b/src/glcc/project/index.jsx @@ -49,8 +49,8 @@ function Project(propsF) {
- 课题列表 - 项目列表 + 课题列表 + 项目列表
开源夏令营 / @@ -70,6 +70,12 @@ function Project(propsF) { )} > + ( + + )} + >
diff --git a/src/glcc/project/index.scss b/src/glcc/project/index.scss index a2cddac0..9da1a995 100644 --- a/src/glcc/project/index.scss +++ b/src/glcc/project/index.scss @@ -88,6 +88,7 @@ color:#465474; padding-bottom: 12px; border-bottom: 1px dashed #bec5d5; + line-height: 36px; .name{ font-weight:700; color:#3753c5; @@ -99,6 +100,10 @@ border-radius:4px; margin-left: 12px; padding: 4px 6px; + line-height: 26px; + } + .linkUrl{ + color: #466aff; } } .taskItem { @@ -137,7 +142,7 @@ .taskUrl{ color:#465474; font-size:16px; - span{color:#466aff;} + a{color:#466aff;} } .applyBut{ background-color:#466aff; diff --git a/src/glcc/project/projectList/index.jsx b/src/glcc/project/projectList/index.jsx index 5f130a6e..dda00dc0 100644 --- a/src/glcc/project/projectList/index.jsx +++ b/src/glcc/project/projectList/index.jsx @@ -35,7 +35,7 @@ function ProjectList({applyTaskId, current_user, showLoginDialog, isStudentApply
{data && data.map((item, index)=>{ - return } trigger='click' overlayClassName='projectItemPopover' autoAdjustOverflow={false} isStudentApplyDate={isStudentApplyDate} studentApplyEnd={studentApplyEnd}> + return } trigger='click' overlayClassName='projectItemPopover' autoAdjustOverflow={false}>
diff --git a/src/glcc/project/taskList/index.jsx b/src/glcc/project/taskList/index.jsx index 687b2341..df178029 100644 --- a/src/glcc/project/taskList/index.jsx +++ b/src/glcc/project/taskList/index.jsx @@ -128,7 +128,7 @@ function TaskList({applyTaskId, setStudentInfoReset, current_user, showLoginDial return (
-
{ setKeyword(value) }} />
+
{ setCurrent(1); setKeyword(value) }} />
tr > .taskTableColumns, .ant-table-tbody > tr > .taskTableColumns{ background-color:#F1F6FF; diff --git a/src/glcc/student/index.jsx b/src/glcc/student/index.jsx index 54cfcf90..06a1c4bc 100644 --- a/src/glcc/student/index.jsx +++ b/src/glcc/student/index.jsx @@ -22,7 +22,7 @@ const gradeList = [ { id: '研二', name: '研二' }, { id: '研三', name: '研三' }]; function Apply(props) { - const { form, current_user, showNotification, isGlccApplyDate, match } = props; + const { form, current_user, showNotification, match } = props; const taskId = Number(match.params.taskId); // 可用于开发时不同账号报名 // current_user && (current_user.user_id = 6) @@ -43,6 +43,11 @@ function Apply(props) { const [myTaskList, setMyTaskList] = useState([]); const [allTaskList, setAllTaskList] = useState([]); + // 学生报名时间范围内 + const isStudentApplyDate = Date.parse(new Date()) > 1653494400000 && Date.parse(new Date()) < 1656086400000; + // 已过学生报名时间 + const studentApplyEnd = Date.parse(new Date()) > 1656086400000; + useEffect(() => { // 进入此页面到填写页面 // setTimeout(()=>{ @@ -50,9 +55,9 @@ function Apply(props) { let scrollHeight = 500 * clientWidth / 1920; window.scrollTo(0, scrollHeight); - if (!isGlccApplyDate) { + if (!isStudentApplyDate) { // 不在开源夏令营报名时间之内 - window.location.href = "/glcc"; + window.location.href = "/glcc/student/2"; } else if (current_user && current_user.login) { } else { @@ -342,7 +347,7 @@ function Apply(props) {
开源夏令营 - 查看项目 + 课题及项目列表 学生报名 @@ -401,7 +406,7 @@ function Apply(props) { 'phone', [{ required: true, message: "请正确输入联系电话" }, { max: 14, message: '超出限制长度14位字符,请重新编辑' }, - { pattern: /^(^(\d{3,4}-)?\d{7,8})$|(13[0-9]{9})$/, message: '请正确输入联系电话' }], + { pattern: /[\d-]{4,14}$/, message: '请正确输入联系电话' }], { verify("phone") }} className={editable ? "" : "disabledInput"} disabled={editable ? false : true} /> )} {helper('邮箱地址',