diff --git a/src/mixins/page/index.js b/src/mixins/page/index.js index 388eed5..2109249 100644 --- a/src/mixins/page/index.js +++ b/src/mixins/page/index.js @@ -15,9 +15,18 @@ export default { } }, mounted() { - this.getInfo && this.id && this.getInfo() + this.getInfo && this.id && this.getColumnInfo() }, methods: { + // 获取栏目详情 + getColumnInfo () { + this.$post(`${this.api.findColumn}?id=${this.id}`) + .then(({ data }) => { + // 栏目被禁用了,则不显示页面 + data.menuVisible || this.getInfo() + }) + .catch((res) => { }); + }, // 打开链接 async openLink(item) { const { link } = item diff --git a/src/pages/article/index.vue b/src/pages/article/index.vue index 72fe4c0..e24acf4 100644 --- a/src/pages/article/index.vue +++ b/src/pages/article/index.vue @@ -230,8 +230,8 @@ export default { border-bottom: 1px solid #d8d8d8; } /deep/.des { - width: 100%; - overflow: auto; + // width: 100%; + // overflow: auto; a { color: rgb(0, 0, 238); word-wrap: break-word; @@ -241,12 +241,14 @@ export default { object-fit: cover; } ul { + // padding-left: 40px; list-style: disc; li { list-style: inherit; } } ol { + // padding-left: 40px; list-style: decimal; li { list-style: inherit; diff --git a/src/pages/column/index.vue b/src/pages/column/index.vue index 23e3f16..9b21d48 100644 --- a/src/pages/column/index.vue +++ b/src/pages/column/index.vue @@ -573,11 +573,14 @@ export default { // 获取栏目详情 getInfo () { this.loading = true + this.loaded = false this.id && this.$post(`${this.api.findColumn}?id=${this.id}`) .then(({ data }) => { this.columnClick(data); - if (data.typeId !== 3) this.loaded = true; // 非长页,才展示页面 + if (data.typeId !== 3 && !data.menuVisible) { + this.loaded = true; // 非长页,才展示页面 + } this.info = data this.pageSize = data.pageSize || 10 this.showNav = this.showNavIds.includes(data.listStyleId) @@ -1266,7 +1269,6 @@ export default { margin-bottom: 5px; font-size: 0.98rem; cursor: pointer; - @include ellipsis; &:hover { color: $main-color; diff --git a/src/pages/iasf/index.vue b/src/pages/iasf/index.vue index 7eb9d56..029dd7e 100644 --- a/src/pages/iasf/index.vue +++ b/src/pages/iasf/index.vue @@ -363,6 +363,9 @@ export default { document.onscroll = this.throttle(this.scroll, 200) }, + beforeDestroy () { + document.onscroll = null + }, methods: { // 获取文章详情 getInfo () { diff --git a/src/pages/news/index.vue b/src/pages/news/index.vue index 234d122..bdc73ea 100644 --- a/src/pages/news/index.vue +++ b/src/pages/news/index.vue @@ -517,8 +517,8 @@ export default { width: 100%; li { - flex: 1; - margin-right: 0.88rem; + width: 32.5%; + margin-right: 1%; box-shadow: 0px 0px 20px 0px rgba(176, 176, 176, 0.21); border-radius: 6px; transition: 0.3s; @@ -659,7 +659,7 @@ export default { object-fit: cover; } .texts { - width: 24rem; + width: calc(100% - 15rem); margin-right: 3.5rem; } h6 { @@ -867,13 +867,6 @@ export default { } } } - .card-list { - li { - .texts { - margin-right: 30px; - } - } - } } } .conference { diff --git a/src/pages/researchNew/index.vue b/src/pages/researchNew/index.vue new file mode 100644 index 0000000..c60f36c --- /dev/null +++ b/src/pages/researchNew/index.vue @@ -0,0 +1,1073 @@ + + + + + \ No newline at end of file diff --git a/src/pages/sfelNew/index.vue b/src/pages/sfelNew/index.vue index c255783..92b9280 100644 --- a/src/pages/sfelNew/index.vue +++ b/src/pages/sfelNew/index.vue @@ -271,6 +271,9 @@ export default { new WOW().init() if (this.$store.getters.getModelType) document.onscroll = this.throttle(this.scroll, 200) }, + beforeDestroy () { + document.onscroll = null + }, methods: { // 获取文章详情 getInfo () { diff --git a/src/router/modules/researchNew.js b/src/router/modules/researchNew.js new file mode 100644 index 0000000..69d504d --- /dev/null +++ b/src/router/modules/researchNew.js @@ -0,0 +1,14 @@ +import BasicLayout from '@/layouts/home' +const name = 'researchNew' +export default { + path: `/${name}`, + component: BasicLayout, + children: [ + { + name, + path: `/${name}`, + component: () => import(`@/pages/${name}`), + meta: { title: '' } + } + ] +};