joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

Browse Source
This commit is contained in:
zyy 2020-09-11 16:55:48 +08:00
commit f1f4c85405
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/views/newMap/jointTrainingNew/chatView/chatBox.vue
View File

@ -612,8 +612,13 @@ export default {
}, },
changeMessageList(data) { changeMessageList(data) {
this.commonMessageList.push(data.message); this.commonMessageList.push(data.message);
// if (this.conversitionStateMap[data.message.memberId]) {
// this.conversitionStateMap[data.message.memberId].privateMessageList.push(data.message);
// }
if (this.conversitionStateMap[data.message.memberId]) { if (this.conversitionStateMap[data.message.memberId]) {
this.conversitionStateMap[data.message.memberId].privateMessageList.push(data.message); (this.conversitionStateMap[data.message.memberId].privateMemberList || []).forEach(member => {
this.conversitionStateMap[member.memberId] && this.conversitionStateMap[member.memberId].privateMessageList.push(data.message);
});
} }
if (this.commonConversation) { if (this.commonConversation) {
this.messageList.push(data.message); this.messageList.push(data.message);

2
src/views/newMap/jointTrainingNew/chatView/chatContent.vue
View File

@ -164,7 +164,7 @@ export default {
display: inline-block; display: inline-block;
} }
.userHeader{margin-bottom: 2px;} .userHeader{margin-bottom: 2px;}
.userName{font-size: 12px;display:inline-block;} .userName{font-size: 12px;display:inline-block;margin-right:10px;}
.userChatTime{font-size: 12px;display:inline-block;} .userChatTime{font-size: 12px;display:inline-block;}
.userBubble{ .userBubble{
max-width: 200px; max-width: 200px;