From 5e12fbdb3b29150ce8246f044ccca54ccf50dd48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Thu, 27 Apr 2023 11:05:40 +0800
Subject: [PATCH 1/4] issue

---
 src/glcc/apply/index.jsx              | 31 +++++++++++++++++++--------
 src/glcc/apply/taskApply.jsx          | 12 ++++++++---
 src/glcc/home/index.jsx               | 17 +++++++++++----
 src/glcc/home/lightspot/index.jsx     | 14 ++++--------
 src/glcc/home/timerShaft/index.jsx    | 12 +++++------
 src/glcc/index.jsx                    |  2 +-
 src/glcc/interimReview/result.jsx     |  4 ++--
 src/glcc/project/index.jsx            |  2 +-
 src/glcc/project/taskDetail/index.jsx |  6 +++---
 9 files changed, 61 insertions(+), 39 deletions(-)

diff --git a/src/glcc/apply/index.jsx b/src/glcc/apply/index.jsx
index f6e918231..14467fe2a 100644
--- a/src/glcc/apply/index.jsx
+++ b/src/glcc/apply/index.jsx
@@ -12,7 +12,8 @@ import './index.scss';
 import { FlexAJ } from '../../forge/Component/layout';
 const Option = Select.Option;
 function Apply(props) {
-  const phonereg = /^([1][3456789])\d{9}$/
+  const phonereg = /(^|\s*\+?0?0?86|\D)(1\d{2})[-\s]{0,3}(\d{4})[-\s]{0,3}(\d{4})(?=\D|$)/
+  const emailreg = /^[a-zA-Z0-9]+([.\-_\\]*[a-zA-Z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/
   const {form, current_user, showNotification, round} = props;
   const {getFieldDecorator, validateFields, setFieldsValue, validateFieldsAndScroll } = form;
   const [reload, setReload] = useState(undefined);
@@ -53,12 +54,16 @@ function Apply(props) {
     // 获取当前用户报名信息
     current_user && getUserApplyInfo({userId: current_user.user_id, round}).then(response=>{
       if(response && response.message === "success"){
-        const {projectName, projectType, gitlinkUrl, contactName, contactPhone, projectIntro, registrationTaskList, projectLogoId} = response.data;
+        setUserApplyInfo(response.data);
+        if(!response.data){
+          return
+        }
+        const {projectName, projectType, gitlinkUrl, contactName, contactPhone, projectIntro, registrationTaskList, projectLogoId, contactMail} = response.data;
         const taskInfo = {};
         const taskCountArr = []
         registrationTaskList.map((item, index)=>{
           taskCountArr.push(index+1);
-          const{taskName, taskUrl, taskDifficulty, taskReward, tutorName, tutorMail, taskDesc} = item;
+          const{taskName, taskUrl, taskDifficulty, taskReward, tutorName, tutorMail, taskDesc, tutorPhone} = item;
           taskInfo[`taskName${index+1}`] = taskName;
           taskInfo[`taskUrl${index+1}`] = taskUrl;
           taskInfo[`taskDifficulty${index+1}`] = taskDifficulty;
@@ -66,14 +71,14 @@ function Apply(props) {
           taskInfo[`tutorName${index+1}`] = tutorName;
           taskInfo[`tutorMail${index+1}`] = tutorMail;
           taskInfo[`taskDesc${index+1}`] = taskDesc;
+          taskInfo[`tutorPhone${index+1}`] = tutorPhone;
         })
         setTaskCount(taskCountArr);
         setFieldsValue({
-          projectName, projectType, gitlinkUrl, contactName, contactPhone, projectIntro,
+          projectName, projectType, gitlinkUrl, contactName, contactPhone, projectIntro, contactMail,
           ...taskInfo,
           logo: {file:{response:{id: projectLogoId}}}
         })
-        setUserApplyInfo(response.data);
       }
     })
   }, [reload])
@@ -102,12 +107,13 @@ function Apply(props) {
             tutorName: values[`tutorName${item}`],
             tutorMail: values[`tutorMail${item}`],
             taskDesc: values[`taskDesc${item}`],
+            tutorPhone: values[`tutorPhone${item}`],
             round
           })
         })
-        const {projectName, projectType, gitlinkUrl, contactName, contactPhone, projectIntro} = values;
+        const {projectName, projectType, gitlinkUrl, contactName, contactPhone, projectIntro, contactMail} = values;
         const params ={
-          projectName, projectType, gitlinkUrl, contactName, contactPhone, projectIntro, registrationTaskList, round,
+          projectName, projectType, gitlinkUrl, contactName, contactPhone, projectIntro, registrationTaskList, round, contactMail,
           projectLogoId: values.logo.file.response.id+"",
           userId: current_user.user_id,
           userName: current_user.username
@@ -235,6 +241,13 @@ function Apply(props) {
               { pattern: phonereg, message: "请输入正确的手机号码"},],
               <Input placeholder="输入项目联系人手机号码" onBlur={()=>{verify("name")}}/>
             )}
+            {helper('联系人邮箱',
+              '',
+              'contactMail',
+              [{ required: true, message: "输入项目联系人邮箱" },
+              { pattern: emailreg, message: "请输入正确的邮箱地址"},],
+              <Input placeholder="输入项目联系人邮箱" onBlur={()=>{verify("name")}}/>
+            )}
             <div className='introArea'>{helper('社区简介',
               '',
               'projectIntro',
@@ -265,9 +278,9 @@ function Apply(props) {
               return <div className='taskApplyBox' key={item}>
                 <FlexAJ className='taskApplyTitleBox'>
                   <div className='taskApplyTitle font-16'>课题信息（<span>{index+1}</span>/5)</div>
-                  {index && <Button type="link" onClick={()=>{deleteTaskApply(item)}}><i className='iconfont icon-shanchuicon3 mr5 font-15'></i>删除</Button>}
+                  {index>0 && <Button type="link" onClick={()=>{deleteTaskApply(item)}}><i className='iconfont icon-shanchuicon3 mr5 font-15'></i>删除</Button>}
                 </FlexAJ>
-                <TaskApply helper={helper} taskKey={item}/>
+                <TaskApply helper={helper} taskKey={item} phonereg={phonereg} emailreg={emailreg}/>
               </div>
             })}
             {taskCount && taskCount.length<5 && <div>
diff --git a/src/glcc/apply/taskApply.jsx b/src/glcc/apply/taskApply.jsx
index 83b2a8ce7..9cfe80a13 100644
--- a/src/glcc/apply/taskApply.jsx
+++ b/src/glcc/apply/taskApply.jsx
@@ -3,8 +3,7 @@ import { Breadcrumb, Button, Form, Input, Select, Upload, Modal, InputNumber } f
 import TextArea from 'antd/lib/input/TextArea';
 const Option = Select.Option;
 function TaskApply(props) {
-  const emailreg = /^[a-zA-Z0-9]+([.\-_\\]*[a-zA-Z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/
-  const {helper, disabled, taskKey} = props;
+  const {helper, disabled, taskKey, phonereg, emailreg} = props;
   // 低、中、高
   const difficultyList = [
     {id: 1, name: "低"},
@@ -58,7 +57,14 @@ function TaskApply(props) {
           { max: 32, message: '超出限制长度32位字符，请重新编辑' }],
           <Input placeholder="请输入导师姓名" disabled = {disabled} className={disabled? "disabledInput":""}/>
         )}
-        {helper('导师邮箱地址',
+        {helper('导师手机号',
+          '',
+          `tutorPhone${taskKey}`,
+          [{ required: true, message: "请输入导师手机号" },
+          { pattern: phonereg, message: "请输入正确的电话号码"},],
+          <Input placeholder="请输入导师手机号" disabled = {disabled} className={disabled? "disabledInput":""}/>
+        )}
+        {helper('导师邮箱',
           '',
           `tutorMail${taskKey}`,
           [{ required: true, message: "请输入导师邮箱地址" },
diff --git a/src/glcc/home/index.jsx b/src/glcc/home/index.jsx
index 39bf210be..d71443730 100644
--- a/src/glcc/home/index.jsx
+++ b/src/glcc/home/index.jsx
@@ -21,7 +21,7 @@ import './index.scss';
 // round：2022届（1） 2023届（2）
 // period: 项目报名阶段（0）
 export default (props) => {
-  const { current_user, isGlccApplyDate, showNotification, studentApplyStart, history, secondStudentApplyDate, isStudentApplyDate, checkedTaskId, checkTime1, checkTime2, checkTime3, round, match:{params:{id}}, period} = props;
+  const { current_user, isGlccApplyDate, showNotification, studentApplyStart, history, secondStudentApplyDate, isStudentApplyDate, checkedTaskId, checkTime1, checkTime2, checkTime3, round, match:{params:{id}}, period, showLoginDialog} = props;
   function goToApply() {
     if (isGlccApplyDate) {
       if (current_user && current_user.login) {
@@ -69,6 +69,15 @@ export default (props) => {
     history.push("/glcc/result");
   }
 
+  // 页面跳转，判断是否登录
+  function gotoCheckLogin(url){
+    if(current_user && current_user.login){
+      history.push(url);
+      return
+    }
+    showLoginDialog();
+  }
+
   return (
     <div className="glcc">
       {/* <Banner /> */}
@@ -99,14 +108,14 @@ export default (props) => {
       {/* 当前glcc */}
       {round === 2 && <div className="applyBox">
         {/* 项目报名入口 */}
-        {period === 0 && <Link to={current_user && current_user.login ? `/glcc/apply` : `/login?go_page=/glcc/apply`} className="apply project" >
+        {period === 0 && <a onClick={()=>{gotoCheckLogin(`/glcc/apply`)}} className="apply project" >
           <div>
             <img src={apply1} alt="" className="applyIcon" />
             <span className="hover-none"><span className="til">项目报名</span> </span>
             {/* <span className="hover-show">项目报名已截止</span> */}
           </div>
           <div className="pt6">项目报名开启，导师席位虚位以待</div>
-        </Link>}
+        </a>}
         {/* 6.28.-7.1 审核结果仅对导师可见，7.1之后对所有用户可见*/}
         {/* {resultTime2 && <div className="apply" onClick={goToCheckResult}>
           <div>
@@ -188,7 +197,7 @@ export default (props) => {
           </div> */}
         </div>
       </div>
-      <Lightspot period={period} history={history} isGlccApplyDate={isGlccApplyDate} current_user={current_user} showNotification={showNotification} goToStudent={goToStudent}/>
+      <Lightspot period={period} history={history} current_user={current_user} round={round} showLoginDialog={showLoginDialog}/>
       <TimerShaft />
       <Award />
       <News />
diff --git a/src/glcc/home/lightspot/index.jsx b/src/glcc/home/lightspot/index.jsx
index 48762e67f..42f279ae4 100644
--- a/src/glcc/home/lightspot/index.jsx
+++ b/src/glcc/home/lightspot/index.jsx
@@ -1,22 +1,17 @@
-import { Button } from 'antd';
 import React from 'react';
-import teacherImg from '../../img/teacher-img.png';
 import lightspot1 from '../../img/lightspot1.png';
 import lightspot2 from '../../img/lightspot2.png';
 import lightspot3 from '../../img/lightspot3.png';
 import lightspot4 from '../../img/lightspot4.png';
-
-
 import './index.scss';
-import { Link } from 'react-router-dom';
 
 
 function Lightspot(props) {
-  const {current_user, isGlccApplyDate, showNotification, goToStudent, period, history} = props;
+  const {current_user, period, history, round, showLoginDialog} = props;
 
   function goToApply(){
     if(current_user && !current_user.login){
-      history.push(`/login?go_page=/glcc/apply`);
+      showLoginDialog();
       return;
     }
     history.push(period === 0 ? `/glcc/apply` : `/glcc/subjects`);
@@ -31,14 +26,13 @@ function Lightspot(props) {
             <div className="teacher-text">
               <h3 className="teacher-invite">有兴趣成为GLCC的导师吗？</h3>
               <div className="teacher-content">想要扩大项目知名度和影响力，为开源项目吸引新鲜血液，培养长期开发者。通过GitLink平台，与高校建立连接，指导开源新人传授他们的开源文化，享受开源的乐趣</div>
-              {period === 0 ? <div className='applyBut' onClick={goToApply}>立即报名</div> : <div className='applyBut project'><span className='hover-none'>项目报名</span><span className='hover-show'>项目报名已截止</span></div>}
+              {period === 0 && round === 2 ? <div className='applyBut' onClick={goToApply}>立即报名</div> : <div className='applyBut project'><span className='hover-none'>项目报名</span><span className='hover-show'>已结束</span></div>}
             </div>
             <div className="teacher-text">
               <h3 className="teacher-invite">你是开源新手，有兴趣参加GLCC吗？</h3>
               <div className="teacher-content">想要参与一线开源项目开发，熟悉开源社区运作流程，接受资深开源软件专家指导，获得丰厚奖金和实习机会。参加GLCC，开启全新的开源之旅。</div>
-              {period === 2 ? <div className='applyBut' onClick={goToApply}>学生报名</div> : <div className='applyBut project'><span className='hover-none'>学生报名</span><span className='hover-show'>{period<2 ? "敬请期待" : "已结束"}</span></div>}
+              {period === 2 && round === 2 ? <div className='applyBut' onClick={goToApply}>学生报名</div> : <div className='applyBut project'><span className='hover-none'>学生报名</span><span className='hover-show'>{period<2 && round === 2 ? "敬请期待" : "已结束"}</span></div>}
             </div>
-            {/* <img className="teacher-img" src={teacherImg} alt=''></img> */}
           </div>
 
           <div className="info-student">
diff --git a/src/glcc/home/timerShaft/index.jsx b/src/glcc/home/timerShaft/index.jsx
index 130249eeb..a8a397de4 100644
--- a/src/glcc/home/timerShaft/index.jsx
+++ b/src/glcc/home/timerShaft/index.jsx
@@ -14,12 +14,12 @@ const stepArr = [{
 },
 {
   title: "Step2",
-  date: "5.30-6.5",
+  date: "5.30-6.3",
   content: "公示项目、课题名单"
 },
 {
   title: "Step2",
-  date: "6.5-6.23",
+  date: "6.4-6.21",
   content: "学生报名，提交Proposal"
 },
 {
@@ -30,22 +30,22 @@ const stepArr = [{
 },
 {
   title: "Step2",
-  date: "7.1-8.15",
+  date: "7.1-8.11",
   content: "项目开发第一阶段",
 },
 {
   title: "Step2",
-  date: "8.16-8.25",
+  date: "8.20",
   content: "中期考核，公示考核结果",
 },
 {
   title: "Step2",
-  date: "8.26-10.08",
+  date: "8.21-9.28",
   content: "项目开发第二阶段",
 },
 {
   title: "Step2",
-  date: "10.09-10.16",
+  date: "10.11",
   content: "结项审核，公示考核结果",
 },
 {
diff --git a/src/glcc/index.jsx b/src/glcc/index.jsx
index ecdc96d9e..ffed816c1 100644
--- a/src/glcc/index.jsx
+++ b/src/glcc/index.jsx
@@ -242,7 +242,7 @@ const Glcc = (propsF) => {
         <Route
           path="/glcc/:id/final/result"
           render={(props) => (
-            <MiddleResult round={round} current_user={current_user} history={props.history} checkTime3={checkTime3}/>
+            <MiddleResult id={id} round={round} current_user={current_user} history={props.history} checkTime3={checkTime3}/>
           )}
         ></Route>
 
diff --git a/src/glcc/interimReview/result.jsx b/src/glcc/interimReview/result.jsx
index 0f79b9d53..fc225c96b 100644
--- a/src/glcc/interimReview/result.jsx
+++ b/src/glcc/interimReview/result.jsx
@@ -11,7 +11,7 @@ import '../project/index.scss';
 const { Search } = Input;
 
 // 课题列表
-function CheckResult({current_user, history, checkTime3, round}) {
+function CheckResult({current_user, history, checkTime3, round, id}) {
   // 输入搜索框
   const [keyword, setKeyword] = useState(undefined);
   const [data, setData] = useState([]);
@@ -107,7 +107,7 @@ function CheckResult({current_user, history, checkTime3, round}) {
       <img className="bannerInterim" src={resultBanner} alt=""></img>
       <div className='bgBox'>
         <div className="resultList">
-          <div className='goBackBox'><a href='/glcc'>开源夏令营 / </a>结项课题考核结果公示</div>
+          <div className='goBackBox'><a href={`/glcc/${id}`}>开源夏令营 / </a>结项课题考核结果公示</div>
           <div className='searchBox'>
             <Search className='search' placeholder='请输入学生姓名或课题名称进行搜索' allowClear enterButton onSearch={(value) => { setCurrent(1); setKeyword(value) }} />
             <div style={{width: 100}}></div>
diff --git a/src/glcc/project/index.jsx b/src/glcc/project/index.jsx
index 1960172dc..13988dfe0 100644
--- a/src/glcc/project/index.jsx
+++ b/src/glcc/project/index.jsx
@@ -34,7 +34,7 @@ function Project(propsF) {
         <Link to={`/glcc/${id}/projects`} className={pathname.endsWith('projects') ? 'active' : ''}>项目列表</Link>
       </div>
       <div className='gobackBox'>
-        <a href='/glcc'>开源夏令营 / </a>
+        <a href={`/glcc/${id}`}>开源夏令营 / </a>
         课题及项目列表
       </div>
       <Spin spinning={false}>
diff --git a/src/glcc/project/taskDetail/index.jsx b/src/glcc/project/taskDetail/index.jsx
index 1dac4ff55..941d895dd 100644
--- a/src/glcc/project/taskDetail/index.jsx
+++ b/src/glcc/project/taskDetail/index.jsx
@@ -7,7 +7,7 @@ import './index.scss';
 
 // 课题列表
 function TaskDetail(props) {
-  const {match, location, isStudentApplyDate, secondStudentApplyDate, applyTaskId, applyTask} = props
+  const {match, location, isStudentApplyDate, secondStudentApplyDate, applyTaskId, applyTask, match:{params:{id}}} = props
   const taskId = Number(match.params.taskId);
   const [detail, setDetail] = useState(undefined);
 
@@ -26,8 +26,8 @@ function TaskDetail(props) {
         {detail && <div className="bgBox">
           <div className="detailBox">
             <div className='goBackBox'>
-              <a href='/glcc'>开源夏令营 / </a>
-              <a href='/glcc/subjects'>课题及项目列表 / </a>
+              <a href={`/glcc/${id}`}>开源夏令营 / </a>
+              <a href={`/glcc/${id}/subjects`}>课题及项目列表 / </a>
               课题详情
             </div>
           </div>

From d1eb2c28acf4fde3fd341fadd34478c36093bb61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Thu, 27 Apr 2023 13:39:19 +0800
Subject: [PATCH 2/4] issue

---
 src/glcc/home/index.jsx            |  4 +--
 src/glcc/home/partner/index.jsx    | 49 ++++++++++++++++++++-------
 src/glcc/home/timerShaft/index.jsx | 53 ++++++++++++++++++++++++++++--
 3 files changed, 90 insertions(+), 16 deletions(-)

diff --git a/src/glcc/home/index.jsx b/src/glcc/home/index.jsx
index d71443730..3bb8e85bd 100644
--- a/src/glcc/home/index.jsx
+++ b/src/glcc/home/index.jsx
@@ -198,10 +198,10 @@ export default (props) => {
         </div>
       </div>
       <Lightspot period={period} history={history} current_user={current_user} round={round} showLoginDialog={showLoginDialog}/>
-      <TimerShaft />
+      <TimerShaft round={round}/>
       <Award />
       <News />
-      <Partner />
+      <Partner round={round}/>
       <Contact />
     </div>
   )
diff --git a/src/glcc/home/partner/index.jsx b/src/glcc/home/partner/index.jsx
index ae045815e..03c42fbfc 100644
--- a/src/glcc/home/partner/index.jsx
+++ b/src/glcc/home/partner/index.jsx
@@ -38,13 +38,13 @@ import log69 from '../../img/69@2x.png';
 import log70 from '../../img/浙江大学.png';
 import logo1 from '../../img/logo1.png';
 import logo2 from '../../img/logo2.png';
-function Partner() {
+function Partner({round}) {
 
   return (
     <div className="partner">
       <div className="glcc-content">
         <h3 className="glcc-tit">组织方及合作伙伴</h3>
-        <div className='cont1 cont mb10'>
+        {round === 2 && <div className='cont1 cont mb10'>
           <div>
             主办方
             <div onClick={() => { window.open("https://www.ccf.org.cn/") }} className='div8b9'><img src={ccf1} /></div>
@@ -60,39 +60,64 @@ function Partner() {
               <div onClick={() => { window.open("http://111.8.36.180:81/#/about") }} className='div8b9'><img src={xjy} className='xjy' /></div>
             </div>
           </div>
-        </div>
+        </div>}
 
-        <div className='cont cont3 mt15'>
+        {round === 2 && <div className='cont cont3 mt15'>
           钻石赞助商
           <div className='pt10'>
             <div className="sponsor" onClick={() => { window.open("https://www.bytedance.com/") }}><img src={sponsor43} className='gitlink' alt='字节跳动' /></div>
           </div>
-        </div>
-{/* 
-        <div className='cont cont3 mt15'>
+        </div>}
+
+        {round === 1 && <div className='cont1 cont mb10'>
+          <div>
+            主办方
+            <div onClick={() => { window.open("https://www.ccf.org.cn/") }} className='div8b9'><img src={ccf1} /></div>
+          </div>
+          <div>
+            承办方
+            <div onClick={() => { window.open("https://www.ccf.org.cn/kyfzwyh/") }} className='div8b9'><img src={ccf} /></div>
+          </div>
+          <div>
+            协办方
+            <div className='flex_div'>
+              <div onClick={() => { window.open("https://www.gitlink.org.cn/") }} className='div8b9 mr35'><img src={gitlink} className='gitlink' /></div>
+              <div onClick={() => { window.open("http://111.8.36.180:81/#/about") }} className='div8b9'><img src={xjy} className='xjy' /></div>
+            </div>
+          </div>
+        </div>}
+
+        {round === 1 && <div className='cont cont3 mt15'>
+          特邀合作单位
+          <div className='pt10'>
+            <div className="sponsor" onClick={() => { window.open("https://github.com/open-mmlab") }}><img src={sponsor11} className='gitlink' alt='OpenMMLab' /></div>
+          </div>
+        </div>}
+
+        {round === 1 && <div className='cont cont3 mt15'>
           白金赞助商
           <div className='pt10'>
             <div className="sponsor" onClick={() => { window.open("http://www.baidu.com/") }}><img src={sponsor21} className='gitlink' alt='百度' /></div>
             <div className="sponsor" onClick={() => { window.open("https://www.antgroup.com/") }}><img src={sponsor22} className='gitlink' alt='蚂蚁集团' /></div>
             <div className="sponsor" onClick={() => { window.open("https://www.alibaba.com/") }}><img src={sponsor23} className='gitlink' alt='阿里巴巴' /></div>
           </div>
-        </div>
+        </div>}
 
-        <div className='cont cont3 mt15'>
+        {round === 1 && <div className='cont cont3 mt15'>
           黄金赞助商
           <div className='pt10'>
             <div className="sponsor" onClick={() => { window.open("https://aws.amazon.com/cn/") }}><img src={sponsor31} className='gitlink' alt='亚马逊云科技' /></div>
             <div className="sponsor" onClick={() => { window.open("https://www.didiglobal.com/") }}><img src={sponsor32} className='gitlink' alt='滴滴出行' /></div>
             <div className="sponsor" onClick={() => { window.open("https://www.99cloud.net/") }}><img src={sponsor33} className='gitlink' alt='九州云' /></div>
           </div>
-        </div>
+        </div>}
 
-        <div className='cont cont3 mt15'>
+        {round === 1 && <div className='cont cont3 mt15'>
           白银赞助商
           <div className='pt10'>
             <div className="sponsor" onClick={() => { window.open(" https://www.cloudwego.io/") }}><img src={sponsor41} className='gitlink' alt='cloudwego' /></div>
           </div>
-        </div> */}
+        </div>}
 
 
         <div className='cont cont3 mt15'>
diff --git a/src/glcc/home/timerShaft/index.jsx b/src/glcc/home/timerShaft/index.jsx
index a8a397de4..902ae44d1 100644
--- a/src/glcc/home/timerShaft/index.jsx
+++ b/src/glcc/home/timerShaft/index.jsx
@@ -2,6 +2,54 @@ import React from 'react';
 import Step from './step';
 import './index.scss';
 
+const stepArr2022 = [{
+  title: "Step1",
+  date: "4.15",
+  content: "GLCC夏令营活动发布"
+},
+{
+  title: "Step2",
+  date: "4.15-5.19",
+  content: "社区项目报名，提交课题"
+},
+{
+  title: "Step2",
+  date: "5.20-5.25",
+  content: "公示社区项目名单"
+},
+{
+  title: "Step2",
+  date: "5.26-6.24",
+  content: "学生报名，提交Proposal"
+},
+{
+  title: "Step2",
+  date: "7.1",
+  content: "公示入选学生名单",
+  noArrow: true,
+},
+{
+  title: "Step2",
+  date: "7.1-8.12",
+  content: "项目开发第一阶段",
+},
+{
+  title: "Step2",
+  date: "8.12-9.30",
+  content: "项目开发第二阶段",
+},
+{
+  title: "Step2",
+  date: "10.1-10.21",
+  content: "结项审核，并公示考核结果",
+},
+{
+  title: "Step2",
+  date: "10.21-11.11",
+  content: "评选公布优秀项目和学员",
+  noArrow: true,
+}
+]
 const stepArr = [{
   title: "Step1",
   date: "4.29",
@@ -56,7 +104,8 @@ const stepArr = [{
 }
 ]
 
-function TimerShaft() {
+function TimerShaft({round}) {
+  const step = round === 2 ? stepArr : stepArr2022
 
   return (
     <div className="timerShaft">
@@ -64,7 +113,7 @@ function TimerShaft() {
         <h3 className="glcc-tit">时间规划</h3>
         <div className="time-content">
           {
-            stepArr.map((item, i) => {
+            step.map((item, i) => {
               return <Step {...item} title={`Step${i + 1}`} key={i}/>
             })
           }

From 34f00361c04f845535d2de5d388f55ce5fa06cdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Thu, 27 Apr 2023 14:51:10 +0800
Subject: [PATCH 3/4] =?UTF-8?q?2022glcc=E9=A6=96=E9=A1=B5=E6=81=A2?=
 =?UTF-8?q?=E5=A4=8DOpenMMLab?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/glcc/home/index.jsx | 4 ++--
 src/glcc/index.jsx      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/glcc/home/index.jsx b/src/glcc/home/index.jsx
index 3bb8e85bd..67a708e1d 100644
--- a/src/glcc/home/index.jsx
+++ b/src/glcc/home/index.jsx
@@ -185,7 +185,7 @@ export default (props) => {
             <img src={introduce} alt="" className="introduceImg" />
           </div>
           {/* 活动特邀合作单位 */}
-          {/* <div className="openMMlabBox">
+          {round === 1 && <div className="openMMlabBox">
             <div className="logoTitle">
               <img src={logo} alt="" className="logo"/>
               <span className="title">活动特邀合作单位 OpenMMLab</span>
@@ -194,7 +194,7 @@ export default (props) => {
             </div>
             <div className="intro">OpenMMLab是深度学习时代最完整的计算机视觉开源算法体系。自开源以来，累计发布了超过20个算法库，有超过300个算法2300多个预训练模型。所有算法均具备风格统一、模型丰富、质量高、易复现等特点。在社区生态上，OpenMMLab一直秉持开放、认真、持续成长的原则，积极推动社区建设发展</div>
             <div className="goToButBox"><button className="goToBut" onClick={()=>{window.location.href='/glcc/openmmlab'}}>查看详情</button></div>
-          </div> */}
+          </div>}
         </div>
       </div>
       <Lightspot period={period} history={history} current_user={current_user} round={round} showLoginDialog={showLoginDialog}/>
diff --git a/src/glcc/index.jsx b/src/glcc/index.jsx
index ffed816c1..885c7f37d 100644
--- a/src/glcc/index.jsx
+++ b/src/glcc/index.jsx
@@ -223,12 +223,12 @@ const Glcc = (propsF) => {
         ></Route>
 
         {/* openmmlab列表 */}
-        {/* <Route
+        <Route
           path="/glcc/openmmlab"
           render={(props) => (
             <Openmmlab {...propsF} {...props} isStudentApplyDate={isStudentApplyDate} secondStudentApplyDate={secondStudentApplyDate} applyTaskId={applyTaskId} setStudentInfoReset={setStudentInfoReset} applyTask={applyTask}/>
           )}
-        ></Route> */}
+        ></Route>
 
         {/* 审核结果页面 */}
         <Route

From ef84ea8529c1d6e940e01e3e65c5e63dd7546247 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Thu, 27 Apr 2023 15:17:18 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/glcc/apply/index.jsx | 4 ++--
 src/glcc/index.jsx       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/glcc/apply/index.jsx b/src/glcc/apply/index.jsx
index 14467fe2a..07ddfb38a 100644
--- a/src/glcc/apply/index.jsx
+++ b/src/glcc/apply/index.jsx
@@ -52,7 +52,7 @@ function Apply(props) {
 
   useEffect(()=>{
     // 获取当前用户报名信息
-    current_user && getUserApplyInfo({userId: current_user.user_id, round}).then(response=>{
+    current_user && round && getUserApplyInfo({userId: current_user.user_id, round}).then(response=>{
       if(response && response.message === "success"){
         setUserApplyInfo(response.data);
         if(!response.data){
@@ -81,7 +81,7 @@ function Apply(props) {
         })
       }
     })
-  }, [reload])
+  }, [])
 
   // 当用户输入结束时 检验用户输入是否符合规范
   function verify(dataIndex){
diff --git a/src/glcc/index.jsx b/src/glcc/index.jsx
index 885c7f37d..1c50bac14 100644
--- a/src/glcc/index.jsx
+++ b/src/glcc/index.jsx
@@ -133,8 +133,8 @@ const Glcc = (propsF) => {
   }, [])
 
   useEffect(()=>{
-    // 获取用户课题报名信息
-    current_user && current_user.login && getStudentApplyInfo({userId: current_user.user_id}).then(response=>{
+    // 获取用户课题报名信息(todo：学生报名阶段请求)
+    false && current_user && current_user.login && getStudentApplyInfo({userId: current_user.user_id}).then(response=>{
       if(response && response.message === "success"){
         // setData(response.data.rows);
         const data = {};