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
feef485b
Commit
feef485b
authored
Dec 16, 2019
by
xuzhenghua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
48722676
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
17 additions
and
27 deletions
+17
-27
src/components/activity/newyear-2019/common/system-bullet-screen/index.js
+3
-6
src/components/activity/newyear-2019/common/system-bullet-screen/system-bullet-screen.scss
+2
-1
src/components/activity/newyear-2019/common/user-bullet-screen/index.js
+1
-1
src/components/activity/newyear-2019/myTreasure/prize.js
+2
-1
src/components/activity/newyear-2019/preheat/YearCourse/index.scss
+1
-1
src/components/activity/newyear-2019/preheat/index.js
+1
-17
src/components/activity/newyear-2019/treasure-box/rank.js
+7
-0
No files found.
src/components/activity/newyear-2019/common/system-bullet-screen/index.js
View file @
feef485b
...
@@ -22,7 +22,6 @@ class SystemBulletScreen extends Component {
...
@@ -22,7 +22,6 @@ class SystemBulletScreen extends Component {
this
.
swiper
&&
this
.
swiper
.
destroy
()
this
.
swiper
&&
this
.
swiper
.
destroy
()
}
}
initializeSwiper
=
()
=>
{
initializeSwiper
=
()
=>
{
const
_this
=
this
const
_this
=
this
this
.
swiper
=
new
Swiper
(
'.sys-bullet-screen-swiper-container'
,
{
this
.
swiper
=
new
Swiper
(
'.sys-bullet-screen-swiper-container'
,
{
...
@@ -62,18 +61,16 @@ class SystemBulletScreen extends Component {
...
@@ -62,18 +61,16 @@ class SystemBulletScreen extends Component {
},
1000
)
},
1000
)
}
else
{
}
else
{
setTimeout
(()
=>
{
setTimeout
(()
=>
{
++
this
.
count
;
swiper
.
slideNext
()
swiper
.
slideNext
()
},
3000
)
},
3000
)
}
}
}
}
transitionEnd
=
()
=>
{
transitionEnd
=
()
=>
{
const
{
const
{
bullets
}
=
this
.
props
bullets
=
[]
}
=
this
.
props
const
len
=
bullets
.
length
*
3
const
len
=
bullets
.
length
*
3
if
(
++
this
.
count
===
len
)
{
if
(
++
this
.
count
===
len
)
{
setTimeout
(()
=>
{
setTimeout
(()
=>
{
this
.
sysNotice
.
style
.
height
=
`0px`
this
.
sysNotice
.
style
.
height
=
`0px`
...
@@ -87,7 +84,7 @@ class SystemBulletScreen extends Component {
...
@@ -87,7 +84,7 @@ class SystemBulletScreen extends Component {
removeSystemNotices
=
e
=>
{
removeSystemNotices
=
e
=>
{
e
.
persist
()
e
.
persist
()
if
(
e
.
target
===
this
.
sysNotice
)
{
if
(
e
.
target
===
this
.
sysNotice
)
{
this
.
setState
({
this
.
setState
({
showNotices
:
false
showNotices
:
false
})
})
...
...
src/components/activity/newyear-2019/common/system-bullet-screen/system-bullet-screen.scss
View file @
feef485b
@import
"../user-bullet-screen/bullet-screen"
;
@import
"../user-bullet-screen/bullet-screen"
;
#system-bullet-screen
{
#system-bullet-screen
{
@extend
.bullet-screen
;
overflow
:
hidden
;
overflow
:
hidden
;
margin-top
:
11px
;
margin-top
:
11px
;
margin-bottom
:
16px
;
margin-bottom
:
16px
;
...
@@ -25,9 +26,9 @@
...
@@ -25,9 +26,9 @@
span
{
span
{
display
:
inline-block
;
display
:
inline-block
;
white-space
:
nowrap
;
white-space
:
nowrap
;
overflow
:
visible
;
line-height
:
30px
;
line-height
:
30px
;
}
}
}
}
@extend
.bullet-screen
;
}
}
src/components/activity/newyear-2019/common/user-bullet-screen/index.js
View file @
feef485b
...
@@ -16,7 +16,7 @@ class UserBulletScreen extends Component {
...
@@ -16,7 +16,7 @@ class UserBulletScreen extends Component {
this
.
getBulletScreenData
(
true
)
this
.
getBulletScreenData
(
true
)
}
}
componentWillU
pdate
()
{
componentWillU
nmount
()
{
this
.
swiper
&&
this
.
swiper
.
destroy
()
this
.
swiper
&&
this
.
swiper
.
destroy
()
}
}
...
...
src/components/activity/newyear-2019/myTreasure/prize.js
View file @
feef485b
...
@@ -86,7 +86,8 @@ export default (props) => {
...
@@ -86,7 +86,8 @@ export default (props) => {
{
/* 第三:奖品,任意线上课程兑换券 */
}
{
/* 第三:奖品,任意线上课程兑换券 */
}
{
{
(
!
bind_phone
&&
!
bind_address
&&
prize_type
===
5
)
&&
(
!
bind_phone
&&
!
bind_address
&&
prize_type
===
5
)
&&
<
a
className
=
"team-result"
>
文案待定
<
/a
>
<
a
className
=
"team-result"
>
关注服务号“七月在线实验室”
回复“领课”
<
/a
>
}
}
<
/
>
<
/
>
)
)
...
...
src/components/activity/newyear-2019/preheat/YearCourse/index.scss
View file @
feef485b
...
@@ -273,8 +273,8 @@
...
@@ -273,8 +273,8 @@
background-repeat
:
no-repeat
;
background-repeat
:
no-repeat
;
background-size
:
cover
;
background-size
:
cover
;
position
:
fixed
;
position
:
fixed
;
top
:
50%
;
right
:
0
;
right
:
0
;
bottom
:
20%
;
margin-top
:
-57px
;
margin-top
:
-57px
;
z-index
:
22
;
z-index
:
22
;
.nav-right__link
{
.nav-right__link
{
...
...
src/components/activity/newyear-2019/preheat/index.js
View file @
feef485b
...
@@ -131,23 +131,7 @@ export default class index extends Component {
...
@@ -131,23 +131,7 @@ 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/rank.js
View file @
feef485b
...
@@ -21,6 +21,7 @@ class TreasureRank extends Component {
...
@@ -21,6 +21,7 @@ class TreasureRank extends Component {
http
.
get
(
`
${
API
.
home
}
/sys/treasure/ranking`
).
then
(
res
=>
{
http
.
get
(
`
${
API
.
home
}
/sys/treasure/ranking`
).
then
(
res
=>
{
const
{
code
,
data
}
=
res
.
data
;
const
{
code
,
data
}
=
res
.
data
;
if
(
code
===
200
)
{
if
(
code
===
200
)
{
if
(
JSON
.
stringify
(
data
)
!==
'{}'
)
{
if
(
data
.
length
>
5
)
{
if
(
data
.
length
>
5
)
{
this
.
setState
({
this
.
setState
({
rank
:
data
.
filter
((
item
,
index
)
=>
index
<
5
),
rank
:
data
.
filter
((
item
,
index
)
=>
index
<
5
),
...
@@ -35,6 +36,7 @@ class TreasureRank extends Component {
...
@@ -35,6 +36,7 @@ class TreasureRank extends Component {
});
});
}
}
}
}
}
});
});
}
}
...
@@ -56,6 +58,9 @@ class TreasureRank extends Component {
...
@@ -56,6 +58,9 @@ class TreasureRank extends Component {
render
()
{
render
()
{
const
{
rank
,
isMore
}
=
this
.
state
;
const
{
rank
,
isMore
}
=
this
.
state
;
return
(
return
(
<>
{
rank
.
length
!==
0
&&
<
div
data
-
skip
=
"rank"
>
<
div
data
-
skip
=
"rank"
>
<
div
className
=
"rank-title"
>
<
div
className
=
"rank-title"
>
<
i
className
=
"rank-title__decorate"
><
/i
>
<
i
className
=
"rank-title__decorate"
><
/i
>
...
@@ -102,6 +107,8 @@ class TreasureRank extends Component {
...
@@ -102,6 +107,8 @@ class TreasureRank extends Component {
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
/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