diff --git a/src/glcc/api.js b/src/glcc/api.js index 925fb4ec..20f6df6b 100644 --- a/src/glcc/api.js +++ b/src/glcc/api.js @@ -1,20 +1,22 @@ import fetch from './fetch'; // 当前glcc -export const currentRound = 4; +export const currentRound = 5; export const rewardMoney = "现金奖励" export const rewardSettingRound = 3; export const yearByRound = { 1: 2022, 2: 2023, 3: 2024, - 4: 2025 + 4: 2025, + 5: 2026 } export const roundByYear = { 2022: 1, 2023: 2, 2024: 3, - 2025: 4 + 2025: 4, + 2026: 5 } // 获取当前用户项目报名信息(项目、课题) diff --git a/src/glcc/home/index.jsx b/src/glcc/home/index.jsx index ced50f6d..393db93d 100644 --- a/src/glcc/home/index.jsx +++ b/src/glcc/home/index.jsx @@ -11,6 +11,7 @@ import PreviousReview from './previousReview'; import banner from "../img/banner.png"; import banner2024 from "../img/banner2024.jpg"; import banner2025 from "../img/banner2025.jpg"; +import banner2026 from "../img/banner2026.png"; import introduce from "../img/introduce.png"; import apply1 from "../img/apply1.png"; import apply2 from "../img/apply2.png"; @@ -43,7 +44,7 @@ export default (props) => { return (
- + {/* 往期回顾 */} {round !== currentRound ?
diff --git a/src/glcc/home/previousReview/index.jsx b/src/glcc/home/previousReview/index.jsx index 1573f0de..a364abe3 100644 --- a/src/glcc/home/previousReview/index.jsx +++ b/src/glcc/home/previousReview/index.jsx @@ -110,7 +110,60 @@ function Lightspot({round}) { noArrow: true, } ] - const step = round === 2 ? stepArr2023 : stepArr2022 + const stepArr2025 = [{ + title: "Step1", + date: "4.15", + content: "GLCC夏令营活动发布" + }, + { + title: "Step2", + date: "4.15-7.4", + content: "社区项目报名,提交课题" + }, + { + title: "Step2", + date: "5.1-7.1", + content: "课题审核及公布" + }, + { + title: "Step2", + date: "5.22-7.5", + content: "学生报名,提交Proposal" + }, + { + title: "Step2", + date: "7.10", + content: "公示入选学生名单", + noArrow: true, + }, + { + title: "Step2", + date: "6.28-8.10", + content: "项目开发第一阶段", + }, + { + title: "Step2", + date: "8.22", + content: "中期考核,公示考核结果", + }, + { + title: "Step2", + date: "8.22-9.14", + content: "项目开发第二阶段", + }, + { + title: "Step2", + date: "9.26", + content: "结项考核,公示考核结果", + }, + { + title: "Step2", + date: "10", + content: "优秀项目/学生公布及颁奖", + noArrow: true, + } + ] + const step = round === 4 ? stepArr2025 : round === 2 ? stepArr2023 : stepArr2022 return (
diff --git a/src/glcc/home/timerShaft/index.jsx b/src/glcc/home/timerShaft/index.jsx index 93c94280..5c9b6f7b 100644 --- a/src/glcc/home/timerShaft/index.jsx +++ b/src/glcc/home/timerShaft/index.jsx @@ -123,7 +123,7 @@ function TimerShaft(props) {
-
+ {/*

时间规划

@@ -134,7 +134,7 @@ function TimerShaft(props) { }
-
+
*/} ) } diff --git a/src/glcc/img/banner2026.png b/src/glcc/img/banner2026.png new file mode 100644 index 00000000..a21c345c Binary files /dev/null and b/src/glcc/img/banner2026.png differ diff --git a/src/glcc/siderBarHelp.js b/src/glcc/siderBarHelp.js index 0645bf2a..1d21d552 100644 --- a/src/glcc/siderBarHelp.js +++ b/src/glcc/siderBarHelp.js @@ -29,6 +29,11 @@ function SiderBar() { GLCC2024 + + + GLCC2025 + + );