diff --git a/src/Home/data.source.js b/src/Home/data.source.js
index 326e730..841be2e 100644
--- a/src/Home/data.source.js
+++ b/src/Home/data.source.js
@@ -9,6 +9,26 @@ import jingpin1 from "../picture/jingpin1.jpg";
import xueshengjie1 from "../picture/xueshengjie1.jpg";
import luntan1 from "../picture/luntan1.jpg";
import background from "../picture/background.jpg";
+import tool from "../picture/tool.png";
+import diannao from "../picture/diannao.png";
+import caiwaibu from "../picture/caiwaibu.png";
+import wenxuanbu from "../picture/wenxuanbu.png";
+import renzibu from "../picture/renzibu.png";
+import diannaobu from "../picture/diannaobu.png";
+import dianqibu from "../picture/dianqibu.png";
+import diy from "../picture/diy.png";
+import fenxiang2 from "../picture/fenxiang2.png";
+import fenxiang1 from "../picture/fenxiang1.png";
+import huodong from "../picture/huodong.png";
+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";
+import zhiyuanzhe from "../picture/zhiyuanzhe.png";
export const Nav30DataSource = {
wrapper: { className: 'header3 home-page-wrapper' },
page: { className: 'home-page' },
@@ -20,19 +40,12 @@ export const Nav30DataSource = {
Menu: {
className: 'header3-menu',
children: [
- {
- name: 'item1',
- className: 'header3-item',
- children: {
- href: '/#/learnmore',
- children: [{ children: '了解更多 ', name: 'text' }],
- },
- },
+
{
name: 'item2',
className: 'header3-item',
children: {
- href: '/#/history',
+ href: 'https://wiki.zjueva.net/',
children: [
{
children: (
@@ -72,7 +85,7 @@ export const Nav30DataSource = {
className: 'header3-item',
children: {
href: '/#/login',
- children: [{ children: '登陆 ', name: 'text' }],
+ children: [{ children: '登录 ', name: 'text' }],
},
},
],
@@ -107,7 +120,7 @@ export const Banner31DataSource = {
className: 'banner3-name k6bx9qqmas-editor_css',
children: (
<>
-
E我志者,?我人生
+ E我世界,志我人生
>
),
},
@@ -140,7 +153,7 @@ export const Feature20DataSource = {
OverPack: { className: 'home-page content2', playScale: 0.3 },
imgWrapper: { className: 'content2-img', md: 10, xs: 24 },
img: {
- children: 'https://zos.alipayobjects.com/rmsportal/tvQTfCupGUFKSfQ.png',
+ children: tool,
},
textWrapper: { className: 'content2-text', md: 14, xs: 24 },
title: {
@@ -167,7 +180,7 @@ export const Feature10DataSource = {
OverPack: { className: 'home-page content1', playScale: 0.3 },
imgWrapper: { className: 'content1-img', md: 10, xs: 24 },
img: {
- children: 'https://zos.alipayobjects.com/rmsportal/nLzbeGQLPyBJoli.png',
+ children: diannao,
},
textWrapper: { className: 'content1-text', md: 14, xs: 24 },
title: { className: 'content1-title', children: '公益型社团 ' },
@@ -195,24 +208,32 @@ export const Feature10DataSource = {
),
},
};
-export const Content30DataSource = {
+export const Feature30DataSource = {
wrapper: { className: 'home-page-wrapper content3-wrapper' },
- page: { className: 'home-page content3 k6c2jyfzwv-editor_css' },
+ page: { className: 'home-page content3' },
OverPack: { playScale: 0.3 },
titleWrapper: {
className: 'title-wrapper',
children: [
{
name: 'title',
- children: '协会主要架构 ',
- className: 'title-h1 k6byq9vtkee-editor_css',
+ children: (
+ <>
+
+ 协会主要架构
+
+ >
+ ),
+ className: 'title-h1',
},
{
name: 'content',
- className: 'title-content k6bz1fy4zto-editor_css',
+ className: 'title-content',
children: (
<>
- 五大部门职能简介
+
+ 五大部门职能简介
+
>
),
},
@@ -222,22 +243,58 @@ export const Content30DataSource = {
className: 'content3-block-wrapper',
children: [
{
- name: 'block2',
- className: 'content3-block k6c2kk8agk-editor_css',
+ name: 'block0',
+ className: 'content3-block',
md: 8,
xs: 24,
children: {
icon: {
- className: 'content3-icon k6byp0r4zad-editor_css',
- children:
- 'https://zos.alipayobjects.com/rmsportal/xMSBjgxBhKfyMWX.png',
+ className: 'content3-icon',
+ children: caiwaibu
+ ,
+ },
+ textWrapper: { className: 'content3-text k6rogje9n6d-editor_css' },
+ title: {
+ className: 'content3-title k6rof9gjex-editor_css',
+ children: (
+ <>
+
+ 财外部
+
+ >
+ ),
+ },
+ content: {
+ className: 'content3-content k6rog7ap4c-editor_css',
+ children: (
+ <>
+
+
+ 协会年度财务预算和结算的制定,规范协会各项财务手续,为协会争取更多的资金支持等
+
+ >
+ ),
+ },
+ },
+ },
+ {
+ name: 'block1',
+ className: 'content3-block',
+ md: 8,
+ xs: 24,
+ children: {
+ icon: {
+ className: 'content3-icon',
+ children: wenxuanbu,
},
textWrapper: { className: 'content3-text' },
title: {
- className: 'content3-title k6bypeippkr-editor_css',
+ className: 'content3-title k6rogxj5m3r-editor_css',
children: (
<>
- 财外部
+
+ 文宣部
+
>
),
},
@@ -246,7 +303,42 @@ export const Content30DataSource = {
children: (
<>
- 协会年度财务预算和结算的制定,规范协会各项财务手续,为协会争取更多的资金支持等
+
+ 协会形象的塑造和宣传,制定和执行每次活动前的宣传方案,活动现场的摄影和记录,活动后新闻稿的撰写和投出等
+
+ >
+ ),
+ },
+ },
+ },
+ {
+ name: 'block2',
+ className: 'content3-block',
+ md: 8,
+ xs: 24,
+ children: {
+ icon: {
+ className: 'content3-icon',
+ children: renzibu,
+ },
+ textWrapper: { className: 'content3-text' },
+ title: {
+ className: 'content3-title k6rohgkzazi-editor_css',
+ children: (
+ <>
+
+ 人资部
+
+ >
+ ),
+ },
+ content: {
+ className: 'content3-content',
+ children: (
+ <>
+
+
+ 协会活动的现场执行以及普通会员的管理,活动现场的安排和布置,普通会员志愿服务小时数的统计等
>
),
@@ -260,41 +352,17 @@ export const Content30DataSource = {
xs: 24,
children: {
icon: {
- className: 'content3-icon k6bz0rscbc6-editor_css',
- children:
- 'https://zos.alipayobjects.com/rmsportal/MNdlBNhmDBLuzqp.png',
- },
- textWrapper: { className: 'content3-text' },
- title: { className: 'content3-title', children: '文宣部 ' },
- content: {
- className: 'content3-content',
- children: (
- <>
-
- 协会形象的塑造和宣传,制定和执行每次活动前的宣传方案,活动现场的摄影和记录,活动后新闻稿的撰写和投出等
-
- >
- ),
- },
- },
- },
- {
- name: 'block~k6bwjb9sg9',
- className: 'content3-block',
- md: 8,
- xs: 24,
- children: {
- icon: {
- className: 'content3-icon k6byxtosuua-editor_css',
- children:
- 'https://zos.alipayobjects.com/rmsportal/MNdlBNhmDBLuzqp.png',
+ className: 'content3-icon',
+ children: diannaobu,
},
textWrapper: { className: 'content3-text' },
title: {
- className: 'content3-title',
+ className: 'content3-title k6roi0sr9o-editor_css',
children: (
<>
- 人资部
+
+ 电脑部
+
>
),
},
@@ -303,7 +371,8 @@ export const Content30DataSource = {
children: (
<>
- 协会活动的现场执行以及普通会员的管理,活动现场的安排和布置,普通会员志愿服务小时数的统计等
+
+ 协会日常电脑维修服务,同时会负责开展若干次培训活动,面向全体会员旨在提高大家的维修水平
>
),
@@ -311,49 +380,33 @@ export const Content30DataSource = {
},
},
{
- name: 'block~k6bwjfif6o',
+ name: 'block4',
className: 'content3-block',
md: 8,
xs: 24,
children: {
icon: {
- className: 'content3-icon k6byzxwmha-editor_css',
- children:
- 'https://zos.alipayobjects.com/rmsportal/MNdlBNhmDBLuzqp.png',
+ className: 'content3-icon',
+ children: dianqibu,
},
textWrapper: { className: 'content3-text' },
- title: { className: 'content3-title', children: '电脑部 ' },
- content: {
- className: 'content3-content',
+ title: {
+ className: 'content3-title k6roin896g-editor_css',
children: (
<>
- 协会日常电脑维修服务,同时会负责开展若干次培训活动,面向全体会员旨在提高大家的维修水平
+ 电器部
>
),
},
- },
- },
- {
- name: 'block~k6byox4k63',
- className: 'content3-block',
- md: 8,
- xs: 24,
- children: {
- icon: {
- className: 'content3-icon k6bz0x5q5u-editor_css',
- children:
- 'https://zos.alipayobjects.com/rmsportal/MNdlBNhmDBLuzqp.png',
- },
- textWrapper: { className: 'content3-text' },
- title: { className: 'content3-title', children: '电器部 ' },
content: {
className: 'content3-content',
children: (
<>
- 协会的电器维修与内部资料编篡,也会定期向会员科普一些电器的保养维修常识以及工具的使用方法
+
+ 协会的电器维修与内部资料编篡,也会定期向会员科普一些电器的保养维修常识以及工具的使用方法
>
),
@@ -376,7 +429,7 @@ export const Feature80DataSource = {
children: (
<>
- 协会主要活动
+ 协会主要活动
>
),
@@ -387,17 +440,15 @@ export const Feature80DataSource = {
children: (
<>
-
-
+
-
-
- 以服务社会为己任,为建设社会主义和谐社会贡献力量。
-
-
+
+ 以服务社会为己任,为建设社会主义和谐社会贡献力量
+
+
>
),
@@ -410,7 +461,15 @@ export const Feature80DataSource = {
{
name: 'button',
className: 'feature8-button',
- children: { href: '/#/ticket', children: '立即加入 ' },
+ children: {
+ href: '/#/ticket',
+ children: (
+ <>
+ 立即加入
+ >
+ ),
+ target: '',
+ },
},
],
},
@@ -431,190 +490,11 @@ export const Feature80DataSource = {
gutter: 120,
title: {
className: 'feature8-carousel-title-block',
- children: '公益活动 ',
- },
- children: [
- {
- className: 'feature8-block-col',
- md: 6,
- xs: 24,
- name: 'child0',
- arrow: {
- className: 'feature8-block-arrow',
- children:
- 'https://gw.alipayobjects.com/zos/basement_prod/167bee48-fbc0-436a-ba9e-c116b4044293.svg',
- },
- children: {
- className: 'feature8-block-child',
- children: [
- {
- name: 'image',
- className: 'feature8-block-image',
- children:
- 'https://gw.alipayobjects.com/zos/basement_prod/d8933673-1463-438a-ac43-1a8f193ebf34.svg',
- },
- {
- name: 'title',
- className: 'feature8-block-title k6c0huzztn9-editor_css',
- children: (
- <>
- 日常值班:
- >
- ),
- },
- {
- name: 'content',
- className: 'feature8-block-content',
- children: (
- <>
-
- 每天固定值班时间超过6小时,为同学们提供免费维修电脑电器的服务
-
- >
- ),
- },
- ],
- },
- },
- {
- className: 'feature8-block-col',
- md: 6,
- xs: 24,
- name: 'child1',
- arrow: {
- className: 'feature8-block-arrow',
- children:
- 'https://gw.alipayobjects.com/zos/basement_prod/167bee48-fbc0-436a-ba9e-c116b4044293.svg',
- },
- children: {
- className: 'feature8-block-child',
- children: [
- {
- name: 'image',
- className: 'feature8-block-image',
- children:
- 'https://gw.alipayobjects.com/zos/basement_prod/d8933673-1463-438a-ac43-1a8f193ebf34.svg',
- },
- {
- name: 'title',
- className: 'feature8-block-title k6c169bqlul-editor_css',
- children: (
- <>
- 线上交流:
- >
- ),
- },
- {
- name: 'content',
- className: 'feature8-block-content',
- children: (
- <>
- 为全校师生提供电脑基础知识普及以及免费的购机咨询
- >
- ),
- },
- ],
- },
- },
- {
- className: 'feature8-block-col',
- md: 6,
- xs: 24,
- name: 'child2',
- arrow: {
- className: 'feature8-block-arrow',
- children:
- 'https://gw.alipayobjects.com/zos/basement_prod/167bee48-fbc0-436a-ba9e-c116b4044293.svg',
- },
- children: {
- className: 'feature8-block-child',
- children: [
- {
- name: 'image',
- className: 'feature8-block-image',
- children:
- 'https://gw.alipayobjects.com/zos/basement_prod/d8933673-1463-438a-ac43-1a8f193ebf34.svg',
- },
- {
- name: 'title',
- className: 'feature8-block-title k6c16ctkdmf-editor_css',
- children: (
- <>
- 公益进社会:
- >
- ),
- },
- {
- name: 'content',
- className: 'feature8-block-content',
- children: (
- <>
-
- 开展社区维修服务,积极拓展校外公益活动,积极与在杭其他高校拓展合作关系
-
- >
- ),
- },
- ],
- },
- },
- {
- className: 'feature8-block-col',
- md: 6,
- xs: 24,
- name: 'child~k6c0s1iqr6c',
- arrow: {
- className: 'feature8-block-arrow',
- children:
- 'https://gw.alipayobjects.com/zos/basement_prod/167bee48-fbc0-436a-ba9e-c116b4044293.svg',
- },
- children: {
- className: 'feature8-block-child',
- children: [
- {
- name: 'image',
- className: 'feature8-block-image k6c0vx6j656-editor_css',
- children:
- 'https://gw.alipayobjects.com/zos/basement_prod/d8933673-1463-438a-ac43-1a8f193ebf34.svg',
- },
- {
- name: 'title',
- className: 'feature8-block-title k6c0s334dxi-editor_css',
- children: (
- <>
-
- >
- ),
- },
- {
- name: 'content',
- className: 'feature8-block-content k6c0s91863l-editor_css',
- children: (
- <>
-
- 志愿服务30年来,E志者协会始终立足于志愿维修服务,坚持为全校师生与社会群体提供公益服务
-
- >
- ),
- },
- ],
- },
- },
- ],
- },
- {
- name: 'block1',
- className: 'feature8-block-row',
- gutter: 120,
- title: {
children: (
<>
-
- 社团活动
-
+ 公益活动
>
),
- className: 'feature8-carousel-title-block',
},
children: [
{
@@ -632,26 +512,30 @@ export const Feature80DataSource = {
children: [
{
name: 'image',
- className: 'feature8-block-image k6c0x19mrup-editor_css',
- children:
- 'https://gw.alipayobjects.com/zos/basement_prod/d8933673-1463-438a-ac43-1a8f193ebf34.svg',
+ className: 'feature8-block-image',
+ children: (
+
+ )
+ ,
},
{
name: 'title',
- className: 'feature8-block-title k6c17cdd2tk-editor_css',
+ className: 'feature8-block-title',
children: (
<>
- 校园维修&社区维修
+
+ 日常值班
+
>
),
},
{
name: 'content',
- className: 'feature8-block-content k6c0x9xg18b-editor_css',
+ className: 'feature8-block-content k6rxvzc0seb-editor_css',
children: (
<>
- 协会日常值班维修,每月一次的学园义务维修和不定期开展的社区义务维修
+ 每天固定值班时间超过6小时,为同学们提供免费维修电脑电器的服务
>
),
@@ -674,24 +558,33 @@ export const Feature80DataSource = {
children: [
{
name: 'image',
- className: 'feature8-block-image k6c0y0a2yx-editor_css',
- children:
- 'https://gw.alipayobjects.com/zos/basement_prod/d8933673-1463-438a-ac43-1a8f193ebf34.svg',
+ className: 'feature8-block-image',
+ children: (
+
+ )
+ ,
},
{
name: 'title',
- className: 'feature8-block-title k6c17hbe4aq-editor_css',
+ className: 'feature8-block-title',
children: (
<>
- 社团精品活动
+
+ 线上交流
+
>
),
},
{
name: 'content',
- className: 'feature8-block-content',
- children:
- '每学年各部门都会开展相应的精品活动,优秀者会有第二课堂的加分 ',
+ className: 'feature8-block-content k6rxwi5wuik-editor_css',
+ children: (
+ <>
+
+ 为全校师生提供电脑基础知识普及以及免费的购机咨询
+
+ >
+ ),
},
],
},
@@ -711,26 +604,30 @@ export const Feature80DataSource = {
children: [
{
name: 'image',
- className: 'feature8-block-image k6c10o2f0x-editor_css',
- children:
- 'https://gw.alipayobjects.com/zos/basement_prod/d8933673-1463-438a-ac43-1a8f193ebf34.svg',
+ className: 'feature8-block-image',
+ children: (
+
+ )
+ ,
},
{
name: 'title',
- className: 'feature8-block-title k6c17kho4rt-editor_css',
+ className: 'feature8-block-title',
children: (
<>
- 维修知识课堂
+
+ 公益进社会
+
>
),
},
{
name: 'content',
- className: 'feature8-block-content',
+ className: 'feature8-block-content k6rxwszwjur-editor_css',
children: (
<>
- 协会每个长学期都会开办电脑电器维修知识精品课程,旨在传授相关的知识并交流经验
+ 开展社区维修服务,积极拓展校外公益活动,积极与在杭其他高校拓展合作关系
>
),
@@ -753,24 +650,34 @@ export const Feature80DataSource = {
children: [
{
name: 'image',
- className: 'feature8-block-image k6c12xz3kb-editor_css',
- children:
- 'https://gw.alipayobjects.com/zos/basement_prod/d8933673-1463-438a-ac43-1a8f193ebf34.svg',
+ className: 'feature8-block-image',
+ children: (
+
+ )
+ ,
},
{
name: 'title',
- className: 'feature8-block-title k6c17nnk41k-editor_css',
+ className: 'feature8-block-title',
children: (
<>
- 学生节活动
+
+ 志愿服务
+
+
>
),
},
{
name: 'content',
- className: 'feature8-block-content',
- children:
- '在每年的12月末学校举办的学生节中,协会会开展一系列活动向外界展示 ',
+ className: 'feature8-block-content k6rxx2szsa-editor_css',
+ children: (
+ <>
+
+ 30年来,E志者协会始终立足于志愿维修服务,坚持为全校师生与社会群体提供公益服务
+
+ >
+ ),
},
],
},
@@ -778,7 +685,205 @@ export const Feature80DataSource = {
],
},
{
- name: 'elem~k6c0cvcnhnc',
+ name: 'block1',
+ className: 'feature8-block-row',
+ gutter: 120,
+ title: {
+ children: (
+ <>
+ 社团活动
+ >
+ ),
+ className: 'feature8-carousel-title-block',
+ },
+ children: [
+ {
+ className: 'feature8-block-col',
+ md: 6,
+ xs: 24,
+ name: 'child0',
+ arrow: {
+ className: 'feature8-block-arrow',
+ children:
+ 'https://gw.alipayobjects.com/zos/basement_prod/167bee48-fbc0-436a-ba9e-c116b4044293.svg',
+ },
+ children: {
+ className: 'feature8-block-child',
+ children: [
+ {
+ name: 'image',
+ className: 'feature8-block-image',
+ children: (
+
+ )
+ ,
+ },
+ {
+ name: 'title',
+ className: 'feature8-block-title',
+ children: (
+ <>
+
+ 校园维修&社区维修
+
+ >
+ ),
+ },
+ {
+ name: 'content',
+ className: 'feature8-block-content k6rxyghtzno-editor_css',
+ children: (
+ <>
+
+ 协会日常值班维修,每月一次的学园义务维修和不定期开展的社区义务维修
+
+ >
+ ),
+ },
+ ],
+ },
+ },
+ {
+ className: 'feature8-block-col',
+ md: 6,
+ xs: 24,
+ name: 'child1',
+ arrow: {
+ className: 'feature8-block-arrow',
+ children:
+ 'https://gw.alipayobjects.com/zos/basement_prod/167bee48-fbc0-436a-ba9e-c116b4044293.svg',
+ },
+ children: {
+ className: 'feature8-block-child',
+ children: [
+ {
+ name: 'image',
+ className: 'feature8-block-image',
+ children: (
+
+ )
+ ,
+ },
+ {
+ name: 'title',
+ className: 'feature8-block-title',
+ children: (
+ <>
+
+ 社团精品活动
+
+ >
+ ),
+ },
+ {
+ name: 'content',
+ className: 'feature8-block-content k6rxyx9aadd-editor_css',
+ children: (
+ <>
+
+ 每学年各部门都会开展相应的精品活动,优秀者会有第二课堂的加分
+
+ >
+ ),
+ },
+ ],
+ },
+ },
+ {
+ className: 'feature8-block-col',
+ md: 6,
+ xs: 24,
+ name: 'child2',
+ arrow: {
+ className: 'feature8-block-arrow',
+ children:
+ 'https://gw.alipayobjects.com/zos/basement_prod/167bee48-fbc0-436a-ba9e-c116b4044293.svg',
+ },
+ children: {
+ className: 'feature8-block-child',
+ children: [
+ {
+ name: 'image',
+ className: 'feature8-block-image',
+
+ children: (
+
+ ),
+ },
+ {
+ name: 'title',
+ className: 'feature8-block-title',
+ children: (
+ <>
+
+ 维修知识课堂
+
+ >
+ ),
+ },
+ {
+ name: 'content',
+ className: 'feature8-block-content k6rxz5lsgkf-editor_css',
+ children: (
+ <>
+
+ 协会每个长学期都会开办电脑电器维修知识精品课程,旨在传授相关的知识并交流经验
+
+ >
+ ),
+ },
+ ],
+ },
+ },
+ {
+ className: 'feature8-block-col',
+ md: 6,
+ xs: 24,
+ name: 'child3',
+ arrow: {
+ className: 'feature8-block-arrow',
+ children:
+ 'https://gw.alipayobjects.com/zos/basement_prod/167bee48-fbc0-436a-ba9e-c116b4044293.svg',
+ },
+ children: {
+ className: 'feature8-block-child',
+ children: [
+ {
+ name: 'image',
+ className: 'feature8-block-image',
+ children: (
+
+ ),
+ },
+ {
+ name: 'title',
+ className: 'feature8-block-title',
+ children: (
+ <>
+
+ 学生节活动
+
+ >
+ ),
+ },
+ {
+ name: 'content',
+ className: 'feature8-block-content k6rxzt66fnu-editor_css',
+ children: (
+ <>
+
+ 在每年的12月末学校举办的学生节中,协会会开展一系列活动向外界展示
+
+ >
+ ),
+ },
+ ],
+ },
+ },
+ ],
+ },
+ {
+ name: 'elem~k6rr9jdpl9',
className: 'feature8-block-row',
gutter: 120,
title: {
@@ -805,21 +910,30 @@ export const Feature80DataSource = {
children: [
{
name: 'image',
- className: 'feature8-block-image k6c18wg896n-editor_css',
- children:
- 'https://gw.alipayobjects.com/zos/basement_prod/d8933673-1463-438a-ac43-1a8f193ebf34.svg',
+ className: 'feature8-block-image',
+ children: (
+
+ ),
},
{
name: 'title',
- className: 'feature8-block-title k6c18yxsvf-editor_css',
- children: '需求沟通',
+ className: 'feature8-block-title',
+ children: (
+ <>
+
+
+
+ >
+ ),
},
{
name: 'content',
- className: 'feature8-block-content k6c1crpbwn-editor_css',
+ className: 'feature8-block-content k6ry0mq0ks-editor_css',
children: (
<>
- 积极追求参与竞赛等创新实践活动
+
+ 积极追求参与竞赛等创新实践活动
+
>
),
},
@@ -841,19 +955,32 @@ export const Feature80DataSource = {
children: [
{
name: 'image',
- className: 'feature8-block-image k6c1dfyt0he-editor_css',
- children:
- 'https://gw.alipayobjects.com/zos/basement_prod/d8933673-1463-438a-ac43-1a8f193ebf34.svg',
+ className: 'feature8-block-image',
+ children: (
+
+ ),
},
{
name: 'title',
- className: 'feature8-block-title k6c1dj5lecd-editor_css',
- children: '需求沟通',
+ className: 'feature8-block-title',
+ children: (
+ <>
+
+
+
+ >
+ ),
},
{
name: 'content',
- className: 'feature8-block-content k6c1dlcixg-editor_css',
- children: '“中控杯”参赛经验分享 ',
+ className: 'feature8-block-content k6ry1c380kk-editor_css',
+ children: (
+ <>
+
+ “中控杯”参赛经验分享
+
+ >
+ ),
},
],
},
@@ -873,21 +1000,31 @@ export const Feature80DataSource = {
children: [
{
name: 'image',
- className: 'feature8-block-image k6c2haip0st-editor_css',
- children:
- 'https://gw.alipayobjects.com/zos/basement_prod/d8933673-1463-438a-ac43-1a8f193ebf34.svg',
+ className: 'feature8-block-image',
+ children: (
+
+ )
+ ,
},
{
name: 'title',
- className: 'feature8-block-title k6c2h8wti1-editor_css',
- children: '需求沟通',
+ className: 'feature8-block-title',
+ children: (
+ <>
+
+
+
+ >
+ ),
},
{
name: 'content',
- className: 'feature8-block-content k6c2hgg3bfc-editor_css',
+ className: 'feature8-block-content k6ry1to1v9g-editor_css',
children: (
<>
- 智能车竞赛经验分享
+
+ 智能车竞赛经验分享
+
>
),
},
@@ -909,21 +1046,30 @@ export const Feature80DataSource = {
children: [
{
name: 'image',
- className: 'feature8-block-image k6c2ibp6dfh-editor_css',
- children:
- 'https://gw.alipayobjects.com/zos/basement_prod/d8933673-1463-438a-ac43-1a8f193ebf34.svg',
+ className: 'feature8-block-image',
+ children: (
+
+ ),
},
{
name: 'title',
- className: 'feature8-block-title k6c2ijput1f-editor_css',
- children: '需求沟通',
+ className: 'feature8-block-title',
+ children: (
+ <>
+
+
+
+ >
+ ),
},
{
name: 'content',
- className: 'feature8-block-content k6c2imvlib-editor_css',
+ className: 'feature8-block-content k6ry25i9bt9-editor_css',
children: (
<>
- 废旧电子元件创意DIY大赛
+
+ 废旧电子元件创意DIY大赛
+
>
),
},
@@ -936,6 +1082,8 @@ export const Feature80DataSource = {
},
},
};
+
+
export const Feature60DataSource = {
wrapper: { className: 'home-page-wrapper feature6-wrapper' },
OverPack: { className: 'home-page feature6', playScale: 0.3 },
diff --git a/src/Home/less/edit.less b/src/Home/less/edit.less
index 644b1be..8c16ffc 100644
--- a/src/Home/less/edit.less
+++ b/src/Home/less/edit.less
@@ -58,8 +58,12 @@
text-shadow: 5px 5px 5px rgba(0, 0, 0, 0.35);
}
#Banner3_1 .banner3-text-wrapper > .k6bx9qqmas-editor_css {
- color: rgb(255, 0, 0);
- margin: 100px 100px;
+ font-size: 35px;
+ margin: 50px 100px 100px 100px;
+ padding: 0px 0px 0px 275px;
+ background: linear-gradient(to right, red,#f97400, blue,#990adb);
+ -webkit-background-clip: text;
+ color: transparent;
}
#Banner3_1 .banner3-text-wrapper > .k6bxcnb8hlg-editor_css {
font-family: Tahoma;
@@ -124,102 +128,47 @@
#Content3_0 .home-page > .title-wrapper > .k6bz1fy4zto-editor_css {
font-size: 15px;
}
-#Feature8_0 .ant-col > .feature8-block-child > .k6c0oc6qv0m-editor_css {
+#Feature8_0 .ant-col > .feature8-block-child > .k6rxvzc0seb-editor_css {
font-size: 16px;
- padding: 30px;
}
-#Feature8_0 div > .ant-row-flex > .k6c0r7negkf-editor_css {
- margin: 36px 0px;
- padding: 0 60px;
+#Feature8_0 .ant-col > .feature8-block-child > .k6rxwi5wuik-editor_css {
+ font-size: 16px;
}
-#Feature8_0 .ant-col > .feature8-block-child > .k6c0s91863l-editor_css {
- margin: 0px;
- padding: 20px;
+#Feature8_0 .ant-col > .feature8-block-child > .k6rxwszwjur-editor_css {
+ font-size: 16px;
}
-#Feature8_0 .ant-col > .feature8-block-child > .k6c0vx6j656-editor_css {
- display: none;
+#Feature8_0 .ant-col > .feature8-block-child > .k6rxx2szsa-editor_css {
+ font-size: 16px;
}
-#Feature8_0 .ant-col > .feature8-block-child > .k6c0s334dxi-editor_css {
- display: none;
+#Feature8_0 .ant-col > .feature8-block-child > .k6rxyghtzno-editor_css {
+ font-size: 16px;
}
-#Feature8_0 .ant-col > .feature8-block-child > .k6c0x19mrup-editor_css {
- display: none;
+#Feature8_0 .ant-col > .feature8-block-child > .k6rxyx9aadd-editor_css {
+ font-size: 16px;
}
-#Feature8_0 .ant-col > .feature8-block-child > .k6c0y0a2yx-editor_css {
- display: none;
+#Feature8_0 .ant-col > .feature8-block-child > .k6rxz5lsgkf-editor_css {
+ font-size: 16px;
}
-#Feature8_0 .ant-col > .feature8-block-child > .k6c0x9xg18b-editor_css {
- font-weight: 300;
- color: #404040;
+#Feature8_0 .ant-col > .feature8-block-child > .k6rxzt66fnu-editor_css {
+ font-size: 16px;
}
-#Feature8_0 .ant-col > .feature8-block-child > .k6c10o2f0x-editor_css {
- display: none;
-}
-#Feature8_0 .ant-col > .feature8-block-child > .k6c12xz3kb-editor_css {
- display: none;
-}
-#Feature8_0 .ant-col > .feature8-block-child > .k6c0huzztn9-editor_css {
- font-size: 20px;
- font-weight: 500;
-}
-#Feature8_0 .ant-col > .feature8-block-child > .k6c169bqlul-editor_css {
- font-size: 20px;
-}
-#Feature8_0 .ant-col > .feature8-block-child > .k6c16ctkdmf-editor_css {
- font-size: 20px;
-}
-#Feature8_0 .ant-col > .feature8-block-child > .k6c17cdd2tk-editor_css {
- font-size: 20px;
-}
-#Feature8_0 .ant-col > .feature8-block-child > .k6c17hbe4aq-editor_css {
- font-size: 20px;
-}
-#Feature8_0 .ant-col > .feature8-block-child > .k6c17kho4rt-editor_css {
- font-size: 20px;
-}
-#Feature8_0 .ant-col > .feature8-block-child > .k6c17nnk41k-editor_css {
- font-size: 20px;
-}
-#Feature8_0 .ant-col > .feature8-block-child > .k6c18wg896n-editor_css {
- display: none;
-}
-#Feature8_0 .ant-col > .feature8-block-child > .k6c18yxsvf-editor_css {
- display: none;
-}
-#Feature8_0 .ant-col > .feature8-block-child > .k6c1dfyt0he-editor_css {
- display: none;
-}
-#Feature8_0 .ant-col > .feature8-block-child > .k6c1dj5lecd-editor_css {
- display: none;
-}
-#Feature8_0 .ant-col > .feature8-block-child > .k6c1crpbwn-editor_css {
- font-size: 20px;
+#Feature8_0 .ant-col > .feature8-block-child > .k6ry1c380kk-editor_css {
+ font-size: 18px;
text-align: center;
}
-#Feature8_0 .ant-col > .feature8-block-child > .k6c1dlcixg-editor_css {
- font-size: 20px;
+#Feature8_0 .ant-col > .feature8-block-child > .k6ry0mq0ks-editor_css {
+ font-size: 18px;
text-align: center;
}
-#Feature8_0 .ant-col > .feature8-block-child > .k6c2haip0st-editor_css {
- display: none;
-}
-#Feature8_0 .ant-col > .feature8-block-child > .k6c2h8wti1-editor_css {
- display: none;
-}
-#Feature8_0 .ant-col > .feature8-block-child > .k6c2hgg3bfc-editor_css {
- font-size: 20px;
+#Feature8_0 .ant-col > .feature8-block-child > .k6ry1to1v9g-editor_css {
+ font-size: 18px;
text-align: center;
}
-#Feature8_0 .ant-col > .feature8-block-child > .k6c2ijput1f-editor_css {
- display: none;
-}
-#Feature8_0 .ant-col > .feature8-block-child > .k6c2ibp6dfh-editor_css {
- display: none;
-}
-#Feature8_0 .ant-col > .feature8-block-child > .k6c2imvlib-editor_css {
- font-size: 20px;
+#Feature8_0 .ant-col > .feature8-block-child > .k6ry25i9bt9-editor_css {
+ font-size: 18px;
text-align: center;
}
+
#Content3_0 .k6c2jyfzwv-editor_css {
border-top-width: 1px;
}
@@ -308,4 +257,25 @@
}
#Feature1_2 .ant-row > .ant-col > .k6lyqr8k4ri-editor_css {
font-size: 16px;
-}
\ No newline at end of file
+}
+#Feature3_0 .ant-col > .content3-text > .k6rof9gjex-editor_css {
+ display: inline-block;
+}
+#Feature3_0 .ant-row > .ant-col > .k6rogje9n6d-editor_css {
+ text-align: center;
+}
+#Feature3_0 .ant-col > .content3-text > .k6rog7ap4c-editor_css {
+ text-align: left;
+}
+#Feature3_0 .ant-col > .content3-text > .k6rogxj5m3r-editor_css {
+ text-align: center;
+}
+#Feature3_0 .ant-col > .content3-text > .k6roi0sr9o-editor_css {
+ text-align: center;
+}
+#Feature3_0 .ant-col > .content3-text > .k6roin896g-editor_css {
+ text-align: center;
+}
+#Feature3_0 .ant-col > .content3-text > .k6rohgkzazi-editor_css {
+ text-align: center;
+}
diff --git a/src/Home/less/feature3.less b/src/Home/less/feature3.less
new file mode 100644
index 0000000..24ee0e4
--- /dev/null
+++ b/src/Home/less/feature3.less
@@ -0,0 +1,52 @@
+@content3: content3;
+.@{content3}-wrapper {
+ min-height: 764px;
+ .@{content3} {
+ height: 100%;
+ overflow: hidden;
+ & .title-content {
+ text-align: center;
+ }
+ &-block-wrapper {
+ position: relative;
+ .@{content3}-block {
+ display: inline-block;
+ padding: 48px 24px;
+ vertical-align: top;
+ .@{content3}-icon {
+ display: inline-block;
+ width: 15%;
+ vertical-align: top;
+ }
+ .@{content3}-text {
+ width: 85%;
+ display: inline-block;
+ padding-left: 8%;
+ }
+ &.clear-both {
+ clear: both;
+ }
+ }
+ }
+ }
+}
+
+@media screen and (max-width: 767px) {
+ .@{content3}-wrapper {
+ min-height: 1080px;
+ .@{content3} {
+ &-block-wrapper {
+ margin: 20px auto;
+ height: auto;
+ .@{content3}-block {
+ .@{content3}-title {
+ font-size: 20px;
+ }
+ &.queue-anim-leaving {
+ position: relative !important;
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/src/Home/less/nav3.less b/src/Home/less/nav3.less
index e017931..bb0c0fe 100644
--- a/src/Home/less/nav3.less
+++ b/src/Home/less/nav3.less
@@ -15,9 +15,9 @@
&-logo {
display: inline-block;
position: relative;
- width: 50px;
+ width: 40px;
- line-height: 60px;
+ line-height: 45px;
& img {
vertical-align: middle;
@@ -35,8 +35,8 @@
border-bottom: none;
}
.ant-menu {
- line-height: 62px;
- height: 64px;
+ line-height: 50px;
+ height: 50px;
background: transparent;
a {
diff --git a/src/Home/main.jsx b/src/Home/main.jsx
index fa99aa2..efa9684 100644
--- a/src/Home/main.jsx
+++ b/src/Home/main.jsx
@@ -20,7 +20,7 @@ import {
Banner31DataSource,
Feature20DataSource,
Feature10DataSource,
- Content30DataSource,
+ Feature30DataSource,
Feature80DataSource,
Feature60DataSource,
Content50DataSource,
@@ -92,9 +92,9 @@ export default class Home extends React.Component {
isMobile={this.state.isMobile}
/>,
,
-
- {dataSource.titleWrapper.children.map(getChildrenToRender)}
-
-
-
-
-
- );
- }
-}
-
-export default Content11;
diff --git a/src/LearnMore/Feature7.jsx b/src/LearnMore/Feature7.jsx
deleted file mode 100644
index 4cadfe7..0000000
--- a/src/LearnMore/Feature7.jsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import React from 'react';
-import OverPack from 'rc-scroll-anim/lib/ScrollOverPack';
-import QueueAnim from 'rc-queue-anim';
-import { Row, Col } from 'antd';
-
-import { getChildrenToRender } from './utils';
-
-function Feature7(props) {
- const { dataSource, isMobile, ...tagProps } = props;
- const { blockWrapper, titleWrapper } = dataSource;
- const childrenToRender = blockWrapper.children.map((item, i) => (
-
-
- {item.children.children.map(getChildrenToRender)}
-
-
- ));
- return (
-
-
-
- {titleWrapper.children.map(getChildrenToRender)}
-
-
-
- {childrenToRender}
-
-
-
-
- );
-}
-
-export default Feature7;
diff --git a/src/LearnMore/Pricing1.jsx b/src/LearnMore/Pricing1.jsx
deleted file mode 100644
index 3efea08..0000000
--- a/src/LearnMore/Pricing1.jsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import React from 'react';
-import OverPack from 'rc-scroll-anim/lib/ScrollOverPack';
-import QueueAnim from 'rc-queue-anim';
-import { Row, Col, Button } from 'antd';
-import { getChildrenToRender } from './utils';
-
-class Pricing1 extends React.PureComponent {
- getChildrenToRender = (item) => {
- const {
- wrapper,
- topWrapper,
- name,
- buttonWrapper,
- line,
- content,
- money,
- } = item.children;
- return (
-
-
-
-
- {name.children}
-
-
- {money.children}
-
-
-
- {content.children}
-
-
-
-
-
-
-
- );
- };
-
- render() {
- const { ...props } = this.props;
- const { dataSource } = props;
- delete props.dataSource;
- delete props.isMobile;
- const { block } = dataSource;
- const childrenToRender = block.children.map(this.getChildrenToRender);
- return (
-
-
-
- {dataSource.titleWrapper.children.map(getChildrenToRender)}
-
-
-
- {childrenToRender}
-
-
-
-
- );
- }
-}
-
-export default Pricing1;
diff --git a/src/LearnMore/data.source.js b/src/LearnMore/data.source.js
deleted file mode 100644
index da7df0c..0000000
--- a/src/LearnMore/data.source.js
+++ /dev/null
@@ -1,668 +0,0 @@
-import React from 'react';
-export const Pricing10DataSource = {
- wrapper: { className: 'home-page-wrapper pricing1-wrapper' },
- page: { className: 'home-page pricing1' },
- OverPack: { playScale: 0.3, className: 'pricing1-content-wrapper' },
- titleWrapper: {
- className: 'pricing1-title-wrapper',
- children: [
- {
- name: 'title',
- children: (
- <>
- 协会规划
- >
- ),
- className: 'pricing1-title-h1',
- },
- ],
- },
- block: {
- className: 'pricing1-block-wrapper',
- children: [
- {
- name: 'block0',
- className: 'pricing1-block',
- md: 8,
- xs: 24,
- children: {
- wrapper: { className: 'pricing1-block-box ' },
- topWrapper: { className: 'pricing1-top-wrapper' },
- name: {
- className: 'pricing1-name',
- children: (
- <>
-
-
-
- >
- ),
- },
- money: {
- className: 'pricing1-money k6niku34c3-editor_css',
- children: (
- <>
- 公益组织
- >
- ),
- },
- content: {
- className: 'pricing1-content k6nimnp5as-editor_css',
- children:
- 'E志者协会作为一个公益组织,着眼实际,立足于电脑电器维修;开拓创新,积极学习应用前沿知识;扎根实践,广泛开展校内外志愿服务活动。',
- },
- line: { className: 'pricing1-line' },
- buttonWrapper: {
- className: 'pricing1-button-wrapper',
- children: {
- a: {
- className: 'pricing1-button',
- href: '/#/ticket',
- children: (
- <>
- 从
- >
- ),
- },
- },
- },
- },
- },
- {
- name: 'block~k6nil20ln5q',
- className: 'pricing1-block',
- md: 8,
- xs: 24,
- children: {
- wrapper: { className: 'pricing1-block-box ' },
- topWrapper: { className: 'pricing1-top-wrapper' },
- name: {
- className: 'pricing1-name',
- children: (
- <>
-
-
-
- >
- ),
- },
- money: {
- className: 'pricing1-money k6ninis0ok-editor_css',
- children: (
- <>
- 校内校外
- >
- ),
- },
- content: {
- className: 'pricing1-content k6niojh3hyf-editor_css',
- children:
- 'E志者协会的公益之路渐行渐宽,从校内到校外,从服务师生到服务社会群众,从一个电器维修小组发展到如今如此规模的志愿者团队。',
- },
- line: { className: 'pricing1-line' },
- buttonWrapper: {
- className: 'pricing1-button-wrapper',
- children: {
- a: {
- className: 'pricing1-button',
- href: '/#/ticket',
- children: (
- <>
- 浙里
- >
- ),
- },
- },
- },
- },
- },
- {
- name: 'block~k6nil2ir9',
- className: 'pricing1-block',
- md: 8,
- xs: 24,
- children: {
- wrapper: { className: 'pricing1-block-box ' },
- topWrapper: { className: 'pricing1-top-wrapper' },
- name: {
- className: 'pricing1-name',
- children: (
- <>
-
-
-
- >
- ),
- },
- money: {
- className: 'pricing1-money k6nip1p7ezh-editor_css',
- children: (
- <>
- 初心不忘
- >
- ),
- },
- content: {
- className: 'pricing1-content k6nipheaxuh-editor_css',
- children:
- 'E志者协会不忘初心,在志愿服务精神的传承中开拓进取汲取课堂及课外前沿科学技术之精华,以服务社会为己任,传播先进公益文化为己负责',
- },
- line: { className: 'pricing1-line' },
- buttonWrapper: {
- className: 'pricing1-button-wrapper',
- children: {
- a: {
- className: 'pricing1-button',
- href: '/#/ticket',
- children: (
- <>
- 出发
- >
- ),
- },
- },
- },
- },
- },
- ],
- },
-};
-export const Feature70DataSource = {
- wrapper: { className: 'home-page-wrapper feature7-wrapper' },
- page: { className: 'home-page feature7' },
- OverPack: { playScale: 0.3 },
- titleWrapper: {
- className: 'feature7-title-wrapper',
- children: [
- {
- name: 'title',
- className: 'feature7-title-h1',
- children: (
- <>
-
- 协会荣誉
-
- >
- ),
- },
- {
- name: 'content',
- className: 'feature7-title-content',
- children: (
- <>
-
-
-
- ——仅摘取部分展示
-
- >
- ),
- },
- ],
- },
- blockWrapper: {
- className: 'feature7-block-wrapper',
- gutter: 24,
- children: [
- {
- md: 6,
- xs: 24,
- name: 'block1',
- className: 'feature7-block',
- children: {
- className: 'feature7-block-group k6nj0rhbyb-editor_css',
- children: [
- {
- name: 'title',
- className: 'feature7-block-title k6niz26grar-editor_css',
- children: (
- <>
-
- 2009年
-
- >
- ),
- },
- {
- name: 'content',
- className: 'feature7-block-content k6nj3s0akal-editor_css',
- children: (
- <>
-
- 协会获“
- 浙江省优秀志愿者服务队伍
- ”荣誉称号
-
- >
- ),
- },
- ],
- },
- },
- {
- md: 6,
- xs: 24,
- name: 'block~k6nj6uobqcl',
- className: 'feature7-block',
- children: {
- className: 'feature7-block-group k6nj0rhbyb-editor_css',
- children: [
- {
- name: 'title',
- className: 'feature7-block-title k6niz26grar-editor_css',
- children: (
- <>
-
- 2009年
-
- >
- ),
- },
- {
- name: 'content',
- className: 'feature7-block-content k6nj3s0akal-editor_css',
- children: (
- <>
-
- 协会获“浙江大学十大优秀志愿者服务集体”荣誉称号
-
- >
- ),
- },
- ],
- },
- },
- {
- md: 6,
- xs: 24,
- name: 'block~k6nj6vxuva',
- className: 'feature7-block',
- children: {
- className: 'feature7-block-group k6nj0rhbyb-editor_css',
- children: [
- {
- name: 'title',
- className: 'feature7-block-title k6niz26grar-editor_css',
- children: (
- <>
-
- 2009年
-
- >
- ),
- },
- {
- name: 'content',
- className: 'feature7-block-content k6nj3s0akal-editor_css',
- children: (
- <>
-
- 荣获“ 2009年度浙江大学优秀青年志愿者服务项目”荣誉称号
-
- >
- ),
- },
- ],
- },
- },
- {
- md: 6,
- xs: 24,
- name: 'block~k6nj6x1h1pp',
- className: 'feature7-block',
- children: {
- className: 'feature7-block-group k6nj0rhbyb-editor_css',
- children: [
- {
- name: 'title',
- className: 'feature7-block-title k6niz26grar-editor_css',
- children: (
- <>
-
- 2010年
-
- >
- ),
- },
- {
- name: 'content',
- className: 'feature7-block-content k6nj3s0akal-editor_css',
- children: (
- <>
-
- 协会由一星级社团跃升为三星级社团
-
-
- >
- ),
- },
- ],
- },
- },
- {
- md: 6,
- xs: 24,
- name: 'block~k6nj6xikh3',
- className: 'feature7-block',
- children: {
- className: 'feature7-block-group k6nj0rhbyb-editor_css',
- children: [
- {
- name: 'title',
- className: 'feature7-block-title k6niz26grar-editor_css',
- children: (
- <>
- 2012年
- >
- ),
- },
- {
- name: 'content',
- className: 'feature7-block-content k6nj3s0akal-editor_css',
- children: (
- <>
-
- 连续三年协会获评“浙江大学学生十佳社团”
-
-
- >
- ),
- },
- ],
- },
- },
- {
- md: 6,
- xs: 24,
- name: 'block~k6nj6ycl25',
- className: 'feature7-block',
- children: {
- className: 'feature7-block-group k6nj0rhbyb-editor_css',
- children: [
- {
- name: 'title',
- className: 'feature7-block-title k6niz26grar-editor_css',
- children: (
- <>
-
- 2014年
-
- >
- ),
- },
- {
- name: 'content',
- className: 'feature7-block-content k6nj3s0akal-editor_css',
- children: (
- <>
-
- 协会荣升为浙江大学四星级社团
-
-
- >
- ),
- },
- ],
- },
- },
- {
- md: 6,
- xs: 24,
- name: 'block~k6nj6z393nb',
- className: 'feature7-block',
- children: {
- className: 'feature7-block-group k6nj0rhbyb-editor_css',
- children: [
- {
- name: 'title',
- className: 'feature7-block-title k6niz26grar-editor_css',
- children: (
- <>
- 2015年
- >
- ),
- },
- {
- name: 'content',
- className: 'feature7-block-content k6nj3s0akal-editor_css',
- children: (
- <>
-
- 协会入选浙江大学最美公益服务集体
-
-
- >
- ),
- },
- ],
- },
- },
- {
- md: 6,
- xs: 24,
- name: 'block~k6nj70ilku',
- className: 'feature7-block',
- children: {
- className: 'feature7-block-group k6nj0rhbyb-editor_css',
- children: [
- {
- name: 'title',
- className: 'feature7-block-title k6niz26grar-editor_css',
- children: (
- <>
-
- 2015年
-
- >
- ),
- },
- {
- name: 'content',
- className: 'feature7-block-content k6nj3s0akal-editor_css',
- children: (
- <>
-
- 协会获社团文化节精品活动二等奖
-
-
- >
- ),
- },
- ],
- },
- },
- {
- md: 6,
- xs: 24,
- name: 'block~k6nj716t4x',
- className: 'feature7-block',
- children: {
- className: 'feature7-block-group k6nj0rhbyb-editor_css',
- children: [
- {
- name: 'title',
- className: 'feature7-block-title k6niz26grar-editor_css',
- children: (
- <>
-
- 2015年
-
- >
- ),
- },
- {
- name: 'content',
- className: 'feature7-block-content k6nj3s0akal-editor_css',
- children: (
- <>
-
- 协会获社团精品课程一等奖
-
-
-
-
-
-
-
- >
- ),
- },
- ],
- },
- },
- {
- md: 6,
- xs: 24,
- name: 'block~k6nj71z66a',
- className: 'feature7-block',
- children: {
- className: 'feature7-block-group k6nj0rhbyb-editor_css',
- children: [
- {
- name: 'title',
- className: 'feature7-block-title k6niz26grar-editor_css',
- children: (
- <>
-
- 2015年
-
- >
- ),
- },
- {
- name: 'content',
- className: 'feature7-block-content k6nj3s0akal-editor_css',
- children: (
- <>
-
- 协会暑期社会实践入选为校级重点社会实践项目
-
-
- >
- ),
- },
- ],
- },
- },
- {
- md: 6,
- xs: 24,
- name: 'block~k6nj72nvlx',
- className: 'feature7-block',
- children: {
- className: 'feature7-block-group k6nj0rhbyb-editor_css',
- children: [
- {
- name: 'title',
- className: 'feature7-block-title k6niz26grar-editor_css',
- children: (
- <>
-
- 2016年
-
- >
- ),
- },
- {
- name: 'content',
- className: 'feature7-block-content k6nj3s0akal-editor_css',
- children: (
- <>
-
- 协会荣升为浙江大学五星级社团
-
-
- >
- ),
- },
- ],
- },
- },
- {
- md: 6,
- xs: 24,
- name: 'block~k6nj73ckswc',
- className: 'feature7-block',
- children: {
- className: 'feature7-block-group k6nj0rhbyb-editor_css',
- children: [
- {
- name: 'title',
- className: 'feature7-block-title k6niz26grar-editor_css',
- children: (
- <>
- 2016年
- >
- ),
- },
- {
- name: 'content',
- className: 'feature7-block-content k6nj3s0akal-editor_css',
- children: (
- <>
-
- 协会荣获“ 2015年-2016年浙江大学学生示范性社团”
-
- >
- ),
- },
- ],
- },
- },
- ],
- },
-};
-export const Content110DataSource = {
- OverPack: {
- className: 'home-page-wrapper content11-wrapper',
- playScale: 0.3,
- },
- titleWrapper: {
- className: 'title-wrapper',
- children: [
- {
- name: 'image',
- children:
- 'https://gw.alipayobjects.com/zos/rmsportal/PiqyziYmvbgAudYfhuBr.svg',
- className: 'title-image',
- },
- {
- name: 'title',
- children: (
- <>
-
-
-
- >
- ),
- className: 'title-h1',
- },
- {
- name: 'content',
- children: (
- <>
-
- 每年协会成员都有多人进入竺可桢学院工高班和爱迪生班等荣誉班级就读
-
- >
- ),
- className: 'title-content k6njo4yb7gb-editor_css',
- },
- {
- name: 'content2',
- children: (
- <>
-
- 此外在”中控杯“、”大学生数学建模竞赛“、”电路板焊接大赛“中多人获得优异奖项
-
- >
- ),
- className: 'title-content k6njr5kxpn-editor_css',
- },
- ],
- },
- button: {
- className: '',
- children: { a: { className: 'button', href: '/#/ticket', children: '立即报名' } },
- },
-};
diff --git a/src/LearnMore/documentation.md b/src/LearnMore/documentation.md
deleted file mode 100644
index ad58ffc..0000000
--- a/src/LearnMore/documentation.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# 如何使用:
-
-- umi 里如何使用[请查看](https://landing.ant.design/docs/use/umi)。
-- 其它脚手架使用[请查看](https://landing.ant.design/docs/use/getting-started)。
diff --git a/src/LearnMore/index.jsx b/src/LearnMore/index.jsx
deleted file mode 100644
index 23c9616..0000000
--- a/src/LearnMore/index.jsx
+++ /dev/null
@@ -1,105 +0,0 @@
-/* eslint no-undef: 0 */
-/* eslint arrow-parens: 0 */
-import React from 'react';
-import { enquireScreen } from 'enquire-js';
-import Nav3 from "../Home/Nav3";
-import Pricing1 from './Pricing1';
-import Feature7 from './Feature7';
-import Content11 from './Content11';
-import Footer0 from '../Home/Footer0';
-import {
- Pricing10DataSource,
- Feature70DataSource,
- Content110DataSource,
-} from './data.source';
-import './less/antMotionStyle.less';
-import '../Home/less/antMotionStyle.less';
-import {
- Nav30DataSource,
-
- Footer00DataSource,
-
-
-} from '../Home/data.source';
-let isMobile;
-enquireScreen((b) => {
- isMobile = b;
-});
-
-const { location } = window;
-
-export default class Home extends React.Component {
- constructor(props) {
- super(props);
- this.state = {
- isMobile,
- show: !location.port, // 如果不是 dva 2.0 请删除
- };
- }
-
- componentDidMount() {
- // 适配手机屏幕;
- enquireScreen((b) => {
- this.setState({ isMobile: !!b });
- });
- // dva 2.0 样式在组件渲染之后动态加载,导致滚动组件不生效;线上不影响;
- /* 如果不是 dva 2.0 请删除 start */
- if (location.port) {
- // 样式 build 时间在 200-300ms 之间;
- setTimeout(() => {
- this.setState({
- show: true,
- });
- }, 500);
- }
- /* 如果不是 dva 2.0 请删除 end */
- }
-
- render() {
-
- const children = [
- ,
- ,
- ,
- ,
- ,
- ];
- return (
- {
- this.dom = d;
- }}
- >
- {/* 如果不是 dva 2.0 替换成 {children} start */}
- {this.state.show && children}
- {/* 如果不是 dva 2.0 替换成 {children} end */}
-
- );
- }
-}
diff --git a/src/LearnMore/less/antMotionStyle.less b/src/LearnMore/less/antMotionStyle.less
deleted file mode 100644
index def35ca..0000000
--- a/src/LearnMore/less/antMotionStyle.less
+++ /dev/null
@@ -1,7 +0,0 @@
-@import './common.less';
-@import './custom.less';
-@import './content.less';
-@import './pricing1.less';
-@import './feature7.less';
-@import './content11.less';
-@import './edit.less';
\ No newline at end of file
diff --git a/src/LearnMore/less/common.less b/src/LearnMore/less/common.less
deleted file mode 100644
index 5cd8d98..0000000
--- a/src/LearnMore/less/common.less
+++ /dev/null
@@ -1,24 +0,0 @@
-
-@import "~antd/lib/style/v2-compatible-reset.less";
-
-body {
- word-wrap: break-word;
-}
-
-/* .content-wrapper > .tween-one-leaving,
-.queue-anim-leaving {
- // position: absolute !important;
- // width: 100%;
-} */
-
-.video {
- max-width: 800px;
-}
-
-#react-content {
- min-height: 100%;
-}
-.home-page-wrapper p {
- padding: 0;
- margin: 0;
-}
diff --git a/src/LearnMore/less/content.less b/src/LearnMore/less/content.less
deleted file mode 100644
index c5ebf36..0000000
--- a/src/LearnMore/less/content.less
+++ /dev/null
@@ -1,44 +0,0 @@
-@homepage: home-page;
-.@{homepage}-wrapper {
- width: 100%;
- position: relative;
- overflow: hidden;
- .@{homepage} {
- height: 100%;
- max-width: 1200px;
- position: relative;
- margin: auto;
- will-change: transform;
- }
- .title-wrapper > h1, > h1 {
- font-size: 32px;
- color: @text-color;
- margin-bottom: 16px;
- }
- .title-wrapper {
- margin: 0 auto 64px;
- text-align: center;
- }
-}
-
-.@{homepage} {
- padding: 128px 24px;
-}
-
-@media screen and (max-width: 767px) {
- .@{homepage}-wrapper {
- .@{homepage} {
- padding: 56px 24px;
- >h1 {
- font-size: 24px;
- margin: 0 auto 32px;
- &.title-h1 {
- margin-bottom: 8px;
- }
- }
- >p {
- margin-bottom: 32px;
- }
- }
- }
-}
diff --git a/src/LearnMore/less/content11.less b/src/LearnMore/less/content11.less
deleted file mode 100644
index 70cf997..0000000
--- a/src/LearnMore/less/content11.less
+++ /dev/null
@@ -1,46 +0,0 @@
-@content11: content11;
-.@{content11}-wrapper {
- height: 480px;
- background: url("https://gw.alipayobjects.com/zos/rmsportal/ZsWYzLOItgeaWDSsXdZd.svg") no-repeat bottom;
- background-size: cover;
- background-size: 100%;
- margin: 0 auto;
- overflow: hidden;
- padding-top: 96px;
- &.home-page-wrapper {
- .title-wrapper {
- margin-bottom: 32px;
- }
- }
- .button {
- box-shadow: 0 8px 16px #0554b7;
- background: linear-gradient(to right, #05cbff, #1e5aff) !important;
- height: 42px;
- line-height: 42px;
- font-size: 14px;
- border: 0;
- border-radius: 21px;
- color: #fff;
- width: 128px;
- padding: 0 15px;
- display: inline-block;
- transition: transform .3s, box-shadow .3s;
- &:hover {
- transform: translateY(-4px);
- box-shadow: 0 12px 20px #0554b7;
- }
- &:active {
- transform: translateY(4px);
- box-shadow: 0 4px 8px #0554b7;
- }
- }
- .title-content {
- line-height: 32px;
- }
-}
-
-@media screen and (max-width: 767px) {
- .@{content11}-wrapper {
- padding-bottom: 0;
- }
-}
diff --git a/src/LearnMore/less/custom.less b/src/LearnMore/less/custom.less
deleted file mode 100644
index 710e47c..0000000
--- a/src/LearnMore/less/custom.less
+++ /dev/null
@@ -1,35 +0,0 @@
-@import "~antd/lib/style/themes/default.less";
-
-@line-color: #e9e9e9;
-
-@shadow-color: rgba(0, 0, 0, 0.15);
-
-@bottom-bar-bg-color: #262626;
-@bottom-bar-line-color: #000;
-
-@template-bg-color: #001529;
-@template-bg-color-light: #ececec;
-@template-nav-bg-color: #001529;
-@template-text-color: #ccc;
-@template-text-title-color: #bcbcbc;
-@template-text-color-light: #fff;
-@template-footer-text-color: #999;
-
-@animate-duration: .45s;
-
-/* 详细页图片或框框的样式;
-*/
-.page-shadow() {
- box-shadow: 0 5px 8px @shadow-color;
-}
-
-.page-pro() {
- border-radius: 6px;
- border: 1px solid @line-color;
- transform: translateY(0);
- transition: transform .3s @ease-out, box-shadow .3s @ease-out;
- &:hover {
- .page-shadow();
- transform: translateY(-5px);
- }
-}
diff --git a/src/LearnMore/less/edit.less b/src/LearnMore/less/edit.less
deleted file mode 100644
index eff2888..0000000
--- a/src/LearnMore/less/edit.less
+++ /dev/null
@@ -1,50 +0,0 @@
-#Pricing1_0
- .pricing1-block-box
- > .pricing1-top-wrapper
- > .k6niku34c3-editor_css {
- font-size: 28px;
-}
-#Pricing1_0 .ant-col > .pricing1-block-box > .k6nimnp5as-editor_css {
- font-size: 16px;
-}
-#Pricing1_0
- .pricing1-block-box
- > .pricing1-top-wrapper
- > .k6ninis0ok-editor_css {
- font-size: 28px;
-}
-#Pricing1_0 .ant-col > .pricing1-block-box > .k6niojh3hyf-editor_css {
- font-size: 16px;
-}
-#Pricing1_0
- .pricing1-block-box
- > .pricing1-top-wrapper
- > .k6nip1p7ezh-editor_css {
- font-size: 28px;
-}
-#Pricing1_0 .ant-col > .pricing1-block-box > .k6nipheaxuh-editor_css {
- font-size: 16px;
-}
-#Feature7_0 .ant-col > .feature7-block-group > .k6niz1ixc6-editor_css {
- width: 0%;
-}
-#Feature7_0 .ant-col > .feature7-block-group > .k6nj0lolnf-editor_css {
- display: none;
-}
-#Feature7_0 .ant-row > .ant-col > .k6nj0rhbyb-editor_css {
- text-align: center;
-}
-#Feature7_0 .ant-col > .feature7-block-group > .k6niz26grar-editor_css {
- width: 50px;
- margin: 0px 0px 16px 90px;
-}
-#Feature7_0 .ant-col > .feature7-block-group > .k6nj3s0akal-editor_css {
- font-size: 16px;
-}
-#Content11_0 .title-wrapper > .k6njo4yb7gb-editor_css {
- font-size: 16px;
-}
-#Content11_0 .title-wrapper > .k6njr5kxpn-editor_css {
- font-size: 16px;
- height: 100px;
-}
diff --git a/src/LearnMore/less/feature7.less b/src/LearnMore/less/feature7.less
deleted file mode 100644
index f8f41b7..0000000
--- a/src/LearnMore/less/feature7.less
+++ /dev/null
@@ -1,81 +0,0 @@
-@feature7: feature7;
-
-.@{feature7} {
- &-wrapper {
- min-height: 564px;
- margin: 0 auto;
- overflow: hidden;
- background-color: #f7f9fc;
-
- &.home-page-wrapper {
- .home-page {
- padding: 64px 24px;
- }
- }
- }
-
- &-title {
-
- &-wrapper {
- text-align: center;
- margin-bottom: 40px;
- }
-
- &-h1 {
- font-size: 32px;
- color: @text-color;
- }
-
- &-content {
- margin-top: 16px;
- }
- }
-
- &-block {
- margin-top: 28px;
-
- &-group {
- display: block;
- padding: 28px 24px;
- box-shadow: 0 2px 16px fade(#000, 8);
- background-image: url('https://gw.alipayobjects.com/mdn/rms_ae7ad9/afts/img/A*fMOFSpRXMxsAAAAAAAAAAABkARQnAQ');
- background-repeat: no-repeat;
- background-position: 100% 100%;
- transition: box-shadow @animate-duration @ease-in-out, transform @animate-duration @ease-in-out;
-
- &:hover {
- transform: translateY(-5px);
- box-shadow: 0 6px 16px fade(#000, 12);
- }
- }
-
- &-image {
- float: left;
- width: 24px;
- }
-
- &-title {
- font-size: 14px;
- float: left;
- margin-left: 8px;
- margin-bottom: 16px;
- color: @text-color;
- }
-
- &-content {
- clear: both;
- color: fade(@text-color, 75);
- }
- }
-}
-
-@media screen and (max-width: 767px) {
- .@{feature7}-wrapper {
- min-height: 1540px;
- &.home-page-wrapper {
- .home-page {
- padding: 56px 24px;
- }
- }
- }
-}
diff --git a/src/LearnMore/less/pricing1.less b/src/LearnMore/less/pricing1.less
deleted file mode 100644
index ef73635..0000000
--- a/src/LearnMore/less/pricing1.less
+++ /dev/null
@@ -1,85 +0,0 @@
-@pricing1: pricing1;
-.@{pricing1}-wrapper {
- min-height: 760px;
- .@{pricing1} {
- >p {
- text-align: center;
- }
- &-content-wrapper {
- min-height: 400px;
- }
- &-block-box {
- width: 260px;
- border-radius: 4px;
- background: #eef0f3;
- text-align: center;
- color: #666;
- min-height: 400px;
- margin: auto;
- border: 1px solid transparent;
- .page-pro();
- &.active {
- border-color: @primary-color;
- background: #fff;
- .@{pricing1} {
- &-top-wrapper {
- background: @primary-color;
- }
- &-name,
- &-money,
- &-button {
- color: #fff;
- }
- &-button {
- background: @primary-color;
- }
- }
- }
- }
- &-block {
- margin-bottom: 24px;
- }
- &-top-wrapper {
- width: 100%;
- padding: 16px 24px;
- }
- &-name {
- font-size: 14px;
- }
- &-money {
- font-family: 'Helvetica Neue', sans-serif;
- font-size: 32px;
- color: #666;
- }
- &-content {
- font-size: 12px;
- line-height: 2;
- font-weight: 300;
- margin: 32px 24px 48px;
- }
- &-line {
- display: block;
- height: 1px;
- background: #d9d9d9;
- margin: 0 24px;
- }
- &-button-wrapper {
- margin: 18px 24px;
- }
- &-button {
- padding: 0 24px;
- }
- }
- &.home-page-wrapper {
- .@{pricing1}-title-wrapper {
- margin-bottom: 64px;
- text-align: center;
- }
- }
-}
-
-@media screen and (max-width: 767px) {
- .@{pricing1}-wrapper {
- padding-bottom: 0;
- }
-}
diff --git a/src/LearnMore/utils.js b/src/LearnMore/utils.js
deleted file mode 100644
index e9d9c4f..0000000
--- a/src/LearnMore/utils.js
+++ /dev/null
@@ -1,25 +0,0 @@
-
-import React from 'react';
-import { Button } from 'antd';
-
-export const isImg = /^http(s)?:\/\/([\w-]+\.)+[\w-]+(\/[\w-./?%&=]*)?/;
-export const getChildrenToRender = (item, i) => {
- let tag = item.name.indexOf('title') === 0 ? 'h1' : 'div';
- let children;
- switch (item.name) {
- case 'image':
- children = React.createElement('img', { src: item.children, alt: 'img' });
- break;
- case 'a':
- children = React.createElement('a', { href: item.href }, [item.children]);
- break;
- default:
- children = item.children;
- }
- if (item.name.indexOf('button') === 0 && typeof item.children === 'object') {
- children = React.createElement(Button, {
- ...item.children
- });
- }
- return React.createElement(tag, { key: i.toString(), ...item }, children);
-};
diff --git a/src/picture/back1.jpg b/src/picture/back1.jpg
index 902d172..09ff934 100644
Binary files a/src/picture/back1.jpg and b/src/picture/back1.jpg differ
diff --git a/src/picture/caiwaibu.png b/src/picture/caiwaibu.png
new file mode 100644
index 0000000..4fa1dd5
Binary files /dev/null and b/src/picture/caiwaibu.png differ
diff --git a/src/picture/diannao.png b/src/picture/diannao.png
new file mode 100644
index 0000000..981554d
Binary files /dev/null and b/src/picture/diannao.png differ
diff --git a/src/picture/diannaobu.png b/src/picture/diannaobu.png
new file mode 100644
index 0000000..8a23100
Binary files /dev/null and b/src/picture/diannaobu.png differ
diff --git a/src/picture/dianqibu.png b/src/picture/dianqibu.png
new file mode 100644
index 0000000..eae39bd
Binary files /dev/null and b/src/picture/dianqibu.png differ
diff --git a/src/picture/diy.png b/src/picture/diy.png
new file mode 100644
index 0000000..9758caf
Binary files /dev/null and b/src/picture/diy.png differ
diff --git a/src/picture/fenxiang1.png b/src/picture/fenxiang1.png
new file mode 100644
index 0000000..3106bb9
Binary files /dev/null and b/src/picture/fenxiang1.png differ
diff --git a/src/picture/fenxiang2.png b/src/picture/fenxiang2.png
new file mode 100644
index 0000000..1d690c1
Binary files /dev/null and b/src/picture/fenxiang2.png differ
diff --git a/src/picture/history.jpg b/src/picture/history.jpg
index 17d9a5c..56615cd 100644
Binary files a/src/picture/history.jpg and b/src/picture/history.jpg differ
diff --git a/src/picture/huodong.png b/src/picture/huodong.png
new file mode 100644
index 0000000..87a9b57
Binary files /dev/null and b/src/picture/huodong.png differ
diff --git a/src/picture/jicheng.png b/src/picture/jicheng.png
new file mode 100644
index 0000000..72d6f78
Binary files /dev/null and b/src/picture/jicheng.png differ
diff --git a/src/picture/jingpin1.jpg b/src/picture/jingpin1.jpg
index 96a22ae..fba61e8 100644
Binary files a/src/picture/jingpin1.jpg and b/src/picture/jingpin1.jpg differ
diff --git a/src/picture/ketang.png b/src/picture/ketang.png
new file mode 100644
index 0000000..532dc62
Binary files /dev/null and b/src/picture/ketang.png differ
diff --git a/src/picture/luntan1.jpg b/src/picture/luntan1.jpg
index 8a6f004..dceb10b 100644
Binary files a/src/picture/luntan1.jpg and b/src/picture/luntan1.jpg differ
diff --git a/src/picture/renzibu.png b/src/picture/renzibu.png
new file mode 100644
index 0000000..ad46bdd
Binary files /dev/null and b/src/picture/renzibu.png differ
diff --git a/src/picture/richang1.jpg b/src/picture/richang1.jpg
index 1e3fcc4..a9d7b86 100644
Binary files a/src/picture/richang1.jpg and b/src/picture/richang1.jpg differ
diff --git a/src/picture/richang2.jpg b/src/picture/richang2.jpg
index 325cd27..9db91f5 100644
Binary files a/src/picture/richang2.jpg and b/src/picture/richang2.jpg differ
diff --git a/src/picture/shequ1.jpg b/src/picture/shequ1.jpg
index 488fdf9..7654f19 100644
Binary files a/src/picture/shequ1.jpg and b/src/picture/shequ1.jpg differ
diff --git a/src/picture/tool.png b/src/picture/tool.png
new file mode 100644
index 0000000..caa7e87
Binary files /dev/null and b/src/picture/tool.png differ
diff --git a/src/picture/weixiu.png b/src/picture/weixiu.png
new file mode 100644
index 0000000..9cb65a5
Binary files /dev/null and b/src/picture/weixiu.png differ
diff --git a/src/picture/weixiu1.png b/src/picture/weixiu1.png
new file mode 100644
index 0000000..a4d1b48
Binary files /dev/null and b/src/picture/weixiu1.png differ
diff --git a/src/picture/wenxuanbu.png b/src/picture/wenxuanbu.png
new file mode 100644
index 0000000..103ff83
Binary files /dev/null and b/src/picture/wenxuanbu.png differ
diff --git a/src/picture/xianshang.png b/src/picture/xianshang.png
new file mode 100644
index 0000000..84ac7c3
Binary files /dev/null and b/src/picture/xianshang.png differ
diff --git a/src/picture/xuesheng.png b/src/picture/xuesheng.png
new file mode 100644
index 0000000..9bab32a
Binary files /dev/null and b/src/picture/xuesheng.png differ
diff --git a/src/picture/xueshengjie1.jpg b/src/picture/xueshengjie1.jpg
index 0b57d49..98e93aa 100644
Binary files a/src/picture/xueshengjie1.jpg and b/src/picture/xueshengjie1.jpg differ
diff --git a/src/picture/xueyuan1.jpg b/src/picture/xueyuan1.jpg
index 63b5995..ebd2ab1 100644
Binary files a/src/picture/xueyuan1.jpg and b/src/picture/xueyuan1.jpg differ
diff --git a/src/picture/zhiban.png b/src/picture/zhiban.png
new file mode 100644
index 0000000..70d656f
Binary files /dev/null and b/src/picture/zhiban.png differ
diff --git a/src/picture/zhiyuanzhe.png b/src/picture/zhiyuanzhe.png
new file mode 100644
index 0000000..95813c5
Binary files /dev/null and b/src/picture/zhiyuanzhe.png differ