From daa9adbc0e2fded884ea9e51fbe44cd22f6756a1 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期六, 28 二月 2026 15:16:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
mini-program/pages/article-details/article-details.vue | 62 +++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 15 deletions(-)
diff --git a/mini-program/pages/article-details/article-details.vue b/mini-program/pages/article-details/article-details.vue
index f7eb10f..f4d484d 100644
--- a/mini-program/pages/article-details/article-details.vue
+++ b/mini-program/pages/article-details/article-details.vue
@@ -11,7 +11,7 @@
<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>
@@ -28,19 +28,30 @@
<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)">
- <image src="/static/icon/ic_reply2@2x.png" mode="widthFix"></image>
+ <view class="pl-item-info-data-list-item" >
+ <button open-type="getPhoneNumber" style="border:none;" plain="true" @getphonenumber="getphonenumber" v-if="!userInfo ||!userInfo.id">
+ <image v-if="!userInfo ||!userInfo.id" src="/static/icon/ic_reply2@2x.png" mode="widthFix" ></image>
+ </button>
+ <image v-if="userInfo && userInfo.id" src="/static/icon/ic_reply2@2x.png" mode="widthFix" @click="openTwo(item.id, item)"></image>
</view>
- <view class="pl-item-info-data-list-item" @click.stop="dianzanpl(item)">
- <image src="/static/icon/dianzan.png" mode="widthFix" v-if="!item.zanStatus || item.zanStatus == 0"></image>
- <image src="/static/icon/detail_ic_zan_sel@2x.png" mode="widthFix" v-else></image>
- <text :style="{color: (!item.zanStatus || item.zanStatus == 0) ? '#AAAAAA' : '#004096'}">{{item.zanCount}}</text>
+ <view class="pl-item-info-data-list-item" >
+ <template v-if="userInfo && userInfo.id" >
+ <image src="/static/icon/dianzan.png" mode="widthFix" v-if="!item.zanStatus || item.zanStatus == 0" @click.stop="dianzanpl(item)"></image>
+ <image src="/static/icon/detail_ic_zan_sel@2x.png" mode="widthFix" v-else @click.stop="dianzanpl(item)"></image>
+ <text :style="{color: (!item.zanStatus || item.zanStatus == 0) ? '#AAAAAA' : '#004096'}" @click.stop="dianzanpl(item)">{{item.zanCount}}</text>
+ </template>
+ <template v-else>
+ <button open-type="getPhoneNumber" style="border:none;" plain="true" @getphonenumber="getphonenumber" v-if="!userInfo ||!userInfo.id">
+ <image src="/static/icon/dianzan.png" mode="widthFix" ></image>
+ <text :style="{color: (!item.zanStatus || item.zanStatus == 0) ? '#AAAAAA' : '#004096'}" >{{item.zanCount}}</text>
+ </button>
+ </template>
</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>
@@ -59,7 +70,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 +82,7 @@
</view>
</view>
</view>
- <view class="pl-more" v-if="item.childern.length < item.replyCount" @click.stop="more(index)">灞曞紑{{item.replyCount - item.childern.length}}鏉″洖澶�</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>
@@ -135,7 +146,7 @@
export default {
components: { Login },
computed: {
- ...mapState(['userInfo', 'token'])
+ ...mapState(['userInfo', 'token','recshopid','recuserid'])
},
data() {
return {
@@ -168,6 +179,24 @@
}
},
methods: {
+ // 鎺堟潈鎵嬫満鍙�
+ getphonenumber(e) {
+ if (e.detail.errMsg === 'getPhoneNumber:ok') {
+ this.$u.api.wxPhone({
+ code: e.detail.code,
+ shopId:this.recshopid,
+ recId:this.recuserid,
+ openid: this.openid
+ }).then(res => {
+ if (res.code === 200) {
+ this.$store.commit('setUserInfo', res.data.member)
+ this.$store.commit('setToken', res.data.token)
+ this.$store.commit('setRecShopId','')
+ this.$store.commit('setRecUserId','')
+ }
+ })
+ }
+ },
// 鐐硅禐
dianzanpl(item) {
if (!this.userInfo) {
@@ -257,7 +286,7 @@
this.show1 = false
},
// 灞曞紑璇勮
- more(index) {
+ moreReply(index) {
this.$u.api.findActivityReplyCommentDTOPage({
capacity: 10,
page: this.commentList[index].page,
@@ -310,15 +339,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()
}
})
},
@@ -338,7 +369,7 @@
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) {
@@ -643,6 +674,7 @@
font-weight: 400;
font-size: 28rpx;
color: #333333;
+ word-break: break-word;
margin-top: 16rpx;
}
.pl-item-info-list {
--
Gitblit v1.9.3