Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
xiaoxiaole
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wildfirecode13
xiaoxiaole
Commits
c2e3ef7a
Commit
c2e3ef7a
authored
Mar 03, 2020
by
wildfirecode
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'bug03031200' into dev
parents
477ed87e
018812f3
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
3 deletions
+12
-3
InviteItemSkin.exml
egret/resource/skins/InviteItemSkin.exml
+4
-1
InvitePanel.ts
egret/src/panels/InvitePanel.ts
+1
-0
getInviteInfo.json
mock/happyclear/getInviteInfo.json
+7
-2
No files found.
egret/resource/skins/InviteItemSkin.exml
View file @
c2e3ef7a
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<e:Skin
class=
"InviteItemSkin"
width=
"90"
height=
"90"
xmlns:e=
"http://ns.egret.com/eui"
xmlns:w=
"http://ns.egret.com/wing"
>
<e:Skin
class=
"InviteItemSkin"
width=
"90"
height=
"90"
xmlns:e=
"http://ns.egret.com/eui"
xmlns:w=
"http://ns.egret.com/wing"
>
<e:Image
id=
"img"
source=
""
top=
"0"
left=
"0"
bottom=
"0"
right=
"0"
/>
<e:Group
width=
"90"
height=
"90"
>
<e:Image
id=
"img"
y=
"0"
width=
"90"
height=
"90"
x=
"0"
source=
""
/>
<e:Rect
id=
"avatarMask"
width=
"90"
height=
"90"
y=
"0"
ellipseWidth=
"90"
ellipseHeight=
"90"
/>
</e:Group>
</e:Skin>
</e:Skin>
\ No newline at end of file
egret/src/panels/InvitePanel.ts
View file @
c2e3ef7a
...
@@ -215,6 +215,7 @@ class InviteItem extends eui.ItemRenderer {
...
@@ -215,6 +215,7 @@ class InviteItem extends eui.ItemRenderer {
constructor
()
{
constructor
()
{
super
();
super
();
this
.
skinName
=
getSkinPath
(
'InviteItem'
);
this
.
skinName
=
getSkinPath
(
'InviteItem'
);
this
[
'img'
].
mask
=
this
[
'avatarMask'
];
}
}
dataChanged
()
{
dataChanged
()
{
...
...
mock/happyclear/getInviteInfo.json
View file @
c2e3ef7a
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
"timestamp"
:
1572403459420
,
"timestamp"
:
1572403459420
,
"data"
:
{
"data"
:
{
"invitationId"
:
null
,
"invitationId"
:
null
,
"invitationCount"
:
1
,
"invitationCount"
:
4
,
"sysTime"
:
1572403459405
,
"sysTime"
:
1572403459405
,
"endTime"
:
1572489858000
,
"endTime"
:
1572489858000
,
"completeFlag"
:
0
,
"completeFlag"
:
0
,
...
@@ -14,6 +14,11 @@
...
@@ -14,6 +14,11 @@
"prizeName"
:
null
,
"prizeName"
:
null
,
"prizeImg"
:
"//yun.dui88.com/images/201910/s0yhv1nlil.jpeg"
,
"prizeImg"
:
"//yun.dui88.com/images/201910/s0yhv1nlil.jpeg"
,
"facePrice"
:
"3651404_286462788044574721"
,
"facePrice"
:
"3651404_286462788044574721"
,
"invitationUser"
:
[]
"invitationUser"
:
[
{
"nickname"
:
"nickname"
,
"avatar"
:
"//yun.dui88.com/images/201910/s0yhv1nlil.jpeg"
}
]
}
}
}
}
\ No newline at end of file
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