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/platform.styl b/src/common/platform.styl index 82c620e..bb5545a 100644 --- a/src/common/platform.styl +++ b/src/common/platform.styl @@ -3,16 +3,26 @@ color: #000; font-size: 18px; font-weight: bold; - div { + .nav-item { cursor: pointer; height: 80px; line-height: 80px; background: #fff; - margin-bottom: 2px; - text-align: center + margin: 0 4px 6px 0; + text-align: center; + box-shadow: 0 3px 6px rgba(0,0,0,0.16); + } + + .nav-item:hover{ + color: #007CC1 !important; } } -.nav-box-active { +.nav-item-active { + cursor: pointer; + height: 80px; + line-height: 80px; + margin: 0 4px 6px 0; + text-align: center; background: #007CC1 !important; color: #fff !important; } diff --git a/src/common/portrait.styl b/src/common/portrait.styl index 046ac89..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; @@ -188,6 +228,10 @@ margin-top: 16px; } +.mt-5{ + margin-top: 20px; +} + .mt-8{ margin-top: 32px; } 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/PartnerShip.styl b/src/components/Introduce/PartnerShip.styl index 67e9053..69eecf4 100644 --- a/src/components/Introduce/PartnerShip.styl +++ b/src/components/Introduce/PartnerShip.styl @@ -39,9 +39,9 @@ } .enterprise-box{ - width: 26%; + width: 31.3%; height: 382px; - margin-right: 11%; + margin-right: 3%; position: relative; padding: 0 16px; 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/Organ.vue b/src/views/About/Children/Organ.vue index 0022924..b8346cb 100644 --- a/src/views/About/Children/Organ.vue +++ b/src/views/About/Children/Organ.vue @@ -1,6 +1,6 @@