From 5db7411c5bd32dbc28f8765b4c4faa9a2c3f2479 Mon Sep 17 00:00:00 2001
From: taoshihan1991 <630892807@qq.com>
Date: Thu, 20 Aug 2020 11:32:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=81=8A=E5=A4=A9=E6=A1=86?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/html/chat_page.html | 24 +++++++++++++-----------
 static/js/gofly-front.js   |  2 +-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/static/html/chat_page.html b/static/html/chat_page.html
index 3154e2a..c637eb3 100644
--- a/static/html/chat_page.html
+++ b/static/html/chat_page.html
@@ -25,12 +25,13 @@
             width: 100%;
             text-align: left;
             position: relative;
+            margin-bottom: 69px;
         }
         .chatBox{
-            max-height: 600px;
-            overflow-y: auto;
-            overflow-x: hidden;
-            margin-bottom: 80px;
+            /*max-height: 600px;*/
+            /*overflow-y: auto;*/
+            /*overflow-x: hidden;*/
+            /*margin-bottom: 80px;*/
         }
         .chatBox .el-col{margin:10px 0;}
         .chatUser{
@@ -71,8 +72,8 @@
         .chatBoxMe .el-col-3{float: right;text-align: right;}
         .chatBoxMe .chatUser{text-align: right}
         .chatBoxMe .chatContent:after{left:auto;right: -10px;}
-        .chatArea{float: left;width: 80%;margin: 4px 0 0 4px;}
-        .btnArea{width: 18%;float: right;}
+        .chatArea{float: left;width: 76%;margin: 4px 0 0 4px;}
+        .btnArea{width: 20%;float: right;}
         .chatTitle{height: 30px;line-height: 30px;color: #1989fa}
         .chatBoxSend{background: #fff;position: fixed;bottom: 0;width: 100%;height: 67px;max-width: 800px;}
         .chatBoxSendBtn{float: right;margin: 12px 4px 0 0;}
@@ -322,7 +323,8 @@
             //滚动到底部
             scrollBottom:function(){
                 this.$nextTick(() => {
-                    $('.chatBox').scrollTop($(".chatBox")[0].scrollHeight);
+                    //debugger;
+                    $('body').scrollTop($("body")[0].scrollHeight);
                 });
             },
             //获取日期
@@ -379,10 +381,10 @@
             initCss(){
                 var _this=this;
                 $(function () {
-                    $(".chatBox").css("max-height",$(window).height());
-                    if (top.location != location){
-                        $(".chatBox").css("max-height",$(window).height()-65);
-                    }
+                    //$(".chatContext").css("max-height",$(window).height());
+                    // if (top.location != location){
+                    //     $(".chatContext").css("max-height",$(window).height()-65);
+                    // }
                     //展示表情
                     var faces=placeFace();
                     $.each(faceTitles, function (index, item) {
diff --git a/static/js/gofly-front.js b/static/js/gofly-front.js
index 4e6d9f8..c1b8863 100644
--- a/static/js/gofly-front.js
+++ b/static/js/gofly-front.js
@@ -9,7 +9,7 @@ $("#launchButton").click(function() {
         area: ['520px', '530px'],
         offset: 'rb', //右下角弹出
         anim: 2,
-        content: [GOFLY_URL+'/chat_page?refer='+window.location.host, 'no'], //iframe的url，no代表不显示滚动条
+        content: [GOFLY_URL+'/chat_page?refer='+window.location.host, 'yes'], //iframe的url，no代表不显示滚动条
         end: function(){
             launchButtonFlag=false;
             $(".launchButton").show();