From 6b79378cc660e155d40f376581d32ee917eca6da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <hetongchong@csxjy.com>
Date: Fri, 20 May 2022 14:31:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E5=90=8D=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=8F=8A=E6=8A=A5=E5=90=8D=E6=A0=B7=E5=BC=8F=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/glcc/student/index.jsx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/glcc/student/index.jsx b/src/glcc/student/index.jsx
index 0656c3901..115f9245b 100644
--- a/src/glcc/student/index.jsx
+++ b/src/glcc/student/index.jsx
@@ -33,7 +33,7 @@ function Apply(props) {
   const [loading, setLoading] = useState(false);
   const [reload, setReload] = useState();
   const [userApplyInfo, setUserApplyInfo] = useState(undefined);
-  const [editable, setEditable] = useState(true);
+  const [editable, setEditable] = useState(isStudentApplyDate);
   const [files, setFiles] = useState([]);
   const [files1, setFiles1] = useState([]);
   const initTask = {
@@ -56,9 +56,9 @@ function Apply(props) {
     });
     // window.scrollTo(0, 50);
 
-    if (!isStudentApplyDate) {
+    if (new Date().getTime() < new Date('2022-05-26').getTime()) {
       // 不在开源夏令营报名时间之内
-      // window.location.href = "/glcc/student/2";
+      window.location.href = "/glcc/student/2";
     } else if (current_user && current_user.login) {
 
     } else {
@@ -390,14 +390,14 @@ function Apply(props) {
                 {getFieldDecorator("location", {
                   rules: []
                 })(
-                  <Cascader popupClassName="glcc_cascader" placeholder="请选择省份城市" options={locData} className={editable ? "" : "disabledInput"} disabled={editable ? false : true} />
+                  <Cascader  expandTrigger="hover" popupClassName="glcc_cascader" placeholder="请选择省份城市" options={locData} className={editable ? "" : "disabledInput"} disabled={editable ? false : true} />
                 )}
               </Form.Item>
               {helper('所在年级',
                 '',
                 'grade',
                 [],
-                <Select placeholder="请选择所在年级" expandTrigger="hover" disabled={editable ? false : true} className={editable ? "" : "disabledInput"} dropdownClassName="glcc_select">
+                <Select placeholder="请选择所在年级" disabled={editable ? false : true} className={editable ? "" : "disabledInput"} dropdownClassName="glcc_select">
                   {gradeList.map(item => { return <Option value={item.name} key={item.id}>{item.name}</Option> })}
                 </Select>
               )}