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
34883f86
Commit
34883f86
authored
Dec 18, 2019
by
zhanghaozhe
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '00' of gitlab.julyedu.com:baiguangyao/mr-julyedu into 00
parents
d86b6025
2fa0d28c
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
src/components/activity/newyear-2019/common/prizes/index.js
+1
-1
src/components/activity/newyear-2019/landing/index.js
+1
-1
src/components/activity/newyear-2019/treasure-box/team.js
+1
-1
No files found.
src/components/activity/newyear-2019/common/prizes/index.js
View file @
34883f86
...
...
@@ -108,7 +108,7 @@ class Prizes extends Component {
item
.
is_captain
!=
0
&&
<
span
className
=
'captain top-tag'
>
队长专属
<
/span
>
}
{
item
.
mode
===
2
&&
<
span
className
=
'stage top-tag'
>
第
{
item
.
stage_no
}
次
必中
<
/span
>
item
.
mode
===
2
&&
<
span
className
=
'stage top-tag'
>
第
{
item
.
stage_no
}
个
必中
<
/span
>
}
{
item
.
grant_max
...
...
src/components/activity/newyear-2019/landing/index.js
View file @
34883f86
...
...
@@ -546,7 +546,7 @@ class Landing extends Component {
}
{
prize_info
&&
prize_info
.
length
!==
0
&&
!
activityEnd
&&
!
isCaptain
&&
<
div
className
=
"certainly-prompt"
>
第
{
prize_info
[
0
].
stage_no
}
次
必中
{
prize_info
[
0
].
name
}
第
{
prize_info
[
0
].
stage_no
}
个宝箱
必中
{
prize_info
[
0
].
name
}
<
/div
>
}
{
...
...
src/components/activity/newyear-2019/treasure-box/team.js
View file @
34883f86
...
...
@@ -233,7 +233,7 @@ class TeamInfo extends Component {
}
<
/div
>
{
stage_no
>
0
&&
name
&&
<
p
className
=
'stage_prize'
>
{
`第
${
stage_no
}
次
必中
${
name
}
`
}
<
/p
>
stage_no
>
0
&&
name
&&
<
p
className
=
'stage_prize'
>
{
`第
${
stage_no
}
个宝箱
必中
${
name
}
`
}
<
/p
>
}
<
/div
>
)
...
...
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