Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mr-julyedu
Overview
Overview
Details
Activity
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
baiguangyao
mr-julyedu
Commits
5c18d981
Commit
5c18d981
authored
Dec 17, 2019
by
zhanghaozhe
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '00'
parents
fdd9dca7
08cab26d
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
src/components/activity/newyear-2019/landing/index.js
+4
-4
src/components/activity/newyear-2019/landing/landing.scss
+2
-1
No files found.
src/components/activity/newyear-2019/landing/index.js
View file @
5c18d981
...
@@ -126,7 +126,8 @@ class Landing extends Component {
...
@@ -126,7 +126,8 @@ class Landing extends Component {
})
})
}
}
handleToMyTreasure
=
()
=>
{
handleToMyTreasure
=
id
=>
{
const
{
history
}
=
this
.
props
this
.
joinSuccessPopup
&&
this
.
joinSuccessPopup
.
remove
()
this
.
joinSuccessPopup
&&
this
.
joinSuccessPopup
.
remove
()
if
(
getParam
(
'version'
))
{
if
(
getParam
(
'version'
))
{
history
.
push
(
`/year/yearTreasure?id=
${
id
}
&version=
${
getParam
(
'version'
)}
`
)
history
.
push
(
`/year/yearTreasure?id=
${
id
}
&version=
${
getParam
(
'version'
)}
`
)
...
@@ -136,7 +137,6 @@ class Landing extends Component {
...
@@ -136,7 +137,6 @@ class Landing extends Component {
}
}
joinSuccess
=
({
id
,
status
,
my_team
:
{
team_num
,
lack_member
,
is_team
,
treasure_code
}})
=>
{
joinSuccess
=
({
id
,
status
,
my_team
:
{
team_num
,
lack_member
,
is_team
,
treasure_code
}})
=>
{
const
{
history
}
=
this
.
props
this
.
joinSuccessPopup
=
Popup
({
this
.
joinSuccessPopup
=
Popup
({
title
:
<
div
className
=
{
'join-success'
}
>
title
:
<
div
className
=
{
'join-success'
}
>
<
img
src
=
"https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/check-icon.png"
alt
=
""
/>
<
img
src
=
"https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/check-icon.png"
alt
=
""
/>
...
@@ -156,9 +156,9 @@ class Landing extends Component {
...
@@ -156,9 +156,9 @@ class Landing extends Component {
{
{
status
===
2
status
===
2
?
<
img
style
=
{{
width
:
'150px'
,
marginTop
:
'23px'
}}
?
<
img
style
=
{{
width
:
'150px'
,
marginTop
:
'23px'
}}
src
=
"https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/
PC/treasure-box.png
"
src
=
"https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/
treasure-split.gif
"
alt
=
""
alt
=
""
onClick
=
{
this
.
handleToMyTreasure
}
onClick
=
{
this
.
handleToMyTreasure
.
bind
(
this
,
id
)
}
/
>
/
>
:
is_team
:
is_team
?
<
button
type
=
'button'
?
<
button
type
=
'button'
...
...
src/components/activity/newyear-2019/landing/landing.scss
View file @
5c18d981
.sup
{
.sup
{
position
:
absolute
;
position
:
absolute
;
right
:
-10px
;
right
:
-10px
;
top
:
-13px
;
top
:
0
;
transform
:
translateY
(
-100%
);
width
:
30px
;
width
:
30px
;
height
:
16px
;
height
:
16px
;
background
:
rgba
(
255
,
227
,
0
,
1
);
background
:
rgba
(
255
,
227
,
0
,
1
);
...
...
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