From 0f78e8a091efba54cbc4534ff3cc5ddee740d5e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B0=E5=B9=BF=E9=93=B6?= <273650669@qq.com>
Date: Mon, 30 Oct 2017 10:08:01 +0800
Subject: [PATCH] fix bugs

---
 io/io.js                  | 11 +++++++++--
 public/js/server/index.js | 18 ++++++++++++++++--
 views/server/index.ejs    | 24 +++++++++++++++++++++---
 3 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/io/io.js b/io/io.js
index a0c3efb..90b6f73 100644
--- a/io/io.js
+++ b/io/io.js
@@ -159,11 +159,18 @@ function ioServer(io) {
                         }else{
                             uuids = [];
                         }
+                        val = parseInt(val);
                         var idx = __uuids.indexOf(val);
                         if( idx != -1){
                             __uuids.remove(val);
-                            uuids.splice(idx,1);
-                            uuids = JSON.stringify(uuids);
+                            //uuids.splice(idx,1);
+                            var tmp = [];
+                            uuids.forEach(function (user) {
+                                if(user.uid != val){
+                                    tmp.push(user);
+                                }
+                            });
+                            uuids = JSON.stringify(tmp);
                             redis.set('user-uuids',uuids,null,function (err,ret) {
                                 if(err){
                                     console.error(err);
diff --git a/public/js/server/index.js b/public/js/server/index.js
index db27342..e2b1fb8 100644
--- a/public/js/server/index.js
+++ b/public/js/server/index.js
@@ -30,7 +30,7 @@ layui.use(['layer', 'form', 'jquery'], function () {
     }
 
     function insert_section(uid) {
-        var html = '<section class="user-section" id="section-'+ uid +'"></section>';
+        var html = '<section class="user-section" id="section-'+ uid +'" style="display: none;"></section>';
         $(".message-container").append(html);
     }
 
@@ -68,11 +68,23 @@ layui.use(['layer', 'form', 'jquery'], function () {
             '                <div class="layui-col-xs3 user-avatar">\n' +
             '                    <img src="/images/server/mine_fill.png">\n' +
             '                </div>\n' +
-            '                <div class="layui-col-xs9">' + name + '</div>\n' +
+            '                <div class="layui-col-xs9 user-name">' + name + '-' + id + '</div>\n' +
             '            </div>';
         $('.chat-user').append(html);
     }
 
+    function msg_sender_status(status){
+        if(status){
+            $(".btnMsgSend").removeClass("layui-btn-disabled");
+            $("#msg-send-textarea").removeAttr("disabled");
+            $(".empty-status").hide();
+        }else{
+            $(".btnMsgSend").addClass("layui-btn-disabled");
+            $("#msg-send-textarea").attr("disabled","disabled");
+            $(".empty-status").show();
+        }
+    }
+
     function getUsers() {
         $.get('/users',function (data) {
             if(data.code == 200){
@@ -138,6 +150,7 @@ layui.use(['layer', 'form', 'jquery'], function () {
             arrayRemove(uuids,msg.uid);
             $("#section-" + msg.uid).remove();
             $(".chat-user").find("#"+msg.uid).remove();
+            msg_sender_status(false);
         }else if(msg.type == 'online'){
             if(!currentUUID){
                 currentUUID = msg.uid;
@@ -177,6 +190,7 @@ layui.use(['layer', 'form', 'jquery'], function () {
         $("#"+uid).css("background","#f2f3f5");
         $(".user-section").hide();
         $("#section-"+uid).show();
+        msg_sender_status(true);
     });
 
 
diff --git a/views/server/index.ejs b/views/server/index.ejs
index 4e0e449..6e8cf6e 100644
--- a/views/server/index.ejs
+++ b/views/server/index.ejs
@@ -132,6 +132,21 @@
         text-align: center;
     }
 
+    .user-info .user-name{
+        font-size: 12px;
+    }
+
+    .empty-status{
+        width: 150px;
+        margin: 0 auto;
+        text-align: center;
+        margin-top: 200px;
+    }
+
+    .empty-status img{
+        width: 100px;
+    }
+
 </style>
 <div class="layui-fluid">
     <div class="friend">
@@ -145,12 +160,15 @@
     </div>
     <div class="chat">
         <div class="message-container" id="message-container">
-
+            <div class="empty-status">
+                <img src="/images/server/tabpage.png">
+                <div class="text">从左侧列表打开对话</div>
+            </div>
         </div>
         <div class="message-sender">
             <div class="sender-editor">
-                <textarea placeholder="请输入" id="msg-send-textarea"></textarea>
-                <div class="layui-btn layui-btn-normal btnMsgSend">发送</div>
+                <textarea placeholder="请输入" id="msg-send-textarea" disabled></textarea>
+                <div class="layui-btn layui-btn-normal btnMsgSend layui-btn-disabled" >发送</div>
             </div>
         </div>
     </div>