From 91812512bc8226db7faed5d409098cef7834656b Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Wed, 29 Jun 2022 11:59:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=84=E8=AE=BA=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F,=E7=82=B9=E5=87=BB=E8=BF=BD=E8=AF=84=E7=9A=84?=
 =?UTF-8?q?=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/BsCommentInfo.vue             | 51 ++++++++----------------
 pages/account/comment/index.vue          | 10 +++--
 pages/account/index/order/list/index.vue |  4 +-
 pages/goods/detail/module/Comment.vue    |  4 +-
 plugins/api/comment.js                   | 20 +++++++---
 plugins/axiosTk.js                       | 12 ++++--
 6 files changed, 50 insertions(+), 51 deletions(-)

diff --git a/components/BsCommentInfo.vue b/components/BsCommentInfo.vue
index be6e65b..1baa33b 100644
--- a/components/BsCommentInfo.vue
+++ b/components/BsCommentInfo.vue
@@ -2,12 +2,12 @@
  * @Author: ch
  * @Date: 2022-06-24 11:43:04
  * @LastEditors: ch
- * @LastEditTime: 2022-06-28 21:34:32
+ * @LastEditTime: 2022-06-29 11:52:30
  * @Description: file content
 -->
 <template>
 	<div class="comment-info">
-		<div class="side-user"  v-if="type == 'detail'">
+		<div class="side-user"  v-if="source == 'detail'">
 			<el-avatar :size="55" :src="commentDetail.userAvatar" />
 			<p>{{commentDetail.userName}}</p>
 		</div>
@@ -30,7 +30,7 @@
 
 				<!-- 追评 -->
 				<UiButton class="follow-btn" type="yellow_line" radius="4px"
-					v-if="isCanFollowComment && !showFollowForm" @click="handleShowFollowForm">发起追评</UiButton>
+					v-if="isCanFollowComment && !showFollowForm" @click="showFollowForm = true">发起追评</UiButton>
 				<BsCommentSubmit v-if="showFollowForm && !followComment" :type="COMMENT.TYPE.FOLLOW_COMMENT" 
 					:commentDetail="commentDetail" @submit="handleSubmitFollow"/>
 					
@@ -41,7 +41,7 @@
 				<div class="operation">
 					<div>
 						<span class="operation--chat" @click="answerVisible = !answerVisible">
-							<template v-if="answerCommentList.length">{{answerCount}}条</template>评论
+							<template v-if="commentDetail.replyCount">{{commentDetail.replyCount}}条</template>评论
 						</span>
 						<span class="operation--show" v-if="answerCommentList.length" @click="answerVisible = !answerVisible">
 							{{answerVisible ? '收起' : '展开'}}
@@ -52,7 +52,7 @@
 
 				<!-- 评论内容 -->
 				<div class="answer" v-if="showAnswerBox">
-					<b class="answer--title">全部评论({{answerCount}})</b>
+					<b class="answer--title">全部评论({{commentDetail.replyCount}})</b>
 					<ul>
 						<li class="answer--item" v-if="commentDetail.merchantComment">
 							<div class="answer--name"><b>{{commentDetail.merchantComment.userName}}：</b><span>{{commentDetail.merchantComment.createTime}}</span></div>
@@ -93,9 +93,16 @@ import {COMMENT} from '@/constants'
 export default {
 	components: { BsCommentFollowInfo, UiImgs, UiButton, BsCommentSubmit },
 	props:{
-		type:{
+		// 来源 comment从我的订单来是需要操作评价，detail游客从商品中来只要显示评价详情
+		source:{
 			type : String,
-			default : 'detail' // comment默认显示评价状态，follow默认追评状态 detail 查看状态
+			default : 'comment' 
+		},
+		// 是否默认打开追评，只有在无追评时有用
+		isFollowForm : {
+			type : Boolean,
+			default : false,
+			require : true
 		},
 		commentDetail : {
 			type : Object,
@@ -111,7 +118,7 @@ export default {
 			answer : null,
 			isLike : false,
 			usefulCount : 0,
-			showFollowForm : this.type === 'follow' ? true : false,
+			showFollowForm : this.isFollowForm,
 			followComment : this.commentDetail.followComment || null
 
 		}
@@ -120,13 +127,6 @@ export default {
 		showAnswerBox(){
 			return (this.commentDetail.merchantComment || this.answerVisible) ? true : false
 		},
-		answerCount(){
-			let count = this.answerCommentList.length;
-			if(this.commentDetail.merchantComment){
-				count += 1;
-			}
-			return count
-		},
 		answerPlaceholder (){
 			return this.answer ? `回复：${this.answer.userName}` : '说点什么吧？'
 		},
@@ -136,15 +136,10 @@ export default {
 		},
 		/**
 		 * 是否需要显示追评按钮
-		 * 如果是在订单里进来的，则只要判断没有追评则显示
-		 * 如果在商品中看则需要这条评论是不是当前登录用户评论的，如果是则也可以追评
+		 * 如果是在订单里进来的，且没有追评则显示
 		 */
 		isCanFollowComment(){
-			let status = false;
-			const userId = this.$store.state.userInfo.id;
-			if(!this.followComment && (this.type !== 'detail' || this.commentDetail.userId === userId)){
-				status = true;
-			}
+			let status = (!this.followComment && this.source === 'comment')
 			return status;
 		}
 	},
@@ -165,18 +160,6 @@ export default {
 		 */
 		handleSubmit(result){
 			this.$emit('submit', result)
-		},
-		/**
-		 * 点击追评
-		 */
-		handleShowFollowForm(){
-			if(this.type !== 'detail'){
-				this.showFollowForm = true;
-			}else{
-				this.$router.push(`/account/comment?commentId=${this.commentDetail.id}`);
-			}
-			
-
 		},
 		/**
 		 * 追评提交成功，抛出事件，方便父组件做数据处理
diff --git a/pages/account/comment/index.vue b/pages/account/comment/index.vue
index e38308d..8976914 100644
--- a/pages/account/comment/index.vue
+++ b/pages/account/comment/index.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-06-27 11:46:34
  * @LastEditors: ch
- * @LastEditTime: 2022-06-28 22:07:23
+ * @LastEditTime: 2022-06-29 11:53:25
  * @Description: file content
 -->
 <template>
@@ -15,7 +15,7 @@
 		<div class="title">商品评价</div>
 		<div class="ctx">
 			<UiLoading v-if="loading"></UiLoading>
-			<BsCommentInfo v-else :type="orderId ? 'comment' : 'follow'" v-for="(item, idx) in list" :key="idx"
+			<BsCommentInfo v-else source="comment" :isFollowForm="isFollow" v-for="(item, idx) in list" :key="idx"
 				:commentDetail="item" @submit="handleSubmitComment($event, idx)" 
 				@submitFollow="handleSubmitFollow($event, idx)"/>
 		</div>
@@ -34,9 +34,11 @@ import BsCommentInfo from '../../../components/BsCommentInfo.vue';
 export default {
 	components: { BsCommentInfo },
 	data(){
+		let query = this.$route.query;
 		return {
-			orderId: this.$route.query.orderId,
-			commentId : this.$route.query.commentId,
+			isFollow : query.follow ? true : false, // 是否自动打开追评
+			orderId: query.orderId,
+			commentId : query.commentId,
 			list:[],
 			loading : true
 		}
diff --git a/pages/account/index/order/list/index.vue b/pages/account/index/order/list/index.vue
index ab98c09..335888e 100644
--- a/pages/account/index/order/list/index.vue
+++ b/pages/account/index/order/list/index.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-04 20:47:29
  * @LastEditors: ch
- * @LastEditTime: 2022-06-28 21:48:56
+ * @LastEditTime: 2022-06-29 11:50:49
  * @Description: file content
 -->
 <template>
@@ -59,7 +59,7 @@
 									<UiButton type="yellow_gradual" v-if="item.orderStatus === 5"
 										@click="$router.push(`/account/comment?orderId=${item.orderId}`)">去评价</UiButton>
 									<UiButton type="yellow_gradual" v-if="item.orderStatus === 6"
-										@click="$router.push(`/account/comment?orderId=${item.orderId}`)">去追评</UiButton>
+										@click="$router.push(`/account/comment?orderId=${item.orderId}&follow=true`)">去追评</UiButton>
 
 									<router-link class="link-btn" :to="`./detail?id=${item.orderId}`" v-if="item.orderStatus >= 4">查看物流</router-link>
 								</td>
diff --git a/pages/goods/detail/module/Comment.vue b/pages/goods/detail/module/Comment.vue
index 225b4c3..3b2e9af 100644
--- a/pages/goods/detail/module/Comment.vue
+++ b/pages/goods/detail/module/Comment.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-06-24 14:39:38
  * @LastEditors: ch
- * @LastEditTime: 2022-06-28 21:51:09
+ * @LastEditTime: 2022-06-29 11:58:11
  * @Description: file content
 -->
 <template>
@@ -35,7 +35,7 @@
 						</span>
 					</div>
 				</div>
-				<BsCommentInfo v-for="item in list" :key="item.id" :commentDetail="item"/>
+				<BsCommentInfo v-for="item in list" :key="item.id" :commentDetail="item" source="detail"/>
 			</template>
 			
 		</div>
diff --git a/plugins/api/comment.js b/plugins/api/comment.js
index 9656e97..3518c85 100644
--- a/plugins/api/comment.js
+++ b/plugins/api/comment.js
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-06-20 11:38:48
  * @LastEditors: ch
- * @LastEditTime: 2022-06-25 17:49:58
+ * @LastEditTime: 2022-06-29 11:55:10
  * @Description: file content
  */
 
@@ -14,11 +14,17 @@ import ENV from '../config/env';
 const BASE_URL = `${ENV.base_url}/mall/comment`;
 
 /**
- * 根据商品获取评论列表
+ * 根据商品获取评论列表未
  * @param {*} param0 
  */
 export const ApiGetCommentList = (params) => 
-	ToAsyncAwait(axios.get(`${BASE_URL}/app/comment`, {params}));
+	ToAsyncAwait(axiosTk.get(`${BASE_URL}/app/comment`, {
+		params: {
+			...params,
+			notVerifyToken : true
+		}
+	}));
+
 /**
  * 根据商品获取评论总数
  * @param {*} param0 
@@ -42,13 +48,17 @@ export const ApiGetOrderCommentDetail = ({orderId}) =>
  * @param {*} param0 
  */
 export const ApiGetProductSatisfaction = ({productId}) => 
-	ToAsyncAwait(axiosTk.get(`${BASE_URL}/app/comment/getProductSatisfaction/${productId}`));
+	ToAsyncAwait(axios.get(`${BASE_URL}/app/comment/getProductSatisfaction/${productId}`));
 /**
  * 获取评论详情
  * @param {*} param0 
  */
 export const ApiGetCommentDetail = ({commentId}) => 
-	ToAsyncAwait(axios.get(`${BASE_URL}/app/comment/getCommentDetail/${commentId}`));
+	ToAsyncAwait(axiosTk.get(`${BASE_URL}/app/comment/getCommentDetail/${commentId}`, {
+		params: {
+			notVerifyToken : true
+		}
+	}));
 /**
  * 新增评论
  * @param {*} param0 
diff --git a/plugins/axiosTk.js b/plugins/axiosTk.js
index b772af3..72ece1d 100644
--- a/plugins/axiosTk.js
+++ b/plugins/axiosTk.js
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-04 17:11:07
  * @LastEditors: ch
- * @LastEditTime: 2022-06-10 14:26:57
+ * @LastEditTime: 2022-06-29 11:16:31
  * @Description: file content
  */
 import { CreateUUID } from "@/plugins/utils";
@@ -23,10 +23,14 @@ export default function ({$axios, store, route, req}, inject) {
 	$axiosTk.defaults.timeout = 3000;
 	$axiosTk.onRequest( config =>{
 		config.headers.uid = uuid;
-		if(!store.state.token){
-			location.href = '/';
-			return Promise.reject({message : '要先登录才能操作哦~'});
+		if (config.headers.notVerifyToken) {
+			if(!store.state.token){
+				location.href = '/';
+				return Promise.reject({message : '要先登录才能操作哦~'});
+			}
+			delete config.headers.notVerifyToken;
 		}
+		
 		config.headers.Authorization = store.state.token;
 		return config;
 	});