diff --git a/src/military/qz2022.js b/src/military/qz2022.js index e021a42d..bc107a37 100644 --- a/src/military/qz2022.js +++ b/src/military/qz2022.js @@ -111,6 +111,16 @@ const Qz2022 = (props) => { referEnd = Date.parse(new Date()) > Date.parse(new Date(qzDetail.upload_date)); } + function goToRefer(){ + if(current_user && !current_user.login){ + props.showLoginDialog(); + }else if(!enrollStatus.enroll_status){ + props.showNotification("您还未报名竞赛!"); + }else{ + !referStatus ? props.showNotification(!referEnd ? `竞赛尚未开始提交作品,提交作品开始时间为:${qzDetail.enroll_date.substring(0,10)}` :"比赛已结束"):""; + } + } + return ( {/* banner图+选项 */} @@ -131,7 +141,7 @@ const Qz2022 = (props) => { {current_user && current_user.login ? !applyStatus && props.showNotification("报名时间已截止") : props.showLoginDialog()}}>参赛报名
  • - {current_user && current_user.login ? !referStatus ? props.showNotification( !referEnd?"竞赛尚未开始提交作品,提交作品开始时间为:"+qzDetail.enroll_date.substring(0,10) :"比赛已结束") :"" : props.showLoginDialog()}}>提案提交 + 提案提交
  • {/*
  • 参赛报名 diff --git a/src/military/qz2022/apply/index.jsx b/src/military/qz2022/apply/index.jsx index 70bf8f6f..96656f09 100644 --- a/src/military/qz2022/apply/index.jsx +++ b/src/military/qz2022/apply/index.jsx @@ -96,6 +96,17 @@ export default Form.create()((props) => { }) } + // 计划支持 未输入课题来源报错 + function errorSource(rule, value, callback){ + console.log(rule, value, sourceBy); + if(sourceBy === 1 && !value){ + // 计划支持 必须输入课题名称 + callback('请正确输入课题来源'); + }else{ + callback(); + } + } + return (
    @@ -161,15 +172,16 @@ export default Form.create()((props) => { )} {qzDetail && qzDetail.is_local &&
    + 课题来源 {setSourceBy(e.target.value)}} value={sourceBy} defaultValue={1}> 计划支持 自主提报 - {helper('课题来源', + {sourceBy === 1 && helper('', 'subject_source_name', - [{ required: true, message: "请正确输入课题来源" }, - { max: 32, message: '超出限制长度32位字符,请重新编辑' }], - {verify("subject_source_name")}} disabled={sourceBy === 0}/> + [{ max: 32, message: '超出限制长度32位字符,请重新编辑' }, + { validator: (rule, value, callback)=>{errorSource(rule, value, callback)}}], + {verify("subject_source_name")}}/> )}
    } {helper('电话', diff --git a/src/military/qz2022/apply/index.scss b/src/military/qz2022/apply/index.scss index e31c6ad3..e166f6b9 100644 --- a/src/military/qz2022/apply/index.scss +++ b/src/military/qz2022/apply/index.scss @@ -65,6 +65,18 @@ left: 36%; top: 10px; } + .class_from>span{ + position: absolute; + left: 0%; + top: 10px; + } + .class_from .ant-form-item-children{ + top: 38px; + } + .class_from .ant-form-explain{ + position: absolute; + top: 78px; + } } .info{ border: 0.5px solid rgba(153, 153, 153, 0.3); diff --git a/src/military/qz2022/chat/index.scss b/src/military/qz2022/chat/index.scss index 35bb4e61..fd2dc2a4 100644 --- a/src/military/qz2022/chat/index.scss +++ b/src/military/qz2022/chat/index.scss @@ -5,9 +5,8 @@ .links{ display: flex; margin: 30px auto; - width: 1200px; justify-content: space-between; - padding: 24px 120px 30px; + padding: 20px 120px; background-color: white; div{ display: flex; diff --git a/src/military/qz2022/contact/index.scss b/src/military/qz2022/contact/index.scss index bfe002ae..b0890a2b 100644 --- a/src/military/qz2022/contact/index.scss +++ b/src/military/qz2022/contact/index.scss @@ -33,7 +33,6 @@ } .contact-content { - text-align: center; font-size: 1rem; line-height: 2rem; margin-bottom: 1rem;