From 4e65eeb11aeb199302d1c1d9b1a5693312768714 Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Tue, 28 Jun 2022 20:36:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3BUg?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BsCommentFollowInfo.vue        |  29 +++-
 src/components/BsCommentInfo.vue              |   9 +-
 src/pages.json                                |   7 -
 src/pages/goods/comment/detail.vue            |  12 +-
 src/pages/goods/comment/list.vue              |  10 +-
 src/pages/goods/comment/preview.vue           |  41 ++++-
 .../index/modules/SubmitFollowComment.vue     |   4 +-
 src/pages/order/comment/submitFollow.vue      | 156 ------------------
 8 files changed, 79 insertions(+), 189 deletions(-)
 delete mode 100644 src/pages/order/comment/submitFollow.vue

diff --git a/src/components/BsCommentFollowInfo.vue b/src/components/BsCommentFollowInfo.vue
index 9787686..36ed325 100644
--- a/src/components/BsCommentFollowInfo.vue
+++ b/src/components/BsCommentFollowInfo.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-06-23 10:40:04
  * @LastEditors: ch
- * @LastEditTime: 2022-06-23 10:48:48
+ * @LastEditTime: 2022-06-28 20:18:38
  * @Description: file content
 -->
 <template>
@@ -17,19 +17,18 @@
 <script>
 export default {
 	props : {
-		followComment : {
+		commentDetail : {
 			type : Object,
 			default : () => ({})
-		},
-		commentTime : {
-			type : String,
-			default : ''
 		}
 	},
 	computed:{
+		followComment(){
+			return this.commentDetail.followComment || {}
+		},
 		day(){
 			const followTime = (new Date(this.followComment.createTime)).getTime();
-			const commentTime = (new Date(this.commentTime)).getTime();
+			const commentTime = (new Date(this.commentDetail.createTime)).getTime();
 			const day = Math.floor((followTime - commentTime) / (24 * 60 * 60 * 1000));
 			return day > 0 ? `${day}天后` : `当天`;
 		},
@@ -38,6 +37,22 @@ export default {
 			let urls = this.followComment.pictureUrl || '';
 			return urls ? urls.split(',') : [];
 		}
+	},
+	methods:{
+
+		preview(idx){
+			this.$store.commit('SET_COMMENT_PREVIEW', {
+				...this.commentDetail,
+				commentContent : this.followComment.commentContent,
+				pictureUrl : this.followComment.pictureUrl
+			});
+			this.$Router.push({
+				path : '/goodsCommentPreview',
+				query : {
+					idx
+				}
+			});
+		}
 	}
 }
 </script>
diff --git a/src/components/BsCommentInfo.vue b/src/components/BsCommentInfo.vue
index 0697fd9..41a2e99 100644
--- a/src/components/BsCommentInfo.vue
+++ b/src/components/BsCommentInfo.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-06-21 15:50:01
  * @LastEditors: ch
- * @LastEditTime: 2022-06-28 11:30:06
+ * @LastEditTime: 2022-06-28 19:18:04
  * @Description: file content
 -->
 <template>
@@ -13,7 +13,8 @@
 		</view>
 		<view class="ctx">{{ commentDetail.commentContent }}</view>
 		<view class="img" v-if="imgs.length">
-			<image class="img--item" v-for="(item, idx) in imgs" :src="item" :key="idx" @click="preview(idx)" mode="aspectFit"/>
+			<image class="img--item" mode="aspectFit"
+			v-for="(item, idx) in imgs" :src="item" :key="idx" @click="preview(idx)"/>
 		</view>
 	</view>
 </template>
@@ -26,7 +27,8 @@ export default {
 		},
 		imgPreview : {
 			type: Boolean,
-			default : true
+			default : true,
+			require : true
 		}
 	},
 	data:{
@@ -38,6 +40,7 @@ export default {
 			return urls ? urls.split(',') : [];
 		}
 	},
+	
 	methods:{
 		preview(idx){
 			if(!this.imgPreview){
diff --git a/src/pages.json b/src/pages.json
index d76405b..f465fdf 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -213,13 +213,6 @@
 				"navigationBarTitleText": "发表评价"
 			}
 		},
-		{
-			"path": "pages/order/comment/submitFollow",
-			"aliasPath" : "/commentSubmitFollow",
-			"style": {
-				"navigationBarTitleText": "发表追评"
-			}
-		},
 		{
 			"path": "pages/order/comment/success",
 			"aliasPath" : "/commentSuccess",
diff --git a/src/pages/goods/comment/detail.vue b/src/pages/goods/comment/detail.vue
index 313d6ff..7a77ce9 100644
--- a/src/pages/goods/comment/detail.vue
+++ b/src/pages/goods/comment/detail.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-06-21 18:19:13
  * @LastEditors: ch
- * @LastEditTime: 2022-06-28 16:21:32
+ * @LastEditTime: 2022-06-28 20:07:56
  * @Description: file content
 -->
 <template>
@@ -10,7 +10,7 @@
 		<view class="box">
 			<BsCommentUserInfo :userData="detail"/>
 			<BsCommentInfo :commentDetail="detail"/>
-			<BsCommentFollowInfo v-if="detail.followComment" :followComment="detail.followComment" :commentTime="detail.createTime"/>
+			<BsCommentFollowInfo v-if="detail.followComment" :commentDetail="detail.followComment"/>
 			<BsCommentGoodsInfo class="goods-info" :goods="detail" />
 				<!-- <u-icon slot="btns" name="shopping-cart" size="30" color="#FF875B"></u-icon> -->
 			<!-- </BsCommentGoodsInfo> -->
@@ -98,7 +98,13 @@ export default {
 			if(!HandleApiError(error,'getDetail')){
 				this.detail = result;
 				this.isLike = result.isLike || false;
-				this.detail.usefulCount = this.detail.usefulCount || 0
+				this.detail.usefulCount = this.detail.usefulCount || 0;
+				if(result.merchantComment){
+					this.detail.answerCommentList.unshift({
+						...result.merchantComment,
+						parentId : result.id
+					})
+				}
 			}
 		},
 		async handleSubmit(){
diff --git a/src/pages/goods/comment/list.vue b/src/pages/goods/comment/list.vue
index 64d31ce..0fe153a 100644
--- a/src/pages/goods/comment/list.vue
+++ b/src/pages/goods/comment/list.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-06-21 16:51:03
  * @LastEditors: ch
- * @LastEditTime: 2022-06-28 15:49:47
+ * @LastEditTime: 2022-06-28 20:09:06
  * @Description: file content
 -->
 <template>
@@ -20,10 +20,11 @@
 			</view>
 		</view>
 		<view class="comment" v-for="item in list" :key="item.id" >
-			<view @click="$Router.push(`/goodsCommentDetail?id=${item.id}`)">
+			<view>
 				<BsCommentUserInfo :userData="item"/>
 				<BsCommentInfo :commentDetail="item"/>
-				<BsCommentFollowInfo v-if="item.followComment" :commentTime="item.createTime" :followComment="item.followComment"/>
+				<BsCommentFollowInfo v-if="item.followComment" :commentDetail="item"/>
+				<BsCommentMerchant v-if="item.merchantComment" :merchantComment="item.merchantComment"/>
 			</view>
 			<BsCommentThumbup :commentDetail="item"/>
 		</view>
@@ -42,8 +43,9 @@ import {ApiGetCommentList, ApiGetCommentCount, ApiGetCommentTabCount} from '@/co
 import {HandleApiError} from '@/common/utils'
 import BsCommentFollowInfo from '../../../components/BsCommentFollowInfo.vue';
 import BsCommentThumbup from '../../../components/BsCommentThumbup.vue';
+import BsCommentMerchant from '../../../components/BsCommentMerchant.vue';
 export default {
-	components: { BsCommentInfo, BsCommentUserInfo, BsCommentFollowInfo, BsCommentThumbup },
+	components: { BsCommentInfo, BsCommentUserInfo, BsCommentFollowInfo, BsCommentThumbup, BsCommentMerchant },
 	data (){
 		return {
 			list : [],
diff --git a/src/pages/goods/comment/preview.vue b/src/pages/goods/comment/preview.vue
index b0426f4..30eccce 100644
--- a/src/pages/goods/comment/preview.vue
+++ b/src/pages/goods/comment/preview.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-06-22 15:15:22
  * @LastEditors: ch
- * @LastEditTime: 2022-06-23 18:29:57
+ * @LastEditTime: 2022-06-28 20:32:35
  * @Description: file content
 -->
 <template>
@@ -30,11 +30,11 @@
 				<view class="preview--ctx">{{ data.commentContent }}</view>
 			</view>
 			<view class="thumb">
-				<view class="thumb--item">
-					<u-icon color="#fff"  name="thumb-up"></u-icon>
-					<text>2</text>
+				<view class="thumb--item" @click="handleUseful">
+					<u-icon color="#fff" :name="isLike ? 'thumb-up-fill' : 'thumb-up'"></u-icon>
+					<text>{{data.usefulCount || 0}}</text>
 				</view>
-				<view class="thumb--item" @click="$Router.push(`/goodsCommentDetail?id=${data.id}`)">
+				<view class="thumb--item" @click="$Router.replace(`/goodsCommentDetail?id=${data.id}`)">
 					<u-icon color="#fff" name="chat"></u-icon>
 					<text>{{answerCount}}</text>
 				</view>
@@ -45,13 +45,16 @@
 <script>
 import BsCommentUserInfo from '@/components/BsCommentUserInfo.vue';
 import BsCommentThumbup from '../../../components/BsCommentThumbup.vue';
+import {ApiPutCommentUseful} from '@/common/api/comment'
+import { Debounce} from '@/common/utils'
 
 export default {
 	components: { BsCommentUserInfo,BsCommentThumbup },
 	data (){
 		return {
 			data : this.$store.state.comment_preview,
-			current : Number(this.$Route.query.idx)
+			current : Number(this.$Route.query.idx),
+			isLike : false
 		}
 	},
 	computed : {
@@ -67,11 +70,35 @@ export default {
 	onShow(){
 		if(!this.data.id){
 			this.$Router.back();
-		}
+		};
+		this.isLike = this.data.isLike
 	},
 	methods:{
 		handleChange(idx){
 			this.current = idx.current
+		},
+
+		handleUseful(){
+			this.isLike = !this.isLike
+			if(this.isLike){
+				this.data.usefulCount++;
+			}else{
+				this.data.usefulCount--;
+			}
+			if(!this.debounce){
+				this.debounce = Debounce(this.updateUseFul, 500);
+			}
+			this.debounce();
+		},
+		async updateUseFul(){
+			if(this.isLike === this.data.isLike){
+				return false
+			}
+			const {error, result} = await ApiPutCommentUseful({
+				commentId : this.data.id,
+				isLike : this.isLike
+			});
+			
 		}
 	}
 }
diff --git a/src/pages/order/comment/index/modules/SubmitFollowComment.vue b/src/pages/order/comment/index/modules/SubmitFollowComment.vue
index 8e47e8f..71ff6b5 100644
--- a/src/pages/order/comment/index/modules/SubmitFollowComment.vue
+++ b/src/pages/order/comment/index/modules/SubmitFollowComment.vue
@@ -2,13 +2,13 @@
  * @Author: ch
  * @Date: 2022-06-20 16:36:41
  * @LastEditors: ch
- * @LastEditTime: 2022-06-28 15:25:46
+ * @LastEditTime: 2022-06-28 19:26:07
  * @Description: file content
 -->
 <template>
 		<view class="follow">
 			<BsCommentFollowInfo v-if="commentDetail.followComment" 
-				:followComment="commentDetail.followComment" :commentTime="commentDetail.createTime"/>
+				:commentDetail="commentDetail" />
 			<template v-else>
 				<UiButton type="primaryLine" @click="showInput = true" v-if="!showInput">发表追评</UiButton>
 				<template v-else>
diff --git a/src/pages/order/comment/submitFollow.vue b/src/pages/order/comment/submitFollow.vue
deleted file mode 100644
index 0ceff01..0000000
--- a/src/pages/order/comment/submitFollow.vue
+++ /dev/null
@@ -1,156 +0,0 @@
-<!--
- * @Author: ch
- * @Date: 2022-06-21 18:19:13
- * @LastEditors: ch
- * @LastEditTime: 2022-06-23 16:14:08
- * @Description: file content
--->
-<template>
-	<view>
-		<view class="goods-info">
-			<BsCommentGoodsInfo :goods="detail"/>
-		</view>
-		<view class="box">
-			<BsCommentUserInfo :userData="detail"/>
-			<BsCommentInfo :commentDetail="detail"/>
-			<BsCommentSubmit :commentDetail="detail" :type="COMMENT.TYPE.FOLLOW_COMMENT" @submit="handleSubmit"/>
-		</view>
-	</view>
-</template>
-<script>
-import BsCommentGoodsInfo from '../../../components/BsCommentGoodsInfo.vue'
-import BsCommentInfo from '../../../components/BsCommentInfo.vue'
-import BsCommentUserInfo from '../../../components/BsCommentUserInfo.vue'
-import UiButton from '../../../components/UiButton.vue'
-import {ApiGetCommentDetail, ApiPostComment} from '@/common/api/comment'
-import {HandleApiError} from '@/common/utils'
-import COMMENT from '@/common/dicts/comment'
-import BsCommentSubmit from '../../../components/BsCommentSubmit.vue'
-export default {
-	components: { BsCommentGoodsInfo, BsCommentInfo, UiButton, BsCommentUserInfo, BsCommentSubmit },
-	data(){
-		return {
-			COMMENT,
-			isShowAnswer : false,
-			answer : null,
-			commentId : this.$Route.query.id,
-			detail : {},
-			commentContent : ''
-		}
-	},
-	computed:{
-		placeholder(){
-			return this.answer ? `回复：${this.answer.userName}` : '说点什么吧？'
-		},
-		answerCount(){
-			return this.detail.answerCommentList ? this.detail.answerCommentList.length : 0
-		}
-	},
-	mounted(){
-		this.getDetail();
-	},
-	methods:{
-		async getDetail(){
-			const {error, result} = await ApiGetCommentDetail({
-				commentId : this.commentId
-			});
-			if(!HandleApiError(error,'getDetail')){
-				this.detail = result;
-			}
-		},
-		async handleSubmit(){
-			this.$Router.replace('/commentSuccess');
-		},
-	}
-}
-</script>
-<style lang="scss">
-page{
-	background: $color-grey1;
-	padding-bottom: 140rpx;
-}
-</style>
-<style lang="scss" scoped>
-.goods-info{
-	padding: 40rpx 40rpx 0;
-}
-.box{
-	background: $color-grey0;
-	padding: 40rpx;
-	margin-top: 20rpx;
-}
-.reply-title{
-	height: 70rpx;
-	line-height: 70rpx;
-	margin-bottom:1rpx;
-	margin-top: 20rpx;
-	background: #fff;
-	padding: 0 40rpx;
-}
-.reply{
-	background: #fff;
-	padding: 0 40rpx;
-	overflow: hidden;
-	&--item{
-		border-bottom: 1px solid $color-grey1;
-		padding-top: 40rpx;
-	}
-	&--title{
-		display: flex;
-		justify-content: space-between;
-		text{
-			color: #999;
-		}
-	}
-	&--ctx{
-		margin: 26rpx 0;
-		line-height: 36rpx;
-	}
-}
-.footer{
-	height: 124rpx;
-	position: fixed;
-	bottom: var(--window-bottom);
-	left: 0;
-	right: 0;
-	display: flex;
-	justify-content: space-around;
-	align-items: center;
-	background: #fff;
-	border-top: 1px solid #f8f8f8;
-	
-}
-.reply-comment--bg{
-	position: fixed;
-	bottom: 0;
-	top: 0;
-	left: 0;
-	right: 0;
-	z-index: 1;
-}
-
-.reply-comment{
-	position: fixed;
-	bottom: 0;
-	left: 0;
-	right: 0;
-	z-index: 2;
-	background: #fff;
-	height: 124rpx;
-	padding: 24rpx 40rpx;
-	border-top: 1px solid #f8f8f8;
-	&--box{
-		display: flex;
-		background: #F5F5F5;
-		border-radius: 38rpx;
-	}
-	&--input{
-		flex: 1;
-		padding:0 20rpx 0 40rpx;
-		height: 76rpx;
-		line-height: 76rpx;
-		
-	}
-}
-
-</style>
\ No newline at end of file