update

cyjme · Nov 8, 2017 · aff4160 · aff4160
1 parent 1372b92
commit aff4160
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 15 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -7,6 +7,7 @@
 
 <script>
 import ReconnectWebsocket from "./ReconnectWebsocket";
+import { scrollBottom } from "./help";
 
 export default {
   name: "app",
@@ -24,13 +25,15 @@ export default {
           this.contacts[index].msgs.push(msg);
         }
       });
+      scrollBottom();
     },
     newMsgFromServer: function(msg) {
       this.contacts.map((item, index) => {
         if (item.token === msg.from) {
           this.contacts[index].msgs.push(msg);
         }
       });
+      scrollBottom();
     },
     sendMsg: function(msg) {
       this.ws.send(JSON.stringify(msg));
@@ -40,14 +43,16 @@ export default {
         data.map(item => {
           item.msgs = [];
           this.contacts.push(item);
+          this.loadHistory(userToken, item.token);
         });
       });
     },
     loadHistory: function(accToken, withAccToken) {
       console.warn("load history");
       let sinceId = 999999999;
       this.contacts.map((item, index) => {
-        if (item.token === accToken) {
+        if (item.token === withAccToken) {
+          console.warn("item,message", item);
           if (item.msgs[0] !== undefined) {
             sinceId = item.msgs[0].id;
             console.warn("sinceId", sinceId);
@@ -97,15 +102,17 @@ export default {
       }
       if (msg.type == "imAction") {
         console.warn("action");
-        let msgs = msg.data;
-        let contactIndex;
-        this.contacts.map((item, index) => {
-          if (item.token == msg.withAccToken) {
-            contactIndex = index;
-          }
-        });
-        msgs.reverse();
-        this.contacts[contactIndex].msgs.unshift(...msgs);
+        if (msg.data.length > 0) {
+          let msgs = msg.data;
+          let contactIndex;
+          this.contacts.map((item, index) => {
+            if (item.token == msg.withAccToken) {
+              contactIndex = index;
+            }
+          });
+          msgs.reverse();
+          this.contacts[contactIndex].msgs.unshift(...msgs);
+        }
       }
     };
 

diff --git a/src/help.js b/src/help.js
@@ -0,0 +1,9 @@
+export function scrollBottom() {
+    setTimeout(()=>{
+
+    let chatLists = document.getElementById('chat-messages');
+    chatLists.scrollTop = chatLists.scrollHeight;
+    },100)
+    console.warn('scrollBottom');
+
+}
diff --git a/src/route/chat/index.vue b/src/route/chat/index.vue
@@ -33,6 +33,7 @@
 </template>
 
 <script>
+import {scrollBottom} from "../../help";
 export default {
   name: "chat",
   props: ["contacts", "newMsg", "sendMsg", "loadHistory"],
@@ -48,7 +49,7 @@ export default {
   methods: {
     handleScroll: function() {
       let chatMessages = document.getElementById("chat-messages");
-      if ((chatMessages.scrollTop = 0)) {
+      if ((chatMessages.scrollTop == 0)) {
         this.loadHistory(this.from, this.to);
       }
     },
@@ -113,10 +114,7 @@ export default {
           msgs = item.msgs;
         }
       });
-      if (document.getElementById("chat-messages") != null) {
-        document.getElementById("chat-messages").scrollTop =
-          document.getElementById("chat-messages").scrollHeight + 200;
-      }
+      scrollBottom();
       return msgs;
     },
     profile: function profile() {