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
94a6b3a7
Commit
94a6b3a7
authored
Dec 12, 2019
by
xuzhenghua
Browse files
Options
Browse Files
Download
Plain Diff
bug
parents
c1cd3d48
28f2cab5
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
21 deletions
+25
-21
src/components/activity/newyear-2019/common/commonPopup/index.js
+1
-1
src/components/activity/newyear-2019/common/system-bullet-screen/system-bullet-screen.scss
+1
-1
src/components/activity/newyear-2019/preheat/LiveRoom/index.scss
+21
-18
src/components/activity/newyear-2019/treasure-box/index.js
+2
-1
No files found.
src/components/activity/newyear-2019/common/commonPopup/index.js
View file @
94a6b3a7
...
...
@@ -22,7 +22,7 @@ export default class index extends Component {
render
()
{
return
(
<
div
className
=
'popup__container'
onClick
=
{
this
.
closePopup
}
>
<
div
className
=
'content__container'
style
=
{
this
.
computedStyle
()}
>
<
div
className
=
'content__container'
style
=
{
this
.
computedStyle
()}
onClick
=
{(
e
)
=>
{
e
.
stopPropagation
()}}
>
<
img
className
=
"close__btn"
onClick
=
{
this
.
props
.
closePopup
}
src
=
'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/close-btn.png'
alt
=
""
/>
{
React
.
Children
.
map
(
this
.
props
.
children
,
function
(
child
)
{
...
...
src/components/activity/newyear-2019/common/system-bullet-screen/system-bullet-screen.scss
View file @
94a6b3a7
...
...
@@ -7,7 +7,7 @@
padding-left
:
2px
;
display
:
flex
;
align-items
:
center
;
transition
:
height
.
3s
ease-in
-out
;
transition
:
height
.
1s
ease
-out
;
.sys-bullet-screen-swiper-container
{
height
:
100%
;
...
...
src/components/activity/newyear-2019/preheat/LiveRoom/index.scss
View file @
94a6b3a7
...
...
@@ -81,19 +81,23 @@
display
:
flex
;
justify-content
:
center
;
align-items
:
center
;
color
:
#070F08
;
background
:linear-gradient
(
90deg
,
rgba
(
255
,
227
,
0
,
1
)
0
%
,
rgba
(
255
,
202
,
0
,
1
)
100
%
)
;
color
:
#070f08
;
background
:
linear-gradient
(
90deg
,
rgba
(
255
,
227
,
0
,
1
)
0%
,
rgba
(
255
,
202
,
0
,
1
)
100%
);
}
.subscribed
{
background
:
rgba
(
254
,
228
,
29
,
1
)
;
background
:
rgba
(
254
,
228
,
29
,
1
);
}
.living
{
background
:
rgba
(
0
,
153
,
255
,
1
)
;
color
:
#
FFF
;
background
:
rgba
(
0
,
153
,
255
,
1
);
color
:
#
fff
;
}
.check__video
{
background
:
rgba
(
114
,
220
,
141
,
1
)
;
color
:
#
FFF
;
background
:
rgba
(
114
,
220
,
141
,
1
);
color
:
#
fff
;
}
}
}
...
...
@@ -105,7 +109,7 @@
align-items
:
center
;
.sub__title
{
color
:
#525
C
65
;
color
:
#525
c
65
;
font-size
:
16px
;
line-height
:
16px
;
font-weight
:
500
;
...
...
@@ -115,15 +119,14 @@
}
.save-image
{
width
:
133px
;
height
:
30px
;
margin-top
:
16px
;
background
:
rgba
(
83
,
39
,
250
,
1
);
border-radius
:
15px
;
font-size
:
14px
;
color
:
#fff
;
-webkit-appearance
:
none
;
outline
:
0
;
border
:
none
;
}
width
:
270px
;
height
:
44px
;
background
:
rgba
(
255
,
227
,
25
,
1
);
border
:
1px
solid
rgba
(
9
,
9
,
9
,
1
);
border-radius
:
5px
;
font-size
:
16px
;
font-weight
:
normal
;
color
:
rgba
(
9
,
9
,
9
,
1
);
}
}
src/components/activity/newyear-2019/treasure-box/index.js
View file @
94a6b3a7
...
...
@@ -8,7 +8,8 @@ import UserBulletScreen from "@components/activity/newyear-2019/common/user-bull
class
TreasureBox
extends
Component
{
render
()
{
return
(
<
CommonContainer
id
=
"year-treasure"
>
<
CommonContainer
id
=
"year-treasure"
title
=
{
'组队开宝箱'
}
>
<
div
style
=
{{
textAlign
:
'center'
,
fontSize
:
'12px'
,
color
:
'#FFDC1E'
,
marginTop
:
'10px'
}}
>
邀请好友组队一起开宝箱,满
5
人后将随机获得以下奖品
~<
/div
>
<
Prizes
showSystemNotices
=
{
true
}
/
>
<
UserBulletScreen
/>
<
TeamInfo
/>
...
...
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