From b613bb368d4e678b42d25e94397d0aab3e213438 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 25 二月 2026 09:41:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
mini-program/pages/article-details/article-details.vue | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/mini-program/pages/article-details/article-details.vue b/mini-program/pages/article-details/article-details.vue
index b87b75a..58b608f 100644
--- a/mini-program/pages/article-details/article-details.vue
+++ b/mini-program/pages/article-details/article-details.vue
@@ -7,7 +7,7 @@
</view>
<view class="xian"></view>
<view class="pl">
- <view class="pl-title">璇勮 {{info.commentCount || 0}}</view>
+ <view class="pl-title">璇勮 {{total}}</view>
<view class="pl-wu" v-if="commentList.length === 0">
<image src="/static/images/default_nocomment@2x.png" mode="widthFix"></image>
</view>
@@ -71,7 +71,7 @@
</view>
</view>
</view>
- <view class="pl-more" v-if="item.childern.length > 0">灞曞紑2鏉″洖澶�</view>
+ <view class="pl-more" v-if="item.childern.length < item.replyCount" @click.stop="more(index)">灞曞紑{{item.replyCount - item.childern.length}}鏉″洖澶�</view>
</view>
</view>
</view>
@@ -142,6 +142,7 @@
info: null,
content: '',
commentList: [],
+ total: 0,
page: 1,
next: true,
value: '',
@@ -248,6 +249,36 @@
this.multifileList = []
this.show1 = false
},
+ // 灞曞紑璇勮
+ more(index) {
+ this.$u.api.findActivityReplyCommentDTOPage({
+ capacity: 10,
+ page: this.commentList[index].page,
+ model: {
+ type: 1,
+ commentId: this.commentList[index].id
+ }
+ }).then(res => {
+ if (res.code === 200) {
+ this.commentList[index].page++
+ this.commentList[index].childern = this.uniqueById([
+ ...this.commentList[index].childern,
+ ...res.data.records
+ ])
+ }
+ })
+ },
+ // 鏁扮粍鍘婚噸
+ uniqueById(arr) {
+ const map = new Map();
+ return arr.filter(item => {
+ if (!map.has(item.id)) {
+ map.set(item.id, true);
+ return true;
+ }
+ return false;
+ });
+ },
// 璇勮
sendComment() {
if (!this.value && this.multifileList.length === 0) return uni.showToast({
@@ -258,7 +289,7 @@
activityId: this.info.id,
content: this.value,
multifileList: this.multifileList,
- commentId: this.commentId,
+ // commentId: this.commentId,
replyId: this.item ? this.item.id : null
}).then(res => {
if (res.code === 200) {
@@ -268,7 +299,7 @@
if (this.commentId) {
this.commentList.forEach(item => {
if (item.id === this.commentId) {
- item.commentList.childern.unshift(res.data)
+ item.childern.unshift(res.data)
}
})
} else {
@@ -294,8 +325,10 @@
}
}).then(res => {
if (res.code === 200) {
+ this.total = res.data.total
res.data.records.forEach(item => {
item.createDate = dateConversion(item.createDate)
+ item.page = 1
item.childern = []
if (item.activityReplyCommentDTO) {
item.activityReplyCommentDTO.createDate = dateConversion(item.activityReplyCommentDTO.createDate)
--
Gitblit v1.9.3