diff --git a/src/mixins/article/index.js b/src/mixins/article/index.js index 22b5ac2..617704d 100644 --- a/src/mixins/article/index.js +++ b/src/mixins/article/index.js @@ -1,6 +1,5 @@ import Setting from '@/setting' import Util from '@/libs/util' -import { mapState } from 'vuex' export default { data() { return { @@ -8,9 +7,9 @@ export default { } }, computed: { - ...mapState('content', [ - 'site' - ]) + site() { + return this.$route.query.siteId || this.$store.state.content.site + } }, mounted() { diff --git a/src/mixins/overview/index.js b/src/mixins/overview/index.js index b256d1f..1bac983 100644 --- a/src/mixins/overview/index.js +++ b/src/mixins/overview/index.js @@ -27,7 +27,7 @@ export default { if (i == 1) path = '/overviewDevHistory?id=214' if (i == 2) path = '/overviewTrailer?id=215' if (i == 3) path = '/overviewLocation?id=216' - if (i == 4) path = '/overviewSetup?id=217' + if (i == 4) path = '/overviewSetup?id=229' this.$router.push(path + '&siteId=3') }, } diff --git a/src/pages/article/activity.vue b/src/pages/article/activity.vue index 2685145..292d707 100644 --- a/src/pages/article/activity.vue +++ b/src/pages/article/activity.vue @@ -125,7 +125,7 @@ export default { // 资讯 getColumn() { this.$post(this.api.listWithTreeMenuVisible, { - siteId: this.$route.query.siteId || this.$store.state.content.site, + siteId: this.site, columnName: '', templateId: '', typeId : '', @@ -135,7 +135,7 @@ export default { this.getInfo() }).catch(err => {}) - this.$post(`${this.api.hotContent}?siteId=${this.$route.query.siteId || this.$store.state.content.site}`).then(({ data }) => { + this.$post(`${this.api.hotContent}?siteId=${this.site}`).then(({ data }) => { this.hots = Util.removeTag(data) }).catch(err => {}) }, @@ -144,7 +144,7 @@ export default { this.$post(this.api.newlyPublishedArticles, { pageNum: 1, pageSize: 5, - siteId: this.$route.query.siteId || this.$store.state.content.site + siteId: this.site }).then(({ data }) => { this.news = Util.removeTag(data.records) }).catch(res => {}) diff --git a/src/pages/article/index.vue b/src/pages/article/index.vue index d265d58..c227c53 100644 --- a/src/pages/article/index.vue +++ b/src/pages/article/index.vue @@ -140,7 +140,7 @@ export default { // 资讯 getColumn() { this.$post(this.api.listWithTreeMenuVisible, { - siteId: this.$route.query.siteId || this.$store.state.content.site, + siteId: this.site, columnName: '', templateId: '', typeId : '', @@ -150,7 +150,7 @@ export default { this.getInfo() }).catch(err => {}) - this.$post(`${this.api.hotContent}?siteId=${this.$route.query.siteId || this.$store.state.content.site}`).then(({ data }) => { + this.$post(`${this.api.hotContent}?siteId=${this.site}`).then(({ data }) => { this.hots = Util.removeTag(data) }).catch(err => {}) }, @@ -159,7 +159,7 @@ export default { this.$post(this.api.newlyPublishedArticles, { pageNum: 1, pageSize: 5, - siteId: this.$route.query.siteId || this.$store.state.content.site + siteId: this.site }).then(({ data }) => { this.news = Util.removeTag(data.records) }).catch(res => {}) diff --git a/src/pages/column/index.vue b/src/pages/column/index.vue index 5ab82e6..16c9935 100644 --- a/src/pages/column/index.vue +++ b/src/pages/column/index.vue @@ -63,36 +63,45 @@
- +
diff --git a/src/pages/publication/index.vue b/src/pages/publication/index.vue index 49b9a12..c0b4402 100644 --- a/src/pages/publication/index.vue +++ b/src/pages/publication/index.vue @@ -112,6 +112,7 @@ export default { margin: 0 70px; font-size: 1.1rem; color: #333; + white-space: nowrap; border-bottom: 4px solid transparent; text-shadow: 0px 2px 14px rgba(167,167,167,0.26); cursor: pointer; diff --git a/src/pages/publication/monograph.vue b/src/pages/publication/monograph.vue index 735b8ea..6865042 100644 --- a/src/pages/publication/monograph.vue +++ b/src/pages/publication/monograph.vue @@ -5,7 +5,7 @@ 出版时间: