diff --git a/src/assets/images/device/13.png b/src/assets/images/device/13.png new file mode 100644 index 0000000..f3d5bc5 Binary files /dev/null and b/src/assets/images/device/13.png differ diff --git a/src/assets/images/device/14.png b/src/assets/images/device/14.png new file mode 100644 index 0000000..4754bad Binary files /dev/null and b/src/assets/images/device/14.png differ diff --git a/src/assets/images/device/15.png b/src/assets/images/device/15.png new file mode 100644 index 0000000..2c88e28 Binary files /dev/null and b/src/assets/images/device/15.png differ diff --git a/src/assets/images/device/4.png b/src/assets/images/device/4.png index 7de7688..83220c8 100644 Binary files a/src/assets/images/device/4.png and b/src/assets/images/device/4.png differ diff --git a/src/const/column.js b/src/const/column.js index 92c85b4..e5bc11e 100644 --- a/src/const/column.js +++ b/src/const/column.js @@ -22,52 +22,43 @@ name: '子级优先栏目' } ], - // 长页样式 - pageStyle: [ + // 出版物类型 + publicationTypes: [ { id: 1, - path: 'home', - name: 'HOME' + name: '科技图书' }, { id: 2, - path: 'about', - name: 'ABOUT' + name: '科技期刊' }, { id: 3, - path: 'careers', - name: 'CAREERS' + name: '专利文献' }, { id: 4, - path: 'edu', - name: 'EDUCATION & COLLABORATION' + name: '会议文献' }, { id: 5, - path: 'news', - name: 'NEWS&EVENTS' + name: '科技报告' }, { id: 6, - path: 'newsPress', - name: 'NEWS&EVENTS-PRESS ROOM' + name: '政府出版物' }, { id: 7, - path: 'newsProcurement', - name: 'NEWS&EVENTS-PROCUREMENT' + name: '学位论文' }, { id: 8, - path: 'research', - name: 'RESEARCH' + name: '标准文献' }, { id: 9, - path: 'application', - name: 'APPLICATION' + name: '产品资料和其它' } ], } \ No newline at end of file diff --git a/src/pages/article/index.vue b/src/pages/article/index.vue index 0b3b88e..7cc9d23 100644 --- a/src/pages/article/index.vue +++ b/src/pages/article/index.vue @@ -101,11 +101,14 @@ export default { name: data.title } ] + // 文章被禁用了就直接返回 if (data.isDisable) { this.$router.back() } else { - if (data.articleTemplate === 25) { // 会议活动 - this.$router.replace(`/article/activity?articleId=${this.id}&id=${id}&columnName=${columnName || ''}&path=${path || ''}`) + const temId = data.articleTemplate + let path = `?articleId=${this.id}&id=${id}&columnName=${columnName || ''}&path=${path || ''}` + if (temId === 25 || temId === 26) { // 会议活动/期刊详情 + this.$router.replace((temId === 25 ? '/article/activity' : '/publish/show') + path) } else { this.form = data this.columnId = data.columnId diff --git a/src/pages/column/index.vue b/src/pages/column/index.vue index d6565ce..d904352 100644 --- a/src/pages/column/index.vue +++ b/src/pages/column/index.vue @@ -338,6 +338,11 @@ export default { const { typeId } = to // 如果是左边的栏目,并且是第一级,并且长页/链接,则不作反应 if (left && to.level === 1 && (typeId === 2 || typeId === 3)) return false + // 出版物则跳转到出版物列表 + if (to.templateId === 8) { + this.$router.replace(`/publish?id=${this.id}&siteId=${this.$route.query.siteId || this.site}`) + return + } // 跳转链接 if (typeId === 2) { let href = to.linkAddress @@ -434,6 +439,9 @@ export default { \ No newline at end of file diff --git a/src/pages/news/index.vue b/src/pages/news/index.vue index 430bc1a..07803fa 100644 --- a/src/pages/news/index.vue +++ b/src/pages/news/index.vue @@ -19,7 +19,7 @@
-