diff --git a/src/mixins/article/index.js b/src/mixins/article/index.js index 0170a97..3315a1b 100644 --- a/src/mixins/article/index.js +++ b/src/mixins/article/index.js @@ -86,7 +86,7 @@ export default { location.href = href } } else { - this.$router.push(`/article?articleId=${item.id}&site=${this.site}&id=${item.columnId}`) + this.$router.push(`/article?articleId=${item.id}&siteId=${this.site}&id=${item.columnId}`) } } } diff --git a/src/pages/article/index.vue b/src/pages/article/index.vue index 553a031..840e641 100644 --- a/src/pages/article/index.vue +++ b/src/pages/article/index.vue @@ -13,7 +13,7 @@

- @@ -373,15 +371,15 @@ export default { clearInterval(this.timer) this.timer = setInterval(() => { this.curInd1++ - if (this.curInd1 > 3) this.curInd1 = 0 + if (this.curInd1 > this.articles1.length - 1) this.curInd1 = 0 if (this.articles1[this.curInd1]) this.curArticle1 = this.articles1[this.curInd1] || {} this.curInd2++ - if (this.curInd2 > 3) this.curInd2 = 0 + if (this.curInd2 > this.articles2.length - 1) this.curInd2 = 0 if (this.articles2[this.curInd2]) this.curArticle2 = this.articles2[this.curInd2] || {} this.curInd3++ - if (this.curInd3 > 3) this.curInd3 = 0 + if (this.curInd3 > this.articles3.length - 1) this.curInd3 = 0 if (this.articles3[this.curInd3]) this.curArticle3 = this.articles3[this.curInd3] || {} }, 5000) }, @@ -717,27 +715,26 @@ export default { .action { position: absolute; bottom: 20px; - right: 20px; + left: 50%; display: flex; align-items: center; font-size: 14px; color: rgba(255, 255, 255, 0.65); + transform: translateX(-50%); } .inds { display: inline-flex; - margin: 0 5px; + margin: 0 15px; li { width: 10px; height: 10px; margin-right: 6px; - background: rgba(255, 255, 255, 0.65); + background: rgba(255, 255, 255, 1); border-radius: 50%; transition: 0.2s; cursor: pointer; &.active { - width: 20px; - background: rgba(255, 255, 255, 0.3); - border-radius: 5px; + background: #1583ff; } &:last-child { margin-right: 0; @@ -745,6 +742,8 @@ export default { } } .dir { + font-size: 1.2rem; + color: #fff; line-height: 1; cursor: pointer; } diff --git a/src/pages/lightSources/index.vue b/src/pages/lightSources/index.vue index d6ac5cf..7bd700e 100644 --- a/src/pages/lightSources/index.vue +++ b/src/pages/lightSources/index.vue @@ -15,14 +15,20 @@

{{ modules[1].form.title }}

{{ modules[1].form.des }}

- + +
@@ -101,6 +107,7 @@ colspan="11">暂无数据 + @@ -198,6 +205,12 @@ export default { text-align: left; } } +.copyright { + margin-top: 10px; + font-size: 0.7rem; + line-height: 1.6; + color: #8d8d8d; +} @media (max-width: 1200px) { .table-wrap { width: 100%; diff --git a/src/pages/mission/index.vue b/src/pages/mission/index.vue index 1806c70..9a494e4 100644 --- a/src/pages/mission/index.vue +++ b/src/pages/mission/index.vue @@ -120,22 +120,23 @@ export default { width: 100%; height: 400px; } - &:nth-child(2) .texts { - left: auto; - right: -36px; - color: #fff; - background: rgba(40, 179, 255, 0.54); - } .texts { position: absolute; top: 79px; left: -34px; width: 532px; - padding: 70px 38px; + padding: 70px 38px 70px 55px; color: #333; background: rgba(255, 241, 231, 0.84); transition: 0.5s; } + &:nth-child(2) .texts { + left: auto; + right: -36px; + padding-left: 38px; + color: #fff; + background: rgba(40, 179, 255, 0.54); + } h6 { margin-bottom: 14px; font-size: 2rem; diff --git a/src/pages/researchTeam/index.vue b/src/pages/researchTeam/index.vue index 197da9e..1e423c3 100644 --- a/src/pages/researchTeam/index.vue +++ b/src/pages/researchTeam/index.vue @@ -108,7 +108,7 @@ export default { console.log("🚀 ~ file: index.vue ~ line 180 ~ this.$post ~ json", json) // 获取文章列表 - const { column, articleNum } = json[1].form + const { column } = json[1].form if (column.length) { this.$post(`${this.api.queryArticlesByColumnType}?columnId=${column[column.length - 1]}`).then(({ data }) => { const articles = Util.removeTag(data) @@ -131,7 +131,7 @@ export default { list.forEach(e => { e.sortTitle = pinyin(e.title, { toneType: 'none' })[0].toUpperCase() }) - + this.letters = ['全部', ...this.letters.filter(e => list.find(n => n.sortTitle == e))] return list.sort((a, b) => a.sortTitle.charCodeAt(0) - b.sortTitle.charCodeAt(0)) }, // 字母点击回调 diff --git a/src/pages/speech/index.vue b/src/pages/speech/index.vue index 86d0101..9e48fc8 100644 --- a/src/pages/speech/index.vue +++ b/src/pages/speech/index.vue @@ -21,7 +21,6 @@
- 签名: