@@ -19,16 +30,27 @@ function News() {
*/}
-
-
此处为新闻中心的标题内容此处为新闻中心的标题内容此处为新闻中心
-
此处为新闻中心的详情此处为新闻中心的详情此处为新闻中心的详情此处为新闻中心的详情此处为新闻中心的详情此处为新闻中心的详情此处为新闻中心的详情此处为新闻中心的详情
-
-
2022-04-02
-
-
+
+ {list.length &&
+
{list[0].title}
+
{list[0].created_time && list[0].created_time.split(' ')[0]}
+
+
}
-
+ {
+ list.map((item, i) => {
+ return i ?
+
{item.title}
+
+
{item.created_time && item.created_time.split(' ')[0]}
+
+
+
: ''
+
+ })
+ }
+ {/*
此处为新闻中心的标题内容此处为新闻中心的标题内容此处为新闻中心
2022-04-02
@@ -58,7 +80,7 @@ function News() {
2022-04-02
-
+
*/}
diff --git a/src/glcc/home/news/index.scss b/src/glcc/home/news/index.scss
index 2f60ff2b..e7713844 100644
--- a/src/glcc/home/news/index.scss
+++ b/src/glcc/home/news/index.scss
@@ -17,17 +17,18 @@
height: 276px;
color: #fff;
line-height: 30px;
- padding: 30px 20px;
+ padding: 40px 20px;
.news-tit {
font-weight: 500;
font-size: 18px;
color: #fff;
margin-bottom: 13px !important;
+ min-height: 56px;
}
.news-date {
opacity: 85%;
font-size: 14px;
- margin:15px 0;
+ margin:15px 0 44px;
}
.main-news-content {
opacity: 85%;
@@ -59,6 +60,7 @@
color: #1e1e1e;
font-size: 16px;
line-height: 30px;
+ min-height: 56px;
}
.news-date {
@@ -69,7 +71,6 @@
&:hover {
background: url("../../img/news-item.png");
background-size: 100% 100%;
- border: 0;
.news-tit,
.news-date {
color: #fff;
diff --git a/src/glcc/home/timerShaft/index.jsx b/src/glcc/home/timerShaft/index.jsx
index 70f238cd..930ac780 100644
--- a/src/glcc/home/timerShaft/index.jsx
+++ b/src/glcc/home/timerShaft/index.jsx
@@ -4,48 +4,48 @@ import './index.scss';
const stepArr = [{
title: "Step1",
- date: "4月15日",
+ date: "4.15",
content: "GLCC发布"
},
{
title: "Step2",
- date: "4月15日-5月8日",
+ date: "4.15-5.8",
content: "社区启动报名"
},
{
title: "Step2",
- date: "5月20日",
+ date: "5.20",
content: "公示社区名单"
},
{
title: "Step2",
- date: "5月21日-6月19日",
+ date: "5.21-6.19",
content: "学生提交proposal"
},
{
title: "Step2",
- date: "7月1日",
+ date: "7.1",
content: "公示项目申请审核结果",
noArrow: true,
},
{
title: "Step2",
- date: "7月4日-8月12日",
+ date: "7.4-8.12",
content: "项目开发第一阶段",
},
{
title: "Step2",
- date: "8月12日-9月30日",
+ date: "8.12-9.30",
content: "项目开发第二阶段",
},
{
title: "Step2",
- date: "10月1日-10月14日",
+ date: "10.1-10.14",
content: "结项审核",
},
{
title: "Step2",
- date: "11月11日",
+ date: "11.11",
content: "公布优秀项目&学员",
noArrow: true,
}
@@ -60,7 +60,7 @@ function TimerShaft() {
{
stepArr.map((item, i) => {
- return
+ return
})
}
diff --git a/src/glcc/home/timerShaft/index.scss b/src/glcc/home/timerShaft/index.scss
index 19c40457..631eed93 100644
--- a/src/glcc/home/timerShaft/index.scss
+++ b/src/glcc/home/timerShaft/index.scss
@@ -12,7 +12,6 @@
display: flex;
flex-flow: row wrap;
justify-content: center;
-
}
.step-item {
display: flex;
@@ -25,28 +24,31 @@
width: 201.69px;
height: 178.93px;
text-align: center;
- padding: 25px 0 10px;
+ padding: 34px 0 10px;
line-height: 26px;
font-weight: 700;
}
.sexange-tit {
- color: #124599;
- font-size: 26px;
- line-height: 37px;
- margin-bottom: 10px !important;
+ font-weight: 700;
+ color: #202d40;
+ font-size: 18px;
+ line-height: 26px;
+ margin-bottom: 11px !important;
}
.sexange-date {
- color: #202d40;
- font-size: 18px;
margin-bottom: 8px;
+ font-weight: 700;
+ color: #124599;
+ font-size: 22px;
+ line-height: 26px;
}
.sexange-content {
font-weight: 500;
color: #6c7283;
font-size: 15px;
- width: 60%;
+ width: 55%;
margin: 0 auto;
}
diff --git a/src/glcc/img/banner.png b/src/glcc/img/banner.png
new file mode 100644
index 00000000..0c839df4
Binary files /dev/null and b/src/glcc/img/banner.png differ
diff --git a/src/glcc/img/introduce-bg.png b/src/glcc/img/introduce-bg.png
new file mode 100644
index 00000000..380eaf0e
Binary files /dev/null and b/src/glcc/img/introduce-bg.png differ
diff --git a/src/glcc/img/lightspot-bg.png b/src/glcc/img/lightspot-bg.png
index 75d78ce5..c7fd56c0 100644
Binary files a/src/glcc/img/lightspot-bg.png and b/src/glcc/img/lightspot-bg.png differ
diff --git a/src/glcc/img/lightspot1.png b/src/glcc/img/lightspot1.png
new file mode 100644
index 00000000..aa3877f2
Binary files /dev/null and b/src/glcc/img/lightspot1.png differ
diff --git a/src/glcc/img/lightspot2.png b/src/glcc/img/lightspot2.png
new file mode 100644
index 00000000..710cf6dd
Binary files /dev/null and b/src/glcc/img/lightspot2.png differ
diff --git a/src/glcc/img/lightspot3.png b/src/glcc/img/lightspot3.png
new file mode 100644
index 00000000..32140378
Binary files /dev/null and b/src/glcc/img/lightspot3.png differ
diff --git a/src/glcc/img/lightspot4.png b/src/glcc/img/lightspot4.png
new file mode 100644
index 00000000..bf8a551e
Binary files /dev/null and b/src/glcc/img/lightspot4.png differ