From 1022a35efe40f4692dc0a41e5a1524e21ccd2fa5 Mon Sep 17 00:00:00 2001 From: lucky Date: Thu, 14 Jan 2021 23:02:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=B5=E5=8C=96=E5=B9=B3=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/teacher01.png | Bin 0 -> 615 bytes src/assets/teacher02.png | Bin 0 -> 705 bytes src/common/portrait.styl | 40 ++++ src/components/Banner/Banner.vue | 14 +- src/components/Introduce/Pter.vue | 11 +- src/router/index.js | 6 + src/views/About/Children/Partner.vue | 4 - src/views/FirstPage/FirstPage.vue | 84 ++++++--- src/views/Hatch/Children/Partner.vue | 9 +- src/views/Hatch/Children/Service.vue | 133 +++++++++++++- src/views/Hatch/Children/Tutor.vue | 135 +++++++++++++- src/views/Hatch/Hatch.vue | 32 +++- src/views/ItInformation/ItInformation.vue | 212 ++++++++++++++++++++++ 13 files changed, 632 insertions(+), 48 deletions(-) create mode 100644 src/assets/teacher01.png create mode 100644 src/assets/teacher02.png create mode 100644 src/views/ItInformation/ItInformation.vue diff --git a/src/assets/teacher01.png b/src/assets/teacher01.png new file mode 100644 index 0000000000000000000000000000000000000000..f2cd09cf42d903da6fe8661c309fda85dfca996c GIT binary patch literal 615 zcmV-t0+{`YP)1v3R#4-QDvA&y-UY>r^dO3VfuKSVL7}Jw1k+5! zb3we-Lnes?4TOjY9^%crf*^Xa^rAQM7A%U27}UVzlf@KlHO&yV(8JDkci(yTnPHiC zg$+1l12U09g|13!Y9dpmQt2FUZQR2m@)LLi+;`3`uD-umEFLk&TmcROo5$rDW9BQB z%9G{$RxF>jwymn?fsbniiO3FM3h1lqQ(&fAtu9$>cd6=Q5jhEL0=}y1_c2*}fP2ol z@<=G)v~zCvxVM{~ojoKXbHFJP`Qp8wj-u!_un%Z@@8|3F`nz#C*4kLW!$hFs$@2Mp zl*{GL03F~PuoJlKoNEI*4k*5!IMni_*4pR52~}O}cDqMAosJIyT5qV^zztQsQ>|8u zp+M^mH3PH7ELbm6{6Dl*vLE<0>~}wa zt*ZLo81uq=|ESmNy=t{upF^@IhWaa9^7;IhY&Lt$7*hcb0}FAP_1-Vk>-89PqLJ9Y zghHXPx7lodnuuc6Ly18p0h7e?CCRZOD>W6W_BZf!*)`fGPpSX_002ovPDHLkV1hZ$ B9H9UJ literal 0 HcmV?d00001 diff --git a/src/assets/teacher02.png b/src/assets/teacher02.png new file mode 100644 index 0000000000000000000000000000000000000000..f075d5038e8ee4e338b3f72e3d9237cf15742e0c GIT binary patch literal 705 zcmV;y0zUnTP)i$5-zJGJ5K^RxaghPY;sA^-EP_U zz4z^J_PrSvVT>;vV{ed{i@Q1rx&McpQYwdtXXCzc54!KoX7ifsx?i@^bbNDC%3YRa z-2;GwTI>5g6p0ne82d>?4}=i4uIBRj{Qh)0{f3BUg%B&TDh^Q8LC*L6!&>Vnobwqe z<&A({HMa|o>tZj170AQJjo<>a)Hx3c^A)@Cv&gV$v5OEOz9uH}h%n{K^ zA;i1L=7bP)acT6TQ%cnk@dW35H8Gcv>xDqKSSe-NvaHJha039Qh)B0Ih`0v;)`^H( z_l&WNj^n)E$oI!6X?5$M8^ZIvOIqs%L_E(qFK_iSN~tm;-r}4;AF8=hskFoxyYjce zJ`!_-Jb;KFh$uwFV*qe{bHfa!TU$n?l*}~E z3C7rL7=~thbUf5r&jY|m0MONH^@Z>I>qG6EEX7J=OQHUH)O5RXk5tUa-X`M=lZQQ nXnpb{Coa*1TtY4`fw;O~H- { - document.querySelector('#banner-box').scrollIntoView({ - behavior: 'smooth', // 平滑过渡 - block: 'start', // 上边框与视窗顶部平齐 - }); - }, 1000); + // window.addEventListener('scroll', this.handleScroll); + // setTimeout(() => { + // document.querySelector('#banner-box').scrollIntoView({ + // behavior: 'smooth', // 平滑过渡 + // block: 'start', // 上边框与视窗顶部平齐 + // }); + // }, 1000); }, async created() { diff --git a/src/components/Introduce/Pter.vue b/src/components/Introduce/Pter.vue index fe71b94..1a09d73 100644 --- a/src/components/Introduce/Pter.vue +++ b/src/components/Introduce/Pter.vue @@ -12,9 +12,12 @@

Partners

-
- {{ item }} -
+
{{ item }}
@@ -35,7 +38,7 @@ export default { .partner-title-box { height: 70px; line-height: 34px; - margin: 0 0 40px 20px; + margin: 30px 0 30px 20px; padding-left: 6px; border-left: 6px solid #007CC1; } diff --git a/src/router/index.js b/src/router/index.js index acc89d2..4d172c7 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -223,6 +223,12 @@ const routes = [ }, ], }, + // 行业资讯 + { + path: '/ItInformation', + name: 'ItInformation', + component: () => import(/* webpackChunkName: "cooperative-enterprise" */ 'views/ItInformation/ItInformation.vue'), + }, ]; const router = new VueRouter({ diff --git a/src/views/About/Children/Partner.vue b/src/views/About/Children/Partner.vue index adf5633..2d1a12a 100644 --- a/src/views/About/Children/Partner.vue +++ b/src/views/About/Children/Partner.vue @@ -13,10 +13,6 @@ export default { return { title: '合作伙伴', typeOfPlatform: '关于我们', - arr: [ - { name: '关于我们', url: '/About/Introduce' }, - { name: '合作伙伴', url: '' }, - ], }; }, }; diff --git a/src/views/FirstPage/FirstPage.vue b/src/views/FirstPage/FirstPage.vue index 7163415..dc47d30 100644 --- a/src/views/FirstPage/FirstPage.vue +++ b/src/views/FirstPage/FirstPage.vue @@ -9,17 +9,14 @@
-
- - 创新政策 -
-
- - 双创活动 -
-
- - 服务超市 +
+ + {{ item.name }}
@@ -28,29 +25,31 @@
-
- -
数智开发
-
-
- -
创新挑战
+
+ +
{{ item.name }}
-
行业资讯
+
行业资讯
{{ list.title }}
{{ $moment(+list.time).format('YYYY-MM-DD') }}
+ >{{ $moment(+list.time * 1000).format('YYYY-MM-DD') }}
@@ -64,7 +63,7 @@ diff --git a/src/views/Hatch/Children/Partner.vue b/src/views/Hatch/Children/Partner.vue index f820f62..ed90d02 100644 --- a/src/views/Hatch/Children/Partner.vue +++ b/src/views/Hatch/Children/Partner.vue @@ -1,11 +1,16 @@ diff --git a/src/views/Hatch/Children/Service.vue b/src/views/Hatch/Children/Service.vue index c1b4ea6..a4be78d 100644 --- a/src/views/Hatch/Children/Service.vue +++ b/src/views/Hatch/Children/Service.vue @@ -1,11 +1,140 @@ + + + diff --git a/src/views/Hatch/Children/Tutor.vue b/src/views/Hatch/Children/Tutor.vue index e5b94ad..70632d1 100644 --- a/src/views/Hatch/Children/Tutor.vue +++ b/src/views/Hatch/Children/Tutor.vue @@ -1,11 +1,142 @@ + + + + + diff --git a/src/views/Hatch/Hatch.vue b/src/views/Hatch/Hatch.vue index a6c4365..6139107 100644 --- a/src/views/Hatch/Hatch.vue +++ b/src/views/Hatch/Hatch.vue @@ -1,23 +1,45 @@ diff --git a/src/views/ItInformation/ItInformation.vue b/src/views/ItInformation/ItInformation.vue new file mode 100644 index 0000000..b502bae --- /dev/null +++ b/src/views/ItInformation/ItInformation.vue @@ -0,0 +1,212 @@ + + + + + + +