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
31c374cd
Commit
31c374cd
authored
Dec 16, 2019
by
wangshuo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
拉取分支之后又很多打包文件
parent
5962767f
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
5 deletions
+21
-5
src/components/activity/newyear-2019/common/splitSuccess/index.js
+1
-1
src/components/activity/newyear-2019/myTreasure/team.js
+1
-1
src/components/activity/newyear-2019/preheat/YearCourse/index.js
+1
-1
src/components/activity/newyear-2019/preheat/index.js
+17
-1
src/components/activity/newyear-2019/treasure-box/team.js
+1
-1
No files found.
src/components/activity/newyear-2019/common/splitSuccess/index.js
View file @
31c374cd
...
@@ -70,7 +70,7 @@ class SplitSuccess extends Component {
...
@@ -70,7 +70,7 @@ class SplitSuccess extends Component {
{
{
item
.
prize
item
.
prize
?
<
span
className
=
"member-item__prize"
>
{
item
.
prize
}
<
/span
>
?
<
span
className
=
"member-item__prize"
>
{
item
.
prize
}
<
/span
>
:
<
span
className
=
"member-item__prize"
>
尚未
拆
开宝箱
<
/span
>
:
<
span
className
=
"member-item__prize"
>
尚未开宝箱
<
/span
>
}
}
<
/div
>
<
/div
>
))
))
...
...
src/components/activity/newyear-2019/myTreasure/team.js
View file @
31c374cd
...
@@ -161,7 +161,7 @@ class TreasureTeam extends Component {
...
@@ -161,7 +161,7 @@ class TreasureTeam extends Component {
{
{
currentMember
.
prize_name
currentMember
.
prize_name
?
<
p
className
=
"team-prize"
>
{
currentMember
.
prize_name
}
<
/p
>
?
<
p
className
=
"team-prize"
>
{
currentMember
.
prize_name
}
<
/p
>
:
<
p
className
=
"team-prize"
>
尚未
拆
开宝箱
<
/p
>
:
<
p
className
=
"team-prize"
>
尚未开宝箱
<
/p
>
}
}
{
{
currentMember
.
uid
==
userInfo
.
uid
currentMember
.
uid
==
userInfo
.
uid
...
...
src/components/activity/newyear-2019/preheat/YearCourse/index.js
View file @
31c374cd
...
@@ -438,7 +438,7 @@ class YearCourse extends Component {
...
@@ -438,7 +438,7 @@ class YearCourse extends Component {
{
/*浮框*/
}
{
/*浮框*/
}
<
div
className
=
'nav-right'
>
<
div
className
=
'nav-right'
>
<
span
onClick
=
{
this
.
toBoxList
}
className
=
'nav-right__link'
>
<
span
onClick
=
{
this
.
toBoxList
}
className
=
'nav-right__link'
>
未
拆
宝箱
未
开
宝箱
{
{
removable
>
0
&&
removable
>
0
&&
<
i
className
=
"nav-right__number"
>
{
removable
}
<
/i
>
<
i
className
=
"nav-right__number"
>
{
removable
}
<
/i
>
...
...
src/components/activity/newyear-2019/preheat/index.js
View file @
31c374cd
...
@@ -131,7 +131,23 @@ export default class index extends Component {
...
@@ -131,7 +131,23 @@ export default class index extends Component {
<
/div
>
<
/div
>
<
div
className
=
"banner-treasure__decorate"
><
/div
>
<
div
className
=
"banner-treasure__decorate"
><
/div
>
<
/div
>
<
/div
>
{
/*浮框*/
}
<
div
className
=
'nav-right'
>
<
span
onClick
=
{
this
.
toBoxList
}
className
=
'nav-right__link'
>
未开宝箱
{
removable
>
0
&&
<
i
className
=
"nav-right__number"
>
{
removable
}
<
/i
>
}
<
/span
>
<
a
onClick
=
{()
=>
this
.
toYearWish
()}
className
=
'nav-right__link'
>
心愿单
{
this
.
state
.
txt1
>
0
&&
<
i
className
=
"nav-right__number"
>
{
this
.
state
.
txt1
}
<
/i
>
}
<
/a
>
<
/div
>
{
/* 大咖直播 */
}
{
/* 大咖直播 */
}
<
LiveRoom
/>
<
LiveRoom
/>
...
...
src/components/activity/newyear-2019/treasure-box/team.js
View file @
31c374cd
...
@@ -129,7 +129,7 @@ class TeamInfo extends Component {
...
@@ -129,7 +129,7 @@ class TeamInfo extends Component {
}
else
if
(
removable
===
0
)
{
}
else
if
(
removable
===
0
)
{
Text
=
`共
${
total
}
个宝箱`
;
Text
=
`共
${
total
}
个宝箱`
;
}
else
{
}
else
{
Text
=
`共
${
total
}
个宝箱/
${
removable
}
个未
拆
`
;
Text
=
`共
${
total
}
个宝箱/
${
removable
}
个未
开
`
;
}
}
return
(
return
(
...
...
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