Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pages/ChatDetail/index.vue

pages/ChatDetail/index.vue

@@ -9,24 +9,22 @@
         <scroll-view class="detail-content"   :scroll-y="true" :scroll-top="scrollTop"
               style="padding-bottom: 90px;box-sizing: border-box;" :style="{height:windowHeihgt-40+'px'}">
           <view id="scroll-view-content">
-            <view :class="item.send_user_id === user_id ? 'chat-item my-chat row' : 'chat-item other-chat row'"
+            <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>
             </view>
           </view>
-          <view id="chat-end"></view>
-        </scroll-view>
 
         <view class="detail-input-group-container">
           <view class="detail-input-group row">
@@ -92,7 +90,7 @@ export default {
     type: 0,
     user_id: 0,
     messageList: [],
-    title: "在线咨询"
+      title:"在线咨询"
   },
   onLoad(options) {
     this.getToken(options.id, options.type ?? 1);

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>