From 66ff22695f5488780507e8a66d377f8f0cc89932 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=B6=E5=A3=AB=E6=B6=B5?= <630892807@qq.com>
Date: Wed, 10 Jun 2020 22:18:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=92=A8=E8=AF=A2=E7=95=8C=E9=9D=A2=E7=9A=84?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/account.json        |  5 +++++
 static/html/chat_page.html | 31 ++++++++++++++++++++-----------
 2 files changed, 25 insertions(+), 11 deletions(-)
 create mode 100644 config/account.json

diff --git a/config/account.json b/config/account.json
new file mode 100644
index 0000000..420daf1
--- /dev/null
+++ b/config/account.json
@@ -0,0 +1,5 @@
+{
+	"Username":"admin",
+	"Password":"admin"
+}
+
diff --git a/static/html/chat_page.html b/static/html/chat_page.html
index e1e9a41..f525e2d 100644
--- a/static/html/chat_page.html
+++ b/static/html/chat_page.html
@@ -102,7 +102,7 @@
 <script>
     var guest={};
     guest.from_id = "";
-    guest.from_name = typeof(returnCitySN)!="undefined" ?returnCitySN["cip"]+returnCitySN["cname"]:"小米";
+    guest.from_name = typeof(returnCitySN)!="undefined" ?returnCitySN["cip"]+"-"+returnCitySN["cname"]:"小米";
     guest.from_avatar = "https://dss2.bdstatic.com/6Ot1bjeh1BF3odCf/it/u=1539628792,3031847515&fm=85&app=92&f=JPEG?w=121&h=75&s=65F03DC608BA199ED70C5D3703009040";
     guest.from_group = "1";
     guest.to_id="";
@@ -116,7 +116,7 @@
             socket:null,
             msgList:[],
             messageContent:"",
-            chatTitle:"连接成功!暂时没有客服在线",
+            chatTitle:"正在连接...",
         },
         methods: {
             //初始化websocket
@@ -125,20 +125,15 @@
                 this.socket = socket
                 this.socket.onmessage = this.OnMessage;
                 this.socket.onopen = this.OnOpen;
+                this.socket.onclose = this.OnClose;
             },
             OnOpen() {
+                this.chatTitle="连接成功! 等待客服接入"
                 //从缓存中取出用户
-                let obj=this.getCache("guest");
-                if(!obj){
-                    guest.from_id=this.generateUUID();
-                    obj=guest
-                    this.setCache("guest",obj);
-                }
-                guest=obj;
-                guest.from_id=obj.from_id;
+                let userinfo=this.getUserInfo();
                 let mes = {}
                 mes.type = "userInit";
-                mes.data = guest;
+                mes.data = userinfo;
                 this.socket.send(JSON.stringify(mes));
             },
             OnMessage(e) {
@@ -201,6 +196,20 @@
                     $('.chatBox').scrollTop($(".chatBox")[0].scrollHeight);
                 });
             },
+            OnClose() {
+                this.chatTitle="连接关闭!"
+            },
+            //获取当前用户信息
+            getUserInfo(){
+                let obj=this.getCache("guest");
+                if(!obj){
+                    guest.from_id=this.generateUUID();
+                    this.setCache("guest",guest);
+                    obj=this.getCache("guest");
+                }
+                guest=obj;
+                return obj;
+            },
             setCache : function (key,obj){
                 if(typeof(Storage) !== "undefined"){
                     localStorage.setItem(key, JSON.stringify(obj));