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.title }}
{{ item.content }}
时间:{{ item.time }}
@@ -163,8 +166,8 @@ export default { } .pro-box { - width: 26%; - margin-right: 11%; + width: 31.3%; + margin-right: 3%; height: auto; background: #FFFFFF; padding: 24px 20px; diff --git a/src/views/Challenge/Children/Release.vue b/src/views/Challenge/Children/Release.vue index 2278ca3..e93c2bf 100644 --- a/src/views/Challenge/Children/Release.vue +++ b/src/views/Challenge/Children/Release.vue @@ -1,7 +1,12 @@{{ item.title }}
{{ item.content }}
时间:{{ item.time }}
@@ -171,8 +176,8 @@ export default { } .pro-box { - width: 20.5%; - margin-right: 6%; + width: 23.5%; + margin-right: 2%; height: 300px; background: #FFFFFF; padding: 24px 20px; diff --git a/src/views/Challenge/components/LeftNav.vue b/src/views/Challenge/components/LeftNav.vue index 184e8e0..95ec708 100644 --- a/src/views/Challenge/components/LeftNav.vue +++ b/src/views/Challenge/components/LeftNav.vue @@ -7,9 +7,12 @@ --> diff --git a/src/views/Develop/Develop.vue b/src/views/Develop/Develop.vue index 998be1d..0039892 100644 --- a/src/views/Develop/Develop.vue +++ b/src/views/Develop/Develop.vue @@ -12,15 +12,25 @@ 各中心介绍包含科创体系与科创能力咨询服务中心、知识产权与技术转移咨询服务中心、 数字化转型咨询服务中心、科技信息咨询服务中心、科创战略协同研究中心、山西奥依工业设计咨询服务中心 -
+
公司采取理事会、经理层、事业部组织架构,公司理事会组成按理事会章程执行,经理层设总经理 1 名、副总经理 2-3 名,各事业部设部长 1
名、副部长 1 名。
公司以协同创新中心为引擎、以创业孵化平台为基石、以产业集聚发展为导向,基于创新链、孵化链和产业链进行整体布局,下设行政事业部、创新事业部、孵化事业部和产业事业部。
diff --git a/src/views/FirstPage/FirstPage.vue b/src/views/FirstPage/FirstPage.vue
index 6d345a9..dc47d30 100644
--- a/src/views/FirstPage/FirstPage.vue
+++ b/src/views/FirstPage/FirstPage.vue
@@ -9,17 +9,14 @@
{{ teacher.categoryName }} {{ monthEnglish[item.time.split('-')[1] - 1] }}. {{ item.time.split(' ')[0].split('-')[2] }} {{ item.title }} {{ item.content }}
+ 时间:{{ item.time }}
+ 地点:{{ item.site }}
+
- 创新政策
-
- 创新政策
-
- 创新政策
+
+ {{ item.name }}
-
-
+
+
+
+