From 51e2105c94441bc2933d34da412ec7b1affafc7d Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Tue, 13 Dec 2022 15:34:17 +0800
Subject: [PATCH] fix
---
src/layouts/header/index.vue | 33 ++++++++++--
src/layouts/navbar/index.vue | 1 -
src/pages/article/activity.vue | 4 +-
src/pages/article/index.vue | 4 +-
src/pages/column/index.vue | 66 ++++++++++++++++++------
src/pages/edu/index.vue | 1 +
src/pages/news/index.vue | 15 +++---
src/pages/newsPress/index.vue | 4 ++
src/pages/newsProcurement/index.vue | 4 ++
src/pages/research/index.vue | 2 +-
src/store/modules/content.js | 4 ++
src/styles/common.scss | 4 ++
src/styles/font/PingFangTC-Semibold.ttf | Bin 0 -> 12419064 bytes
13 files changed, 108 insertions(+), 34 deletions(-)
create mode 100644 src/styles/font/PingFangTC-Semibold.ttf
diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index 38524ae..145f038 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -10,17 +10,17 @@
diff --git a/src/layouts/navbar/index.vue b/src/layouts/navbar/index.vue
index 729f3fa..ca4d66c 100644
--- a/src/layouts/navbar/index.vue
+++ b/src/layouts/navbar/index.vue
@@ -59,7 +59,6 @@ export default {
const menu = document.querySelectorAll('.el-submenu')
for (let i = 0; i < menu.length; i++) {
menu[i].onclick = e => {
- console.log(33, e.target)
// 获取栏目id
let id = e.target.getAttribute('id')
if (!id) {
diff --git a/src/pages/article/activity.vue b/src/pages/article/activity.vue
index f9b8f29..daceecf 100644
--- a/src/pages/article/activity.vue
+++ b/src/pages/article/activity.vue
@@ -82,7 +82,7 @@ export default {
this.routes = [
{
name: columnName || data.columnName,
- path: '/' + path,
+ path: path ? '/' + path : '',
query: {
id: id || data.columnId
}
@@ -172,7 +172,7 @@ export default {
}
.meta {
margin: 10px 0;
- font-size: 14px;
+ font-size: 16px;
font-weight: 600;
color: #333;
}
diff --git a/src/pages/article/index.vue b/src/pages/article/index.vue
index 93463e0..f903fc5 100644
--- a/src/pages/article/index.vue
+++ b/src/pages/article/index.vue
@@ -92,7 +92,7 @@ export default {
this.routes = [
{
name: columnName || data.columnName,
- path: '/' + path,
+ path: path ? '/' + path : '',
query: {
id: id || data.columnId
}
@@ -105,7 +105,7 @@ export default {
this.$router.back()
} else {
if (data.articleTemplate === 25) { // 会议活动
- this.$router.replace(`/article/activity?articleId=${this.id}&id=${id}&columnName=${columnName}&path=${path}`)
+ this.$router.replace(`/article/activity?articleId=${this.id}&id=${id}&columnName=${columnName || ''}&path=${path || ''}`)
} else {
this.form = data
this.columnId = data.columnId
diff --git a/src/pages/column/index.vue b/src/pages/column/index.vue
index b7a7269..5362f52 100644
--- a/src/pages/column/index.vue
+++ b/src/pages/column/index.vue
@@ -115,6 +115,7 @@