From f278d52028c81ab6e354293d32323221f6f3641a Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Thu, 30 Jun 2022 11:54:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8E=A5=E5=8F=A3Token?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/api/comment.js          | 6 ++++--
 src/pages/goods/comment/detail.vue | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/common/api/comment.js b/src/common/api/comment.js
index 7b790db..28a2778 100644
--- a/src/common/api/comment.js
+++ b/src/common/api/comment.js
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-06-20 11:38:48
  * @LastEditors: ch
- * @LastEditTime: 2022-06-29 17:41:44
+ * @LastEditTime: 2022-06-30 11:53:57
  * @Description: file content
  */
 
@@ -31,7 +31,9 @@ export const ApiGetCommentCount = ({productId}) =>
  * @param {*} param0 
  */
 export const ApiGetCommentTabCount = ({productId}) => 
-	ToAsyncAwait(MsbRequest.get(`${BASE_URL}/app/comment/listCommentLabel/${productId}`));
+	ToAsyncAwait(MsbRequestTk.get(`${BASE_URL}/app/comment/listCommentLabel/${productId}`,{}, {
+		notVerifyToken: true
+	}));
 /**
  * 获取订单评论详情
  * @param {*} param0 
diff --git a/src/pages/goods/comment/detail.vue b/src/pages/goods/comment/detail.vue
index 8589144..20b1e26 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-30 11:11:33
+ * @LastEditTime: 2022-06-30 11:53:04
  * @Description: file content
 -->
 <template>
@@ -118,7 +118,7 @@ export default {
 				this.detail.answerCommentList.push({
 					...result, 
 					userName : this.$store.state.userInfo.nickname,
-					parentName: this.answer ? this.answer.userName : ''
+					parentUserName: this.answer ? this.answer.userName : ''
 				});
 				this.commentContent = '';
 				this.detail.replyCount++;

From 4490d1af9947a04bc4a117d0f242d62cf5bb2cb5 Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Thu, 30 Jun 2022 14:21:37 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=BF=BD=E8=AF=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/order/comment/index/index.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/order/comment/index/index.vue b/src/pages/order/comment/index/index.vue
index 9604118..2a25d9b 100644
--- a/src/pages/order/comment/index/index.vue
+++ b/src/pages/order/comment/index/index.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-06-20 14:55:54
  * @LastEditors: ch
- * @LastEditTime: 2022-06-29 20:57:06
+ * @LastEditTime: 2022-06-30 14:15:35
  * @Description: file content
 -->
 <template>
@@ -14,12 +14,12 @@
 				@submit="submitComment($event,idx)" @editChang="editChange($event, idx)"/>
 			<!-- 已评价过显示详情 -->
 			<template v-else>
-				<BsCommentInfo :commentDetail="item"/>
+				<BsCommentInfo :commentDetail="item" v-if="!isFollow"/>
 				<SubmitFollowComment :commentDetail="item"  
 					@submit="submitFollowComment($event, idx)" 
 					@editChange="editChange($event, idx)" :isFollow="isFollow"/>
-				<BsCommentMerchant v-if="item.merchantComment" :merchantComment="item.merchantComment"/>
-				<BsCommentThumbup :commentDetail="item"/>
+				<BsCommentMerchant v-if="item.merchantComment && !isFollow" :merchantComment="item.merchantComment"/>
+				<BsCommentThumbup :commentDetail="item" v-if="!isFollow"/>
 			</template>
 		</view>	
 	</view>