From 1e6a4364d6e2636522aa4e1f679fb3b8f8997046 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期六, 28 二月 2026 15:07:49 +0800
Subject: [PATCH] 合并
---
mini-program/pages/article-details/article-details.vue | 70 +++++++++++++++++++++++++++-------
1 files changed, 55 insertions(+), 15 deletions(-)
diff --git a/mini-program/pages/article-details/article-details.vue b/mini-program/pages/article-details/article-details.vue
index 31fe3b0..14be850 100644
--- a/mini-program/pages/article-details/article-details.vue
+++ b/mini-program/pages/article-details/article-details.vue
@@ -7,11 +7,11 @@
</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>
- <view class="pl-item" v-for="(item, index) in commentList" :key="item.id" v-else @click="openTwo(item.id, item)">
+ <view class="pl-item" v-for="(item, index) in commentList" :key="item.id" v-else>
<view class="pl-item-tx">
<image :src="item.memberImgUrl" mode="widthFix"></image>
</view>
@@ -21,16 +21,16 @@
{{item.content}}
</view>
<view class="pl-item-info-list" v-if="item.multifileList && item.multifileList.length > 0">
- <view class="pl-item-info-list-image" v-for="(child, i) in item.multifileList" :key="i" @click="yulan(child.fileFullUrl, item.multifileList)">
+ <view class="pl-item-info-list-image" v-for="(child, i) in item.multifileList" :key="i" @click.stop="yulan(child.fileFullUrl, item.multifileList)">
<image :src="child.fileFullUrl" mode="widthFix"></image>
</view>
<view style="width: 132rpx; height: 0;"></view>
<view style="width: 132rpx; height: 0;"></view>
</view>
<view class="pl-item-info-data">
- <view class="pl-item-info-data-time">{{$u.timeFormat(new Date(item.createDate).getTime())}}</view>
+ <view class="pl-item-info-data-time">{{item.createDate }}</view>
<view class="pl-item-info-data-list">
- <view class="pl-item-info-data-list-item" @click="sendChild(item.id, index)">
+ <view class="pl-item-info-data-list-item" @click="openTwo(item.id, item)">
<image src="/static/icon/ic_reply2@2x.png" mode="widthFix"></image>
</view>
<view class="pl-item-info-data-list-item" @click.stop="dianzanpl(item)">
@@ -40,7 +40,7 @@
</view>
</view>
</view>
- <view class="pl-item" style="border: none;" v-for="(child, a) in item.childern" :key="child.id" @click="openTwo(item.id, child)">
+ <view class="pl-item" style="border: none;" v-for="(child, a) in item.childern" :key="child.id" >
<view class="pl-item-tx">
<image :src="child.memberImgUrl" mode="widthFix"></image>
</view>
@@ -50,7 +50,7 @@
{{child.content}}
</view>
<view class="pl-item-info-list" v-if="child.multifileList && child.multifileList.length > 0">
- <view class="pl-item-info-list-image" v-for="(child1, i) in child.multifileList" :key="i">
+ <view class="pl-item-info-list-image" v-for="(child1, i) in child.multifileList" :key="i" @click.stop="yulan(child1.fileFullUrl, child.multifileList)">
<image :src="child1.fileFullUrl" mode="widthFix"></image>
</view>
<view style="width: 132rpx; height: 0;"></view>
@@ -59,7 +59,7 @@
<view class="pl-item-info-data">
<view class="pl-item-info-data-time">{{child.createDate}}</view>
<view class="pl-item-info-data-list">
- <view class="pl-item-info-data-list-item">
+ <view class="pl-item-info-data-list-item" @click="openTwo(item.id, child)">
<image src="/static/icon/ic_reply2@2x.png" mode="widthFix"></image>
</view>
<view class="pl-item-info-data-list-item" @click.stop="dianzanpl(child)">
@@ -71,7 +71,7 @@
</view>
</view>
</view>
- <view class="pl-more" v-if="item.childern.length > 0" @click.stop="more(item)">灞曞紑{{item.replyCount - 1}}鏉″洖澶�</view>
+ <view class="pl-more" v-if="item.childern&&item.childern.length < item.replyCount" @click.stop="moreReply(index)">灞曞紑{{item.replyCount - item.childern.length}}鏉″洖澶�</view>
</view>
</view>
</view>
@@ -124,13 +124,16 @@
</view>
</view>
</u-popup>
+ <Login ref="login" />
</view>
</template>
<script>
import { mapState } from 'vuex'
import { dateConversion } from '@/utils/utils.js'
+ import Login from '@/components/login/login.vue'
export default {
+ components: { Login },
computed: {
...mapState(['userInfo', 'token'])
},
@@ -142,6 +145,7 @@
info: null,
content: '',
commentList: [],
+ total: 0,
page: 1,
next: true,
value: '',
@@ -166,6 +170,10 @@
methods: {
// 鐐硅禐
dianzanpl(item) {
+ if (!this.userInfo) {
+ this.$refs.login.open()
+ return;
+ }
if (!item.zanStatus || item.zanStatus == 0) {
this.$u.api.zanCreate({
objId: item.id,
@@ -249,22 +257,41 @@
this.show1 = false
},
// 灞曞紑璇勮
- more(item) {
+ moreReply(index) {
this.$u.api.findActivityReplyCommentDTOPage({
capacity: 10,
- page: 1,
+ page: this.commentList[index].page,
model: {
type: 1,
- commentId: item.id
+ commentId: this.commentList[index].id
}
}).then(res => {
if (res.code === 200) {
- console.log(res)
+ 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.userInfo) {
+ this.$refs.login.open()
+ return;
+ }
if (!this.value && this.multifileList.length === 0) return uni.showToast({
title: '璇勮鍐呭涓嶈兘涓虹┖',
icon: 'none'
@@ -283,15 +310,17 @@
if (this.commentId) {
this.commentList.forEach(item => {
if (item.id === this.commentId) {
+ item.childern = item.childern||[]
item.childern.unshift(res.data)
}
})
} else {
+ this.commentList = this.commentList||[]
this.commentList.unshift(res.data)
}
this.multifileList = []
this.value = ''
- this.show1 = false
+ this.closePush()
}
})
},
@@ -309,8 +338,10 @@
}
}).then(res => {
if (res.code === 200) {
+ this.total = res.data.total
res.data.records.forEach(item => {
- item.createDate = dateConversion(item.createDate)
+ // item.createDate = dateConversion(item.createDate)
+ item.page = 1
item.childern = []
if (item.activityReplyCommentDTO) {
item.activityReplyCommentDTO.createDate = dateConversion(item.activityReplyCommentDTO.createDate)
@@ -326,6 +357,10 @@
})
},
shoucang(type) {
+ if (!this.userInfo) {
+ this.$refs.login.open()
+ return;
+ }
if (type === 1) {
this.$u.api.cancelbatch({
ids: this.info.id,
@@ -347,6 +382,10 @@
}
},
dianzan(type) {
+ if (!this.userInfo) {
+ this.$refs.login.open()
+ return;
+ }
if (type === 1) {
this.$u.api.zanCancel({
objId: this.info.id,
@@ -606,6 +645,7 @@
font-weight: 400;
font-size: 28rpx;
color: #333333;
+ word-break: break-word;
margin-top: 16rpx;
}
.pl-item-info-list {
--
Gitblit v1.9.3