From 3da320db774e76fc11eae350ff7e0be786294c3a Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Wed, 8 Feb 2023 17:14:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E6=96=87=E7=B3=BB=E7=BB=9F=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=8A=A8=E7=94=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layouts/navbar/index.vue | 2 +- src/pages/exp/index.vue | 11 ++- src/pages/news/index.vue | 9 +- src/pages/science/index.vue | 18 ++-- src/pages/sfel/index.vue | 170 +++++++++++++++++++------------- src/pages/talent/index.vue | 75 ++++++++++---- src/pages/userSharing/index.vue | 23 +++-- src/setting.js | 4 +- 8 files changed, 203 insertions(+), 109 deletions(-) diff --git a/src/layouts/navbar/index.vue b/src/layouts/navbar/index.vue index 022e270..31d7df2 100644 --- a/src/layouts/navbar/index.vue +++ b/src/layouts/navbar/index.vue @@ -63,7 +63,7 @@ export default { }).then(({ data }) => { this.menus = data if (data.length) { - if (!this.$route.query.id && this.$route.path !== '/column/result') this.$router.replace(`/column?id=${data[0].id}&siteId=${data[0].siteId}`) + if (!this.$route.query.id && !this.$route.query.articleId && this.$route.path !== '/column/result') this.$router.replace(`/column?id=${data[0].id}&siteId=${data[0].siteId}`) if (!this.active) this.active = data[0].id this.$nextTick(() => { const menu = document.querySelectorAll('.el-submenu') diff --git a/src/pages/exp/index.vue b/src/pages/exp/index.vue index 894e4ca..c5a6d43 100644 --- a/src/pages/exp/index.vue +++ b/src/pages/exp/index.vue @@ -13,8 +13,8 @@
-
实验线站
-

EXPERIMENT STATIONS

+
实验线站
+

EXPERIMENT STATIONS

{{ modules[1].form.des }}
@@ -124,10 +124,17 @@ export default { li { position: relative; height: 542px; + overflow: hidden; + &:hover { + img { + transform: scale(1.3); + } + } } img { width: 100%; height: 100%; + transition: .5s; } h6 { position: absolute; diff --git a/src/pages/news/index.vue b/src/pages/news/index.vue index d36fd7a..5350c61 100644 --- a/src/pages/news/index.vue +++ b/src/pages/news/index.vue @@ -17,8 +17,8 @@ -
-
+
{{curColumn}} +
@@ -26,7 +26,7 @@

{{ curArticle.createTime }} {{ curArticle.author && ' | ' + curArticle.author }}

    -
  • +
@@ -264,7 +264,10 @@ export default { // 长页栏目直接获取path this.$router.push(`/${data.path}?id=${id}`).catch(err => {}) } else { + this.curInd = 0 this.curColumn = i + this.curArticle = this.modules[1].list[i].articles[0] || {} + this.carouselInterval() } }).catch(err => {}) } else { diff --git a/src/pages/science/index.vue b/src/pages/science/index.vue index 0d4454a..c402025 100644 --- a/src/pages/science/index.vue +++ b/src/pages/science/index.vue @@ -13,21 +13,21 @@
-
+
{{ modules[1].form.title }}
{{ modules[1].form.des }}
-
+
{{ modules[2].form.title }}
{{ modules[2].form.des }}
-
+
{{ modules[3].form.title }}
@@ -43,7 +43,6 @@ import mixins from '@/mixins/page' import Setting from '@/setting' import Util from '@/libs/util' -import Breadcrumb from '@/components/breadcrumb' import WOW from 'wow.js' export default { mixins: [mixins], @@ -52,9 +51,6 @@ export default { routes: [] } }, - components: { - Breadcrumb - }, mounted() { new WOW().init() }, @@ -86,6 +82,13 @@ export default { .item { position: relative; margin-bottom: 58px; + &:hover { + .texts { + color: #fff; + transform: scale(1.05); + background: #32b6e9 !important; + } + } img { width: 100%; height: 508px; @@ -110,6 +113,7 @@ export default { padding: 70px 38px; color: #333; background: #FFF6E9; + transition: .5s; } h6 { margin-bottom: 14px; diff --git a/src/pages/sfel/index.vue b/src/pages/sfel/index.vue index f1a891e..0d74c1c 100644 --- a/src/pages/sfel/index.vue +++ b/src/pages/sfel/index.vue @@ -10,7 +10,7 @@