Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
foreign
/
customer-service
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
a92f9e7d
authored
Dec 15, 2021
by
Sixong.Zhu
Browse files
Options
_('Browse Files')
Download
Plain Diff
Merge branch 'master' into pre
parents
fe6e470e
bfc118a7
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
7 deletions
components/message-item/pay-message.vue
components/message.vue
components/message-item/pay-message.vue
View file @
a92f9e7d
...
@@ -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
;
}
}
...
...
components/message.vue
View file @
a92f9e7d
...
@@ -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
()
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment