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
cb060aff
Commit
cb060aff
authored
Nov 11, 2019
by
wangshuo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
双11线上对应
parent
28153c2f
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
35 additions
and
7 deletions
+35
-7
src/components/blessingPreheat/index.js
+1
-1
src/components/blessingPreheat/index.scss
+8
-0
src/components/blessingPreheat/levelTest/index.js
+4
-0
src/components/blessingPreheat/live/index.js
+18
-3
src/components/blessingPreheat/rankList/index.js
+2
-2
src/components/blessingPreheat/rankList/index.scss
+2
-1
No files found.
src/components/blessingPreheat/index.js
View file @
cb060aff
...
...
@@ -593,7 +593,7 @@ class BlessingPreheat extends Component {
{
/* 积福气 */
}
<
ListHeader
id
=
{
'lucky-value'
}
text
=
"积福气,享受更多福利"
styles
=
{{
margin
:
'30px 0 15px'
}}
/
>
<
Link
className
=
"
luck-draw__button"
to
=
"/blessingRank"
>
福气排行榜
><
/Link
>
<
Link
className
=
"
blessing__sort"
to
=
"/blessingRank"
><
/Link
>
<
CollectBlessing
...
...
src/components/blessingPreheat/index.scss
View file @
cb060aff
...
...
@@ -76,6 +76,14 @@
cursor
:
pointer
;
outline
:
none
;
}
.blessing__sort
{
display
:
block
;
margin
:
0
auto
15px
;
width
:
120px
;
height
:
28px
;
background
:
url('https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active19_1111/m/m11_enter_icon.png')
center
center
no-repeat
;
background-size
:
100%
100%
;
}
.formal-draw-btns
{
display
:
flex
;
...
...
src/components/blessingPreheat/levelTest/index.js
View file @
cb060aff
...
...
@@ -29,6 +29,10 @@ class LevelTest extends Component {
{
url
:
"https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active19_1111/AIExam/top8-10.png"
},
{
url
:
"https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active19_1111/AIExam/top11-20.png"
}
],
}
...
...
src/components/blessingPreheat/live/index.js
View file @
cb060aff
...
...
@@ -87,6 +87,21 @@ class Live extends Component {
}
}
checkVideo
=
(
url
)
=>
{
let
version
=
getParam
(
'version'
);
const
{
history
,
user
}
=
this
.
props
;
if
(
!
version
)
{
if
(
user
.
hasError
)
{
this
.
toLogin
()
}
else
{
const
vCourseId
=
url
.
split
(
'/'
)[
0
];
history
.
push
(
`/play/video?id=
${
vCourseId
}
`
)
}
}
else
{
Toast
.
info
(
'当前版本不支持此功能,请前往h5/pc查看回放该直播'
,
2
,
null
,
false
);
}
}
makeSubscribe
=
id
=>
{
const
{
user
}
=
this
.
props
if
(
user
.
hasError
)
{
...
...
@@ -161,7 +176,7 @@ class Live extends Component {
todayLives
&&
todayLives
.
map
((
item
,
index
)
=>
{
return
(
<
LiveContent
item
=
{
item
}
key
=
{
index
}
makeSubscribe
=
{
this
.
makeSubscribe
}
toLiveRoom
=
{
this
.
toLiveRoom
}
/
>
toLiveRoom
=
{
this
.
toLiveRoom
}
checkVideo
=
{
this
.
checkVideo
}
/
>
)
})
}
...
...
@@ -178,7 +193,7 @@ class Live extends Component {
}
}
function
LiveContent
({
item
,
makeSubscribe
,
toLiveRoom
})
{
function
LiveContent
({
item
,
makeSubscribe
,
toLiveRoom
,
checkVideo
})
{
return
(
<
div
className
=
"content"
>
{
...
...
@@ -217,7 +232,7 @@ function LiveContent({item, makeSubscribe, toLiveRoom}) {
}}
>
正在直播
<
/button
>
:
item
[
'is_end'
]
?
<
button
className
=
{
'subscribed'
}
>
已结束
<
/button
>
?
item
.
transcribe_url
===
''
?
<
button
className
=
{
'subscribed'
}
>
已结束
<
/button> : <button className={'on-living'} onClick={
()
=> checkVideo
(
item.transcribe_url
)
}>查看回放
</
button
>
:
item
[
'is_subscribe'
]
?
<
button
className
=
{
'subscribed'
}
>
已预约
<
/button
>
:
<
button
className
=
{
'subscribe'
}
...
...
src/components/blessingPreheat/rankList/index.js
View file @
cb060aff
...
...
@@ -12,7 +12,7 @@ export default class RankList extends Component {
}
componentDidMount
()
{
http
.
get
(
`
${
API
.
home
}
/sys/ai_test/ranking/
1
0`
).
then
(
res
=>
{
http
.
get
(
`
${
API
.
home
}
/sys/ai_test/ranking/
5
0`
).
then
(
res
=>
{
let
data
=
res
.
data
.
data
;
let
code
=
res
.
data
.
code
;
if
(
code
===
200
)
{
...
...
@@ -42,7 +42,7 @@ export default class RankList extends Component {
<>
<
ListHeader
text
=
"测试排行榜"
styles
=
{{
margin
:
'20px 0 10px'
}}
size
=
'middle'
/>
<
div
className
=
"sort__rules"
>
仅显示前
1
0
名
仅显示前
5
0
名
<
/div
>
<
div
className
=
"rank__list_module"
>
<
div
className
=
"rank__table_head"
>
...
...
src/components/blessingPreheat/rankList/index.scss
View file @
cb060aff
...
...
@@ -23,7 +23,8 @@
}
.rank__table_body
{
height
:
504px
;
overflow
:
auto
;
.table__tr
{
height
:
48px
;
display
:
flex
;
...
...
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