From 8d00cb424285273de843fed3238d9edc39d069b5 Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Tue, 28 Jun 2022 21:51:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8E=BB=E8=BF=BD=E8=AF=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/BsCommentFollowInfo.vue            |  3 ++-
 components/BsCommentInfo.vue                  | 20 ++++++++++---------
 .../index/order/detail/module/StatusInfo.vue  |  3 ++-
 pages/account/index/order/list/index.vue      |  7 +++++--
 pages/goods/detail/module/Comment.vue         |  4 ++--
 5 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/components/BsCommentFollowInfo.vue b/components/BsCommentFollowInfo.vue
index a615f91..95ba818 100644
--- a/components/BsCommentFollowInfo.vue
+++ b/components/BsCommentFollowInfo.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-06-23 10:40:04
  * @LastEditors: ch
- * @LastEditTime: 2022-06-24 16:21:52
+ * @LastEditTime: 2022-06-28 21:36:12
  * @Description: file content
 -->
 <template>
@@ -50,6 +50,7 @@ export default {
 	}
 	&--ctx{
 		line-height: 24px;
+		word-break: break-all;
 	}
 }
 </style>
\ No newline at end of file
diff --git a/components/BsCommentInfo.vue b/components/BsCommentInfo.vue
index 38c3957..be6e65b 100644
--- a/components/BsCommentInfo.vue
+++ b/components/BsCommentInfo.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-06-24 11:43:04
  * @LastEditors: ch
- * @LastEditTime: 2022-06-27 18:06:10
+ * @LastEditTime: 2022-06-28 21:34:32
  * @Description: file content
 -->
 <template>
@@ -58,14 +58,16 @@
 							<div class="answer--name"><b>{{commentDetail.merchantComment.userName}}：</b><span>{{commentDetail.merchantComment.createTime}}</span></div>
 							<p class="answer--ctx">{{commentDetail.merchantComment.commentContent}}</p>
 						</li>
-						<li class="answer--item" v-for="(item, idx) in answerCommentList" :key="idx">
-							<div class="answer--name">
-								<b>{{item.userName}} {{item.parentId !== commentDetail.id ? ` 回复 ${item.parentUserName}` : ''}}：</b>
-								<span>{{item.createTime}}</span>
-							</div>
-							<p class="answer--ctx">{{item.commentContent}}</p>
-							<span class="answer--answer" @click="handleAnswer(item)">回复</span>
-						</li>
+						<template  v-if="answerVisible">
+							<li class="answer--item" v-for="(item, idx) in answerCommentList" :key="idx">
+								<div class="answer--name">
+									<b>{{item.userName}} {{item.parentId !== commentDetail.id ? ` 回复 ${item.parentUserName}` : ''}}：</b>
+									<span>{{item.createTime}}</span>
+								</div>
+								<p class="answer--ctx">{{item.commentContent}}</p>
+								<span class="answer--answer" @click="handleAnswer(item)">回复</span>
+							</li>
+						</template>
 					</ul>
 					<div v-if="answerVisible" class="answer--form">
 						<input v-model="answerContent" class="answer--input" 
diff --git a/pages/account/index/order/detail/module/StatusInfo.vue b/pages/account/index/order/detail/module/StatusInfo.vue
index ffbf59a..ff9d931 100644
--- a/pages/account/index/order/detail/module/StatusInfo.vue
+++ b/pages/account/index/order/detail/module/StatusInfo.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-09 14:41:37
  * @LastEditors: ch
- * @LastEditTime: 2022-06-27 18:13:43
+ * @LastEditTime: 2022-06-28 21:47:32
  * @Description: file content
 -->
 <template>
@@ -14,6 +14,7 @@
 			<!-- 已发货可以确认收货 -->
 			<UiButton v-if="orderInfo.orderStatus === 4" type="yellow_gradual" :radius="true" @click="receive">确认收货</UiButton>
 			<UiButton v-if="orderInfo.orderStatus === 5" type="yellow_gradual" :radius="true" @click="handelComment">去评价</UiButton>
+			<UiButton v-if="orderInfo.orderStatus === 6" type="yellow_gradual" :radius="true" @click="handelComment">去追评</UiButton>
 			<!-- 待支付可以取消，支付订单 -->
 			<template v-if="orderInfo.orderStatus === 1">
 				<UiButton type="yellow_gradual" :radius="true" @click="payVisible = true">去支付</UiButton>
diff --git a/pages/account/index/order/list/index.vue b/pages/account/index/order/list/index.vue
index 743bb33..ab98c09 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-27 15:28:13
+ * @LastEditTime: 2022-06-28 21:48:56
  * @Description: file content
 -->
 <template>
@@ -55,10 +55,13 @@
 										<UiButton type="yellow_gradual" @click="pay(item)">去支付</UiButton>
 										<span class="link-btn" @click="cancelPay(item)">取消支付</span>
 									</template>
-									<router-link :to="`./detail?id=${item.orderId}`" v-if="item.orderStatus >= 4">查看物流</router-link>
 									<UiButton type="yellow_gradual" v-if="item.orderStatus === 4" @click="receive(item)">确认收货</UiButton>
 									<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>
+
+									<router-link class="link-btn" :to="`./detail?id=${item.orderId}`" v-if="item.orderStatus >= 4">查看物流</router-link>
 								</td>
 							</template>
 						</tr>
diff --git a/pages/goods/detail/module/Comment.vue b/pages/goods/detail/module/Comment.vue
index bc93d0a..225b4c3 100644
--- a/pages/goods/detail/module/Comment.vue
+++ b/pages/goods/detail/module/Comment.vue
@@ -2,14 +2,14 @@
  * @Author: ch
  * @Date: 2022-06-24 14:39:38
  * @LastEditors: ch
- * @LastEditTime: 2022-06-28 15:50:10
+ * @LastEditTime: 2022-06-28 21:51:09
  * @Description: file content
 -->
 <template>
 	<div>
 		<div class="title">
 			<b>商品评价</b>
-			<div v-if="list.length">
+			<div>
 				<el-dropdown class="title--sort" @command="handleCommand">
 					<span>{{sortActive.label}}<i class="el-icon-arrow-down el-icon--right"></i></span>
 					<el-dropdown-menu slot="dropdown">