diff --git a/src/components/Comment/TargetCommentTreeNode.vue b/src/components/Comment/TargetCommentTreeNode.vue
index 1bda1d01..ee45024b 100644
--- a/src/components/Comment/TargetCommentTreeNode.vue
+++ b/src/components/Comment/TargetCommentTreeNode.vue
@@ -12,7 +12,7 @@
-
+
diff --git a/src/styles/global.less b/src/styles/global.less
index 11c641aa..45c98f2c 100644
--- a/src/styles/global.less
+++ b/src/styles/global.less
@@ -627,7 +627,7 @@ body {
}
img {
- width: 100%;
+ width: 50%;
}
margin-bottom: 0;
@@ -773,9 +773,9 @@ body {
}
.journal-list-content,
-.comment-drawer-content {
+.comment-modal-content {
img {
- width: 50%;
+ width: 50% !important;
}
}
diff --git a/src/views/comment/CommentList.vue b/src/views/comment/CommentList.vue
index bbbffe13..9dc29c3c 100644
--- a/src/views/comment/CommentList.vue
+++ b/src/views/comment/CommentList.vue
@@ -2,12 +2,15 @@
diff --git a/src/views/comment/components/CommentTab.vue b/src/views/comment/components/CommentTab.vue
index 0914e486..ddc31200 100644
--- a/src/views/comment/components/CommentTab.vue
+++ b/src/views/comment/components/CommentTab.vue
@@ -144,12 +144,15 @@
发表在
- 《{{ item.post.title }}》
- 《{{ item.sheet.title }}》
+
+ 《{{ item.post.title }}》
+
+
+ 《{{ item.sheet.title }}》
+
+
+ 《{{ item.journal.createTime | moment }}》
+
@@ -169,7 +172,7 @@
-
+
@@ -195,7 +198,7 @@
-
+
@@ -214,6 +217,10 @@
+
+
+
+
@@ -391,6 +398,46 @@ const sheetColumns = [
}
]
+const journalColumns = [
+ {
+ title: '昵称',
+ dataIndex: 'author',
+ width: '150px',
+ ellipsis: true,
+ scopedSlots: { customRender: 'author' }
+ },
+ {
+ title: '内容',
+ dataIndex: 'content',
+ scopedSlots: { customRender: 'content' }
+ },
+ {
+ title: '状态',
+ dataIndex: 'status',
+ width: '100px',
+ scopedSlots: { customRender: 'status' }
+ },
+ {
+ title: '评论日志',
+ dataIndex: 'journal',
+ width: '400px',
+ ellipsis: true,
+ scopedSlots: { customRender: 'journal' }
+ },
+ {
+ title: '日期',
+ dataIndex: 'createTime',
+ width: '170px',
+ scopedSlots: { customRender: 'createTime' }
+ },
+ {
+ title: '操作',
+ dataIndex: 'action',
+ width: '180px',
+ scopedSlots: { customRender: 'action' }
+ }
+]
+
export default {
name: 'CommentTab',
components: { CommentReplyModal },
@@ -441,7 +488,10 @@ export default {
}
},
columns() {
- return this.targetName === 'posts' ? postColumns : sheetColumns
+ if (this.targetName === 'posts') return postColumns
+ if (this.targetName === 'sheets') return sheetColumns
+ if (this.targetName === 'journals') return journalColumns
+ return {}
},
targetName() {
return `${this.target}s`
@@ -456,6 +506,9 @@ export default {
if (this.targetName === 'sheets') {
return this.selectedComment.sheet.id
}
+ if (this.targetName === 'journals') {
+ return this.selectedComment.journal.id
+ }
return 0
}
},
diff --git a/src/views/sheet/independent/JournalList.vue b/src/views/sheet/independent/JournalList.vue
index 405ea334..25143d5d 100644
--- a/src/views/sheet/independent/JournalList.vue
+++ b/src/views/sheet/independent/JournalList.vue
@@ -70,7 +70,7 @@
-
+
{{ item.createTime | moment }}