diff --git a/src/Home/Content4.jsx b/src/Home/Content4.jsx index 1321538..3421074 100644 --- a/src/Home/Content4.jsx +++ b/src/Home/Content4.jsx @@ -15,9 +15,7 @@ function Content4(props) { type: "from", ease: "easeOutQuad", }; - const videoChildren = dataSource.video.children.video; - const videoNameArray = videoChildren.split("."); - const type = videoNameArray[videoNameArray.length - 1]; + return (
@@ -31,18 +29,28 @@ function Content4(props) { {...dataSource.video} > {isMobile ? ( - - ) : ( - + ) : ( + )} diff --git a/src/Home/data.source.js b/src/Home/data.source.js index bca800f..e6be88f 100644 --- a/src/Home/data.source.js +++ b/src/Home/data.source.js @@ -24,7 +24,7 @@ import jicheng from "../picture/jicheng.png"; import ketang from "../picture/ketang.png"; import weixiu from "../picture/weixiu.png"; -import weixiu1 from "../picture/weixiu1.png"; + import xianshang from "../picture/xianshang.png"; import xuesheng from "../picture/xuesheng.png"; import zhiban from "../picture/zhiban.png"; @@ -32,10 +32,15 @@ import zhiyuanzhe from "../picture/zhiyuanzhe.png"; import qrwexin from "../picture/qr-wexin.jpg"; import qrbilibili from "../picture/qr-bilibili.jpg"; import qrqq from "../picture/qr-qq.jpg"; +import beian from "../picture/beian.png"; const style_qrtest = { width: "100%", height: "100%", }; +const style_beian = { + width: "18px", + height: "18px", +}; export const Nav30DataSource = { wrapper: { className: "header3 home-page-wrapper" }, page: { className: "home-page" }, @@ -255,12 +260,12 @@ export const Feature30DataSource = { title: { className: "content3-title k6rof9gjex-editor_css", children: ( - <> +

财外部

- +
), }, content: { @@ -291,12 +296,12 @@ export const Feature30DataSource = { title: { className: "content3-title k6rogxj5m3r-editor_css", children: ( - <> +

文宣部

- +
), }, content: { @@ -327,12 +332,12 @@ export const Feature30DataSource = { title: { className: "content3-title k6rohgkzazi-editor_css", children: ( - <> +

人资部

- +
), }, content: { @@ -363,12 +368,12 @@ export const Feature30DataSource = { title: { className: "content3-title k6roi0sr9o-editor_css", children: ( - <> +

电脑部

- +
), }, content: { @@ -399,12 +404,12 @@ export const Feature30DataSource = { title: { className: "content3-title k6roin896g-editor_css", children: ( - <> +

电器部

- +
), }, content: { @@ -521,11 +526,11 @@ export const Feature80DataSource = { name: "title", className: "feature8-block-title", children: ( - <> +

日常值班

- +
), }, { @@ -560,17 +565,19 @@ export const Feature80DataSource = { { name: "image", className: "feature8-block-image", - children: , + children: ( + xianshang + ), }, { name: "title", className: "feature8-block-title", children: ( - <> +

- 线上交流 + 线上咨询

- +
), }, { @@ -604,17 +611,19 @@ export const Feature80DataSource = { { name: "image", className: "feature8-block-image", - children: , + children: ( + diannanbu + ), }, { name: "title", className: "feature8-block-title", children: ( - <> +

公益进社会

- +
), }, { @@ -648,18 +657,20 @@ export const Feature80DataSource = { { name: "image", className: "feature8-block-image", - children: , + children: ( + zhiyuanzhe + ), }, { name: "title", className: "feature8-block-title", children: ( - <> +

志愿服务

- +
), }, { @@ -708,18 +719,18 @@ export const Feature80DataSource = { { name: "image", className: "feature8-block-image", - children: , + children: weixiu, }, { name: "title", className: "feature8-block-title", children: ( - <> +

校园维修&社区维修

- +
), }, { @@ -753,18 +764,18 @@ export const Feature80DataSource = { { name: "image", className: "feature8-block-image", - children: , + children: huodong, }, { name: "title", className: "feature8-block-title", children: ( - <> +

社团精品活动

- +
), }, { @@ -799,18 +810,18 @@ export const Feature80DataSource = { name: "image", className: "feature8-block-image", - children: , + children: ketang, }, { name: "title", className: "feature8-block-title", children: ( - <> +

维修知识课堂

- +
), }, { @@ -844,7 +855,7 @@ export const Feature80DataSource = { { name: "image", className: "feature8-block-image", - children: , + children: xuesheng, }, { name: "title", @@ -904,7 +915,7 @@ export const Feature80DataSource = { { name: "image", className: "feature8-block-image", - children: , + children: jicheng, }, { name: "title", @@ -921,12 +932,12 @@ export const Feature80DataSource = { name: "content", className: "feature8-block-content k6ry0mq0ks-editor_css", children: ( - <> +

    积极追求参与竞赛等创新实践活动

- +
), }, ], @@ -948,7 +959,9 @@ export const Feature80DataSource = { { name: "image", className: "feature8-block-image", - children: , + children: ( + fenxiang1 + ), }, { name: "title", @@ -965,12 +978,12 @@ export const Feature80DataSource = { name: "content", className: "feature8-block-content k6ry1c380kk-editor_css", children: ( - <> +

“中控杯”参赛经验分享 

- +
), }, ], @@ -992,7 +1005,9 @@ export const Feature80DataSource = { { name: "image", className: "feature8-block-image", - children: , + children: ( + fenxiang2 + ), }, { name: "title", @@ -1036,7 +1051,7 @@ export const Feature80DataSource = { { name: "image", className: "feature8-block-image", - children: , + children: diy, }, { name: "title", @@ -1883,9 +1898,19 @@ export const Footer10DataSource = { className: "copyright", children: ( - ©2020 浙江大学学生E志者协会 All Rights Reserved -

- 浙ICP备20022913号-2 + + ©2008-2020 浙江大学学生E志者协会 All Rights Reserved + +

+ + 浙ICP备20022913号-2 + 我爬了 + + + 浙公网安备 33010602011155号 + + +

), }, @@ -2151,9 +2176,17 @@ export const Content40DataSource = { }, video: { className: "content4-video", - children: { - video: "https://os.alipayobjects.com/rmsportal/EejaUGsyExkXyXr.mp4", - image: "https://zos.alipayobjects.com/rmsportal/HZgzhugQZkqUwBVeNyfz.jpg", - }, + children: ( + + ), }, }; diff --git a/src/Home/less/footer1.less b/src/Home/less/footer1.less index f82cfed..6ba5810 100644 --- a/src/Home/less/footer1.less +++ b/src/Home/less/footer1.less @@ -42,7 +42,7 @@ .copyright { height: 80px; text-align: center; - line-height: 80px; + line-height: 28px; } } } @@ -85,7 +85,10 @@ .home-page { padding: 0; .copyright { - font-size: 12px; + font-size: 9px; + .first { + font-size: 13px; + } } } } diff --git a/src/picture/beian.png b/src/picture/beian.png new file mode 100644 index 0000000..9f76394 Binary files /dev/null and b/src/picture/beian.png differ