Merge branch 'feature/comment-0620-ch' into msb_test

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 

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++;

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>