Merge branch 'master' of http://gitlab.oytour.com/viitto/madara

src/renderer/components/msssage/chat.vue

@@ -153,7 +153,7 @@
         @msgs-loaded="msgsLoaded"
         :canLoadMore="canLoadMore"
       ></chat-list>
-      <div class="new-lst-msg" v-if="lstShowData" @click="goDown">
+      <div class="new-lst-msg" v-if="lstShowData && lstShowData.lastMsgShow.indexOf('更新群信息')==-1" @click="goDown">
         {{id.indexOf('team-')==-1?"":lstShowData.fromNick+"："}}{{lstShowData.lastMsgShow}}
       </div>
       <div class="at-msg-box" v-if="showAt">

src/renderer/components/msssage/chatitem.vue

@@ -1116,6 +1116,7 @@ export default {
 }
 .msg-info{
   flex: 1;
+  max-width: calc(100% - 42px);
   flex-direction:column;
 }
 .item-you .in .msg-info-details{

src/renderer/components/msssage/chatlist.vue

@@ -184,8 +184,8 @@ export default {
   padding: 20px;
   padding-right: 12px;
   height: 100%;
-  overflow: auto;
-
+  overflow-y: auto !important;
+  overflow-x:hidden !important;
 }
 .chat__list li {
   list-style: none;