diff --git a/src/mixins/page/index.js b/src/mixins/page/index.js index 7e62310..8cad63a 100644 --- a/src/mixins/page/index.js +++ b/src/mixins/page/index.js @@ -117,7 +117,8 @@ export default { (this.site) : item.siteSelection if (ids[1]) { // 文章 - href = '/article?articleId=' + ids[1] + const columnIds = ids[0].split(',') + href = `/article?articleId=${ids[1]}&id=${columnIds[columnIds.length - 1]}` } else { // 栏目 const columnIds = ids[0].split(',') href = '/column?id=' + columnIds[columnIds.length - 1] diff --git a/src/pages/article/index.vue b/src/pages/article/index.vue index 0184e78..7767c49 100644 --- a/src/pages/article/index.vue +++ b/src/pages/article/index.vue @@ -49,7 +49,7 @@ export default { data () { return { id: this.$route.query.articleId, - columnId: +this.$route.query.id, + columnId: +this.$route.query.id || '', preview: this.$route.query.preview, loaded: false, routes: [], diff --git a/src/styles/lib/_reset.scss b/src/styles/lib/_reset.scss index 6a02e0c..3e91f17 100644 --- a/src/styles/lib/_reset.scss +++ b/src/styles/lib/_reset.scss @@ -36,8 +36,6 @@ input, textarea, p, blockquote, -th, -td, hr, button, article,