issue

src/military/qz2022.js

@@ -112,6 +112,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 (
     <React.Fragment>
       {/* banner图+选项 */}
@@ -133,7 +143,7 @@ const Qz2022 = (props) => {
             <Link to={{ pathname: applyStatus && current_user && current_user.login ? '/competition/qz2022/apply' :'' }} onClick={()=>{current_user && current_user.login ? !applyStatus && props.showNotification("报名时间已截止") : props.showLoginDialog()}}>参赛报名</Link>
           </li> 
           <li className={active === "refer" ? "active" : ""}>
-            <Link to={{ pathname: referStatus && !referEnd && current_user && current_user.login ? `/competition/qz2022/refer` : '' }} onClick={()=>{current_user && current_user.login ? !referStatus ? props.showNotification( !referEnd?"竞赛尚未开始提交作品，提交作品开始时间为："+qzDetail.enroll_date.substring(0,10) :"比赛已结束") :"" : props.showLoginDialog()}}>提案提交</Link>
+            <Link to={{ pathname: referStatus && !referEnd && current_user && current_user.login && enrollStatus.enroll_date ? `/competition/qz2022/refer` : '' }} onClick={goToRefer}>提案提交</Link>
           </li>
           {/* <li className={active === "apply" ? "active" : ""}>
             <Link to={{ pathname: '/competition/qz2022/apply'}}>参赛报名</Link>

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 (
     <div className="qz_main">
       <div className="step">
@@ -161,15 +172,16 @@ export default Form.create()((props) => {
             </Select>
           )}
           {qzDetail && qzDetail.is_local && <div className="class_from">
+            <span>课题来源</span>
             <Radio.Group onChange={(e)=>{setSourceBy(e.target.value)}} value={sourceBy} defaultValue={1}>
               <Radio value={1}>计划支持</Radio>
               <Radio value={0}>自主提报</Radio>
             </Radio.Group>
-            {helper('课题来源',
+            {sourceBy === 1 && helper('',
               'subject_source_name',
-              [{ required: true, message: "请正确输入课题来源" },
-              { max: 32, message: '超出限制长度32位字符，请重新编辑' }],
-              <Input placeholder="请输入项目名称" onBlur={()=>{verify("subject_source_name")}} disabled={sourceBy === 0}/>
+              [{ max: 32, message: '超出限制长度32位字符，请重新编辑' },
+               { validator: (rule, value, callback)=>{errorSource(rule, value, callback)}}],
+              <Input placeholder="请输入项目名称" onBlur={()=>{verify("subject_source_name")}}/>
             )}
           </div>}
           {helper('电话',

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);

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;

src/military/qz2022/contact/index.scss

@@ -33,7 +33,6 @@
   }
  
   .contact-content {
-    text-align: center;
     font-size: 1rem;
     line-height: 2rem;
     margin-bottom: 1rem;