From 9adabd752f182974d6c3ae3c8a35bc8000b7d440 Mon Sep 17 00:00:00 2001
From: chenlong <vip_chenlong@163.com>
Date: Fri, 15 Sep 2023 16:39:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AA=E4=BA=BA=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E7=9A=84=E8=AE=A2=E5=8D=95=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/ChatDetail/index.vue                | 10 +++++-----
 pages/Index/components/UserPage/index.vue |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pages/ChatDetail/index.vue b/pages/ChatDetail/index.vue
index 66d4afd..3f6fb43 100644
--- a/pages/ChatDetail/index.vue
+++ b/pages/ChatDetail/index.vue
@@ -7,16 +7,16 @@
 		<view class="detail-container" :style="{height:windowHeihgt-40+'px'}">
 			<view class="detail-content-container">
 				<view class="detail-content" style="height: calc(100%);overflow: auto;padding-bottom: 150px;box-sizing: border-box;">
-					<view :class="item.send_user_id === user_id ? 'chat-item my-chat row' : 'chat-item other-chat row'" v-for="(item, index) in messageList" wx:key="index">
+					<view :class="item.send_user_id === user_id && type === item.type ? 'chat-item my-chat row' : 'chat-item other-chat row'" v-for="(item, index) in messageList">
 						<view class="chat-item-content  row">
-							<view class="chat-avator " v-if="item.send_user_id !== user_id">
+							<view class="chat-avator " v-if="item.send_user_id !== user_id || type !== item.type">
 								<image mode="aspectFill" class="img" :src="item.avatar ? item.avatar : user.avatar" />
 							</view>
 							<view class="chat-content-container " style="max-width: calc(100% - 50px);">
-								<view class="chat-time">{{ item.create_time }}</view>
+								<view class="chat-time">{{item.user_name}} {{ item.create_time }}</view>
 								<view class="chat-content" style="word-break: break-all;">{{ item.info }}</view>
 							</view>
-							<view class="chat-avator " v-if="item.send_user_id === user_id">
+							<view class="chat-avator " v-if="item.send_user_id === user_id && type === item.type">
 								<image mode="aspectFill" class="img" :src="item.avatar ? item.avatar : user.avatar" />
 							</view>
 						</view>
@@ -107,7 +107,7 @@
 			type:0,
 			user_id:0,
 			messageList:[],
-      title:"在线咨询"
+      title:"在线沟通"
 		},
 		onLoad(options) {
 			this.getToken(options.id, options.type ?? 1);
diff --git a/pages/Index/components/UserPage/index.vue b/pages/Index/components/UserPage/index.vue
index 48ab358..65ca6b9 100644
--- a/pages/Index/components/UserPage/index.vue
+++ b/pages/Index/components/UserPage/index.vue
@@ -79,11 +79,11 @@
 					</view>
 				</view>
 				<view class="user-button-group row">
-					<view class="user-button col-6" @click="orderPage(0, 1)">
+					<view class="user-button col-6" @click="orderPage(0, 2)">
 						<image class="img" :src="staticImage.baby.wait" mode="aspectFit"/>
 						<view class="user-title">待服务</view>
 					</view>
-					<view class="user-button col-6" @click="orderPage(2, 1)">
+					<view class="user-button col-6" @click="orderPage(2, 2)">
 						<image class="img" :src="staticImage.baby.end" mode="aspectFit"/>
 						<view class="user-title">已完成</view>
 					</view>
@@ -101,11 +101,11 @@
 					<image class="img" :src="staticImage.bigTitle" mode="heightFix"/>
 				</view>
 				<view class="user-button-group row">
-					<view class="user-button col-6" @click="orderPage(0, 2)">
+					<view class="user-button col-6" @click="orderPage(0, 1)">
 						<image class="img" :src="staticImage.big.wait" mode="aspectFit"/>
 						<view class="user-title">待服务</view>
 					</view>
-					<view class="user-button col-6" @click="orderPage(2, 2)">
+					<view class="user-button col-6" @click="orderPage(2, 1)">
 						<image class="img" :src="staticImage.big.end" mode="aspectFit"/>
 						<view class="user-title">已完成</view>
 					</view>