Commit 9c7b1302 authored by 罗超's avatar 罗超

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

# Conflicts:
#	src/renderer/components/msssage/index.vue
parents 9ec8efa5 21f4c56c
...@@ -678,10 +678,10 @@ export default { ...@@ -678,10 +678,10 @@ export default {
} }
}); });
} }
item.top = false; item.top = 0;
this.TOPSESSION.forEach(x => { this.TOPSESSION.forEach(x => {
if (item.id == x) { if (item.id == x) {
item.top = true; item.top = 1;
return false; return false;
} }
}); });
...@@ -726,8 +726,16 @@ export default { ...@@ -726,8 +726,16 @@ export default {
this.newMsgList = unreadList; this.newMsgList = unreadList;
sessionlist.sort((a, b) => b.top - a.top) let topList = [],
return sessionlist; otherList = [];
sessionlist.map(x=>{
if (x.top) {
topList.push(x)
} else {
otherList.push(x)
}
})
return [...topList, ...otherList]
} }
// netState(){ // netState(){
// return this.$store.state.isNetError // return this.$store.state.isNetError
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment