Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
This commit is contained in:
commit
edcdd8989f
@ -17,8 +17,8 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="dialogBody">
|
<div class="dialogBody">
|
||||||
<div class="leftBox">
|
<div class="leftBox">
|
||||||
<div class="leftLogo">
|
<div class="leftLogo" :title="loginProtitle">
|
||||||
<img :src="logoImgUrl" :alt="logoImgUrl">
|
<img :src="logoImgUrl" alt="">
|
||||||
</div>
|
</div>
|
||||||
<div v-for="(item, index) in tabs" :key="index" class="tab pointer" :class="{active: index === tabActive}" @click="tabsClick(index)">
|
<div v-for="(item, index) in tabs" :key="index" class="tab pointer" :class="{active: index === tabActive}" @click="tabsClick(index)">
|
||||||
<i :class="item.icon" />
|
<i :class="item.icon" />
|
||||||
@ -115,7 +115,7 @@ export default {
|
|||||||
};
|
};
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
...mapGetters('projectConfig', ['loginProLogo']),
|
...mapGetters('projectConfig', ['loginProLogo', 'loginProtitle']),
|
||||||
groupId() {
|
groupId() {
|
||||||
return this.$route.query.group;
|
return this.$route.query.group;
|
||||||
},
|
},
|
||||||
@ -514,7 +514,7 @@ export default {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
if (this.groupList && this.groupList[0] && !this.id && !this.privateChatId) {
|
if (this.groupList && this.groupList[0] && !this.id && !this.privateChatId) {
|
||||||
this.id = this.groupList[0].id;
|
this.groupClick(this.groupList[0]);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
@ -554,7 +554,9 @@ export default {
|
|||||||
} else {
|
} else {
|
||||||
this.privateChatId = this.getPrivateChatId(item);
|
this.privateChatId = this.getPrivateChatId(item);
|
||||||
}
|
}
|
||||||
this.setReadGroup();
|
if (this.getBadge(item.messageList)) {
|
||||||
|
this.setReadGroup();
|
||||||
|
}
|
||||||
},
|
},
|
||||||
getPrivateChatId(item) {
|
getPrivateChatId(item) {
|
||||||
let pId = '';
|
let pId = '';
|
||||||
|
Loading…
Reference in New Issue
Block a user