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

# Conflicts:
#	src/renderer/components/msssage/index.vue

src/renderer/components/msssage/index.vue

@@ -678,10 +678,10 @@ export default {
             }
           });
         }
-        item.top = false;
+        item.top = 0;
         this.TOPSESSION.forEach(x => {
           if (item.id == x) {
-            item.top = true;
+            item.top = 1;
             return false;
           }
         });
@@ -726,8 +726,16 @@ export default {
       
       
       this.newMsgList = unreadList;
-      sessionlist.sort((a, b) => b.top - a.top)
-      return sessionlist;
+      let topList = [],
+        otherList = [];
+      sessionlist.map(x=>{
+        if (x.top) {
+          topList.push(x)
+        } else {
+          otherList.push(x)
+        }
+      })
+      return [...topList, ...otherList]
     }
     // netState(){
     //   return this.$store.state.isNetError