Commit a92f9e7d by Sixong.Zhu

Merge branch 'master' into pre

parents fe6e470e bfc118a7
...@@ -187,6 +187,7 @@ ...@@ -187,6 +187,7 @@
} }
.texts { .texts {
line-height: 1.5;
div:last-child { div:last-child {
margin-left: -2px; margin-left: -2px;
} }
......
...@@ -326,13 +326,8 @@ ...@@ -326,13 +326,8 @@
return true; return true;
} }
const senderEid = +this.messageBody.eid; const o = +this.messageBody.eid;
const m1 = senderEid === +this.chatMyId; return o === +this.chatMyId;
if (m1 && this.chatMembers) {
const m2 = _.find(this.chatMembers, (i) => +i.eid === senderEid);
return m2 && +m2.oid === +this.messageBody.oid;
}
return false;
} }
private get userName() { private get userName() {
......
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 sign in to comment