From cfc15c6863d4919a515af01ae37aceb1d2538136 Mon Sep 17 00:00:00 2001 From: cxz66666 <1092889706@qq.com> Date: Wed, 19 Aug 2020 14:10:36 +0800 Subject: [PATCH] add video --- src/Home/Content4.jsx | 34 ++++++---- src/Home/data.source.js | 129 +++++++++++++++++++++++-------------- src/Home/less/footer1.less | 7 +- src/picture/beian.png | Bin 0 -> 19256 bytes 4 files changed, 107 insertions(+), 63 deletions(-) create mode 100644 src/picture/beian.png 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 0000000000000000000000000000000000000000..9f763946dd6606addeab24e40e2369124d53a048 GIT binary patch literal 19256 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 literal 0 HcmV?d00001