From 2f59589e45d85080ec5e2e2cc9b8676ce55e542f Mon Sep 17 00:00:00 2001
From: taoshihan1991 <630892807@qq.com>
Date: Wed, 22 Jul 2020 14:45:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=81=8A=E5=A4=A9=E7=AA=97?=
 =?UTF-8?q?=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/html/chat_page.html | 11 ++++++-----
 static/html/login.html     |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/static/html/chat_page.html b/static/html/chat_page.html
index bde2c41..e7d1c95 100644
--- a/static/html/chat_page.html
+++ b/static/html/chat_page.html
@@ -15,11 +15,10 @@
         html,
         body {
             height: 100%;
-        }
-        body {
+            background: rgb(245,245,245);
         }
         .chatContext{
-            background: #fff;padding:0 10px;
+            padding:0 10px;
             width: 100%;
             text-align: left;
             position: relative;
@@ -69,10 +68,9 @@
         .chatBoxMe .el-col-3{float: right;text-align: right;}
         .chatBoxMe .chatUser{text-align: right}
         .chatBoxMe .chatContent:after{left:auto;right: -10px;}
-        .chatArea{margin: 10px 0;}
         .chatArea .el-textarea__inner{height: 100%;}
         .chatTitle{height: 30px;line-height: 30px;color: #1989fa}
-        .chatBoxSend{position: fixed;bottom: 0;left: 0;width: 100%;height: 70px;}
+        .chatBoxSend{background: #fff;position: fixed;bottom: 0;left: 0;width: 100%;height: 67px;}
         .chatBoxSendBtn{position: absolute;bottom: 1px;right: 2px;}
         .chatTime{text-align: center;color: #bbb;margin: 5px 0;font-size: 12px;}
         .chatTimeHide{display: none;}
@@ -317,6 +315,9 @@
             initCss(){
                 $(function () {
                     $(".chatBox").css("max-height",$(window).height());
+                    if (top.location != location){
+                        $(".chatBox").css("max-height",$(window).height()-65);
+                    }
                 });
             },
             //心跳
diff --git a/static/html/login.html b/static/html/login.html
index 642ca3b..c685689 100644
--- a/static/html/login.html
+++ b/static/html/login.html
@@ -211,7 +211,7 @@
                     shadeClose: true,
                     shade: false,
                     maxmin: true, //开启最大化最小化按钮
-                    area: ['660px', '600px'],
+                    area: ['550px', '520px'],
                     content: ['/chat_page','no'],
                     end: function(){
                         $(".chatBtn").show();