From 35df7f3e0c94fad89c2777c2647dcd7fe8a9bf1c Mon Sep 17 00:00:00 2001
From: taoshihan1991 <630892807@qq.com>
Date: Fri, 18 Sep 2020 13:41:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=9C=8D=E7=95=8C=E9=9D=A2=E8=AE=BF?=
 =?UTF-8?q?=E5=AE=A2=E5=88=97=E8=A1=A8=E6=8F=90=E7=A4=BA=E6=9C=80=E6=96=B0?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/css/common.css      |  2 ++
 static/html/chat_main.html |  5 +++--
 static/js/chat-main.js     | 12 ++++++++++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/static/css/common.css b/static/css/common.css
index dc082ed..eeee254 100644
--- a/static/css/common.css
+++ b/static/css/common.css
@@ -236,6 +236,8 @@
 }
 .onlineUsers:hover,.onlineUsers.cur{background-color: #f0f9eb;color: #67C23A;}
 .imgGray {-webkit-filter: grayscale(100%);-ms-filter: grayscale(100%);filter: grayscale(100%);filter: gray;color:#888;}
+.hasLastMsg{line-height: normal;}
+.lastNewMsg{font-size: 12px;color: #7f7f7f;margin-top: 4px;}
 /*客服页*/
 .chatKfPageApp{
     max-width: 800px;
diff --git a/static/html/chat_main.html b/static/html/chat_main.html
index c1dc2be..c8f54be 100644
--- a/static/html/chat_main.html
+++ b/static/html/chat_main.html
@@ -70,12 +70,13 @@
                         <el-tabs v-model="leftTabActive" @tab-click="handleTabClick">
                             <el-tab-pane label="在线用户" name="first">
                                 <el-row  v-for="item in users" :key="item.uid" class="">
-                                    <div style="cursor:pointer" class="onlineUsers" v-bind:class="{'cur': item.uid==currentGuest }" v-on:click="talkTo(item.uid,item.username)">
+                                    <div style="cursor:pointer" class="onlineUsers hasLastMsg" v-bind:class="{'cur': item.uid==currentGuest }" v-on:click="talkTo(item.uid,item.username)">
                                         <el-col :span="4">
                                             <el-avatar :size="40" :src="item.avator"></el-avatar>
                                         </el-col>
                                         <el-col :span="16">
-                                            <{item.username}>
+                                            <div><{item.username}></div>
+                                            <div class="lastNewMsg"><{item.last_message}></div>
                                         </el-col>
                                     </div>
                                 </el-row>
diff --git a/static/js/chat-main.js b/static/js/chat-main.js
index 884e2cc..b5cb629 100644
--- a/static/js/chat-main.js
+++ b/static/js/chat-main.js
@@ -142,7 +142,11 @@ var app=new Vue({
                     notification.close();
                     _this.talkTo(msg.id,msg.name);
                 });
-
+                for(let i=0;i<this.users.length;i++){
+                    if(this.users[i].uid==msg.id){
+                        this.$set(this.users[i],'last_message',msg.content);
+                    }
+                }
                 this.scrollBottom();
             }
         },
@@ -191,6 +195,7 @@ var app=new Vue({
         },
         //处理当前在线用户列表
         addOnlineUser:function (retData) {
+            retData.last_message="新访客";
             let vid=retData.uid;
             this.users.push(retData);
             for(let i=0;i<this.visitors.length;i++){
@@ -217,13 +222,16 @@ var app=new Vue({
         },
         //处理当前在线用户列表
         handleOnlineUsers:function (retData) {
-            this.users = retData;
             if (this.currentGuest == "") {
                 this.chatTitle = "连接成功,等待处理中...";
             }
             this.usersMap=[];
             for(let i=0;i<retData.length;i++){
                 this.usersMap[retData[i].uid]=retData[i].username;
+                retData[i].last_message="新访客";
+            }
+            if(this.users.length==0){
+                this.users = retData;
             }
             for(let i=0;i<this.visitors.length;i++){
                 let vid=this.visitors[i].visitor_id;