From a80a3076664dfc75d8939a7ed0f6fd515a3c46e9 Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Fri, 25 Nov 2022 16:08:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E7=AB=A0=E6=A0=8F=E7=9B=AE=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/index.js | 2 + src/layouts/footer/index.vue | 12 +- src/layouts/header/index.vue | 13 +- src/layouts/navbar/index.vue | 45 +++--- src/pages/about/index.vue | 7 +- src/pages/application/index.vue | 4 +- src/pages/article/activity.vue | 208 ++++++++++++++++++++++++++++ src/pages/article/index.vue | 31 +++-- src/pages/careers/index.vue | 4 +- src/pages/column/index.vue | 155 ++++++++++++++++----- src/pages/edu/index.vue | 4 +- src/pages/home/index.vue | 8 +- src/pages/news/index.vue | 45 +++++- src/pages/newsPress/index.vue | 4 +- src/pages/newsProcurement/index.vue | 4 +- src/pages/research/index.vue | 4 +- src/router/modules/article.js | 6 + src/styles/common.scss | 17 +++ src/styles/font/toppan.otf | Bin 0 -> 4491284 bytes 19 files changed, 467 insertions(+), 106 deletions(-) create mode 100644 src/pages/article/activity.vue create mode 100644 src/styles/font/toppan.otf diff --git a/src/api/index.js b/src/api/index.js index ec26d56..cc5a51b 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -10,4 +10,6 @@ export default { findColumn: `iasf/sysColumn/findById`, queryClassif: `iasf/content/classification/allTheQuery`, queryLabel: `iasf/content/label/queryAllArticleSubjectTags`, + getsTheSubColumn: `iasf/sysColumn/getsTheSubColumn`, + getTheFullArticleByColumn: `iasf/sysColumn/getTheFullArticleByColumn`, } \ No newline at end of file diff --git a/src/layouts/footer/index.vue b/src/layouts/footer/index.vue index 015ecf9..f3054f4 100644 --- a/src/layouts/footer/index.vue +++ b/src/layouts/footer/index.vue @@ -21,7 +21,6 @@ + + \ No newline at end of file diff --git a/src/pages/article/index.vue b/src/pages/article/index.vue index 4c8c531..84b912a 100644 --- a/src/pages/article/index.vue +++ b/src/pages/article/index.vue @@ -1,14 +1,14 @@ @@ -116,7 +116,7 @@ export default { // state:已发布(1)则取theEditedJson,草稿(0)则取jsonBeforeEditing const json = JSON.parse(this.preview ? data : - data[0][data[0].state ? 'theEditedJson' : 'jsonBeforeEditing']) + data[data.length - 1][data[data.length - 1].state ? 'theEditedJson' : 'jsonBeforeEditing']) this.modules = json console.log("🚀 ~ file: index.vue ~ line 180 ~ this.$post ~ json", json) } diff --git a/src/pages/column/index.vue b/src/pages/column/index.vue index 9956391..f3b4487 100644 --- a/src/pages/column/index.vue +++ b/src/pages/column/index.vue @@ -7,10 +7,12 @@
-
+ +
所属分类: - + +
主题: - +
+ +
+
+ 类型: + + + + + +
+
-
    -
  • {{ item.columnName }}
  • +
      +
    • {{ all.columnName }}
    • +
      -
    • +
    • -

      新闻类型

      +

      {{ item.classificationName }}

      {{ item.title }}
      - {{ item.releaseTime }} | 建设进展 + + {{ item.updateTime }} {{ item.labelName && ' | ' + item.labelName }} +
    • @@ -59,7 +88,7 @@
- +

热点内容