productDev/dingyuannongji.git

			@@ -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,25 +28,26 @@
			<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" >
			<image 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" >
			<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>
			</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>
			<view class="pl-item-info">
			<view class="pl-item-info-name">{{child.nikeName}}</view>
			<view class="pl-item-info-content" v-if="child.content">
			<text v-if="child.replyMemberNikeName"> 回复<text style="color: #AAAAAA;margin-left: 6rpx;margin-right: 6rpx;">{{child.replyMemberNikeName}}</text>: </text>
			{{child.content}}
			</view>
			<view class="pl-item-info-list" v-if="child.multifileList && child.multifileList.length > 0">
			@@ -59,7 +60,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 +72,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 +136,7 @@
			export default {
			components: { Login },
			computed: {
			...mapState(['userInfo', 'token'])
			...mapState(['userInfo', 'token','recshopid','recuserid'])
			},
			data() {
			return {
			@@ -198,6 +199,10 @@
			},
			// 二级评论
			openTwo(commentId, item) {
			if (!this.userInfo) {
			this.$refs.login.open()
			return;
			}
			this.item = item
			this.commentId = commentId
			this.show1 = true
			@@ -257,7 +262,7 @@
			this.show1 = false
			},
			// 展开评论
			more(index) {
			moreReply(index) {
			this.$u.api.findActivityReplyCommentDTOPage({
			capacity: 10,
			page: this.commentList[index].page,
			@@ -300,7 +305,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) {
			@@ -310,15 +315,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 +345,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 +650,7 @@
			font-weight: 400;
			font-size: 28rpx;
			color: #333333;
			word-break: break-word;
			margin-top: 16rpx;
			}
			.pl-item-info-list {