diff --git a/src/assets/teacher01.png b/src/assets/teacher01.png new file mode 100644 index 0000000..f2cd09c Binary files /dev/null and b/src/assets/teacher01.png differ diff --git a/src/assets/teacher02.png b/src/assets/teacher02.png new file mode 100644 index 0000000..f075d50 Binary files /dev/null and b/src/assets/teacher02.png differ diff --git a/src/common/portrait.styl b/src/common/portrait.styl index 7ac8c02..de4d149 100644 --- a/src/common/portrait.styl +++ b/src/common/portrait.styl @@ -23,6 +23,10 @@ padding: 20px; } +.pa-10 { + padding: 40px; +} + .pb-3 { padding-bottom: 12px; } @@ -113,6 +117,42 @@ padding-bottom: 40px; } +.pl-1{ + padding-left: 4px; +} + +.pl-2{ + padding-left: 8px; +} + +.pl-3{ + padding-left: 12px; +} + +.pr-1{ + padding-right: 4px; +} + +.pr-2{ + padding-right: 8px; +} + +.pr-3{ + padding-right: 12px; +} + +.pt-1{ + padding-top: 4px; +} + +.pt-2{ + padding-top: 8px; +} + +.pt-3{ + padding-top: 12px; +} + // margin .ma-2 { margin: 8px; diff --git a/src/components/Banner/Banner.vue b/src/components/Banner/Banner.vue index 5e0a61f..fb7ba38 100644 --- a/src/components/Banner/Banner.vue +++ b/src/components/Banner/Banner.vue @@ -32,13 +32,13 @@ export default { computed: mapState('home', ['bannerLists']), mounted() { - window.addEventListener('scroll', this.handleScroll); - setTimeout(() => { - 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 @@ + + + + + + +