From 4c4ff9ada8c21c2aaebef08b35a172baf4ecabe3 Mon Sep 17 00:00:00 2001
From: taoshihan <630892807@qq.com>
Date: Sun, 12 Jun 2022 23:23:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/css/common.css                    | 24 ++++++++++++++++++++----
 static/templates/chat_main.html          | 17 ++++++++++-------
 static/templates/nav.html                |  2 +-
 static/templates/setting_left.html       |  2 --
 static/templates/setting_statistics.html | 11 -----------
 5 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/static/css/common.css b/static/css/common.css
index 1e741ef..c1c75b1 100644
--- a/static/css/common.css
+++ b/static/css/common.css
@@ -276,7 +276,7 @@
 }
 .chatRight{
     height: 100%;
-    overflow: scroll;
+    background: #fff;
     overflow: scroll!important;
 }
 .onlineUsers {
@@ -284,12 +284,16 @@
     height: 40px;
     line-height: 40px;
     font-size: 14px;
-    border-bottom: solid 1px #e6e6e6;
+    border-bottom: solid 1px #f1f1f1;
+    border-left: 4px solid #fff;
 }
 .onlineUsers a{
     color: #333;
 }
-.onlineUsers:hover,.onlineUsers.cur{background-color: #f0f9eb;color: #67C23A;}
+.onlineUsers:hover, .onlineUsers.cur {
+    background-color: rgb(238 247 255);
+    border-left: 4px solid #4299e2;
+}
 .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;overflow: hidden;height: 16px;}
@@ -412,7 +416,6 @@ a{color: #07a9fe;text-decoration: none;}
     font-size: 12px;
     min-height: 300px;
     background: #fff;
-    border: solid 1px #e6e6e6;
     margin-top: 5px;
     margin-bottom: 50px;
 }
@@ -597,4 +600,17 @@ a{color: #07a9fe;text-decoration: none;}
     border-radius: 16px;
     font-size: 12px;
     padding: 4px 16px;
+}
+.chatRow {
+    display: flex;
+}
+.chatRowAvator {
+    margin-right: 10px;
+    flex-shrink: 0;
+}
+.chatBoxMe .chatRow {
+    float: right;
+}
+.chatBoxMe .chatRowAvator {
+    margin-left: 10px;
 }
\ No newline at end of file
diff --git a/static/templates/chat_main.html b/static/templates/chat_main.html
index d0a61ee..8918421 100644
--- a/static/templates/chat_main.html
+++ b/static/templates/chat_main.html
@@ -43,7 +43,7 @@
                                     <div :title="item.last_message" 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-badge value="new" :hidden="item.hidden_new_message" class="item">
-                                                <el-avatar shape="square" :size="40" :src="item.avator"></el-avatar>
+                                                <el-avatar  :size="40" :src="item.avator"></el-avatar>
                                             </el-badge>
                                         </el-col>
                                         <el-col :span="16">
@@ -57,7 +57,7 @@
                                 <el-row  v-for="item in visitors" :key="item.uid" class="">
                                     <div style="cursor:pointer" class="onlineUsers" v-bind:class="{'cur': item.visitor_id==currentGuest }" v-on:click="talkTo(item.visitor_id,item.name)">
                                         <el-col :span="4">
-                                            <el-avatar shape="square" v-bind:class="{'imgGray': item.status==0 }" :size="40" :src="item.avator"></el-avatar>
+                                            <el-avatar  v-bind:class="{'imgGray': item.status==0 }" :size="40" :src="item.avator"></el-avatar>
                                         </el-col>
                                         <el-col style="height:40px;overflow: hidden" :span="16" v-bind:class="{'imgGray': item.status==0 }">
                                             <{item.name}>
@@ -94,11 +94,14 @@
                         <div class="chatBox">
                             <el-row :gutter="2" v-for="v in msgList" v-bind:class="{'chatBoxMe': v.is_kefu==true}">
                                 <div class="chatTime"><{v.time}></div>
-                                <el-col :span="3"><el-avatar shape="square" :size="48" :src="v.avator"></el-avatar></el-col>
-                                <el-col :span="21">
-                                    <div class="chatUser"><{v.name}></div>
-                                    <div class="chatContent" v-html="v.content"></div>
-                                </el-col>
+                                <div class="chatRow">
+                                    <el-avatar v-if="v.is_kefu==false" class="chatRowAvator" shape="square" :size="48" :src="v.avator"></el-avatar>
+                                    <div class="chatMsgContent">
+                                        <div class="chatUser"><{v.name}></div>
+                                        <div class="chatContent" v-html="v.content"></div>
+                                    </div>
+                                    <el-avatar v-if="v.is_kefu==true" class="chatRowAvator" shape="square" :size="48" :src="v.avator"></el-avatar>
+                                </div>
                             </el-row>
                         </div>
                         <div class="kefuFuncBox">
diff --git a/static/templates/nav.html b/static/templates/nav.html
index ae9cc22..e647b67 100644
--- a/static/templates/nav.html
+++ b/static/templates/nav.html
@@ -10,7 +10,7 @@
             <span slot="title">首页</span>
         </div>
 
-        <div class="menuLeftItem" v-on:click="haveNewMessage='';openIframeUrl('/chat_main')">
+        <div class="menuLeftItem active" v-on:click="haveNewMessage='';openIframeUrl('/chat_main')">
             <el-badge :value="haveNewMessage" class="item">
                 <i class="el-icon-chat-dot-round"></i>
             </el-badge>
diff --git a/static/templates/setting_left.html b/static/templates/setting_left.html
index bd381c7..db772cb 100644
--- a/static/templates/setting_left.html
+++ b/static/templates/setting_left.html
@@ -21,8 +21,6 @@
             <span>系统设置</span>
         </template>
         <el-menu-item-group>
-            <el-menu-item index="4-7"  v-on:click="openUrl('/setting_indexpage')">编辑首页</el-menu-item>
-            <el-menu-item index="4-7"  v-on:click="openUrl('/setting_indexpages')">单页列表</el-menu-item>
             <el-menu-item index="4-6"  v-on:click="openUrl('/setting_config')">配置参数</el-menu-item>
             <el-menu-item index="4-5"  v-on:click="openUrl('/setting_ipblack')">IP黑名单</el-menu-item>
             <el-menu-item index="2-5"  v-on:click="openUrl('/setting_deploy')">网页部署</el-menu-item>
diff --git a/static/templates/setting_statistics.html b/static/templates/setting_statistics.html
index e6e37cf..c092c5a 100644
--- a/static/templates/setting_statistics.html
+++ b/static/templates/setting_statistics.html
@@ -30,16 +30,5 @@
 </div>
 </body>
 {{template "setting_bottom" .}}
-<!--对接客服代码,安装完成后更改成自己的域名或IP，下面js文件路径以及GOFLY_URL都要改-->
-<script src="https://gofly.sopans.com/assets/js/gofly-front.js?v=1"></script>
-<script>
-    GOFLY.init({
-        GOFLY_URL:"https://gofly.sopans.com",
-        GOFLY_KEFU_ID: "kefu2",
-        GOFLY_BTN_TEXT: "快速咨询开发者",
-        GOFLY_AUTO_OPEN:true,
-    })
-</script>
-<!--//对接客服代码-->