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
ba3c79fc
Commit
ba3c79fc
authored
Oct 31, 2019
by
zhanghaozhe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
大咖直播
parent
37a9be4d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
7 deletions
+11
-7
src/components/blessingPreheat/index.js
+1
-1
src/components/blessingPreheat/live/index.js
+10
-6
No files found.
src/components/blessingPreheat/index.js
View file @
ba3c79fc
...
@@ -368,7 +368,7 @@ class BlessingPreheat extends Component {
...
@@ -368,7 +368,7 @@ class BlessingPreheat extends Component {
<
RankList
><
/RankList
>
<
RankList
><
/RankList
>
<
Live
><
/Live
>
<
Live
isFormal
=
{
isFormal
}
><
/Live
>
<
/div
>
<
/div
>
)
)
}
}
...
...
src/components/blessingPreheat/live/index.js
View file @
ba3c79fc
import
React
,
{
Component
}
from
'react'
import
React
,
{
Component
}
from
'react'
import
'./index.scss'
import
'./index.scss'
import
{
Tabs
,
Toast
}
from
"antd-mobile"
import
{
Tabs
,
Toast
}
from
"antd-mobile"
import
{
htt
p
}
from
"@/utils"
import
{
getParam
,
http
,
SendMessageToAp
p
}
from
"@/utils"
import
{
Popup
}
from
"@common/index"
import
{
Popup
}
from
"@common/index"
import
QRCode
from
'qrcode'
import
QRCode
from
'qrcode'
import
{
uniqBy
}
from
'lodash'
import
{
uniqBy
}
from
'lodash'
import
{
connect
}
from
'react-redux'
import
{
connect
}
from
'react-redux'
import
{
withRouter
}
from
'react-router-dom'
import
{
withRouter
}
from
'react-router-dom'
const
isFormal
=
false
@
connect
(
state
=>
({
user
:
state
.
user
}))
@
connect
(
state
=>
({
user
:
state
.
user
}))
class
Live
extends
Component
{
class
Live
extends
Component
{
...
@@ -19,7 +18,8 @@ class Live extends Component {
...
@@ -19,7 +18,8 @@ class Live extends Component {
preheatLives
:
[],
preheatLives
:
[],
visible
:
false
,
visible
:
false
,
qrcode
:
''
,
qrcode
:
''
,
today
:
''
today
:
''
,
isApp
:
getParam
(
'version'
)
}
}
...
@@ -39,7 +39,7 @@ class Live extends Component {
...
@@ -39,7 +39,7 @@ class Live extends Component {
},
{})
},
{})
let
tabs
,
today
let
tabs
,
today
if
(
isFormal
)
{
if
(
this
.
props
.
isFormal
)
{
tabs
=
Object
.
keys
(
lives
).
map
(
item
=>
({
title
:
item
}))
tabs
=
Object
.
keys
(
lives
).
map
(
item
=>
({
title
:
item
}))
today
=
uniqBy
(
data
.
data
[
'data_active'
],
value
=>
value
.
date
).
findIndex
(
item
=>
item
[
'is_today'
])
today
=
uniqBy
(
data
.
data
[
'data_active'
],
value
=>
value
.
date
).
findIndex
(
item
=>
item
[
'is_today'
])
}
else
{
}
else
{
...
@@ -62,6 +62,10 @@ class Live extends Component {
...
@@ -62,6 +62,10 @@ class Live extends Component {
})
})
}
}
toLiveRoom
=
id
=>
{
SendMessageToApp
(
'toLiveRoom'
,
id
)
}
makeSubscribe
=
id
=>
{
makeSubscribe
=
id
=>
{
const
{
user
,
history
}
=
this
.
props
const
{
user
,
history
}
=
this
.
props
if
(
user
.
hasError
)
{
if
(
user
.
hasError
)
{
...
@@ -109,7 +113,7 @@ class Live extends Component {
...
@@ -109,7 +113,7 @@ class Live extends Component {
initialPage
=
{
today
}
initialPage
=
{
today
}
>
>
{
{
isFormal
this
.
props
.
isFormal
?
tabs
.
map
((
item
,
index
)
=>
{
?
tabs
.
map
((
item
,
index
)
=>
{
const
todayLives
=
lives
[
item
.
title
]
const
todayLives
=
lives
[
item
.
title
]
return
(
return
(
...
@@ -179,7 +183,7 @@ function LiveContent({item, makeSubscribe}) {
...
@@ -179,7 +183,7 @@ function LiveContent({item, makeSubscribe}) {
<
/div
>
<
/div
>
{
{
item
[
'on_live'
]
item
[
'on_live'
]
?
<
button
className
=
{
'on-living'
}
>
正在直播
<
/button
>
?
<
button
className
=
{
'on-living'
}
onClick
=
{
this
.
toLiveRoom
.
bind
(
this
,
item
[
'live_id'
])}
>
正在直播
<
/button
>
:
:
item
[
'is_subscribe'
]
item
[
'is_subscribe'
]
?
<
button
className
=
{
'subscribed'
}
>
已预约
<
/button
>
?
<
button
className
=
{
'subscribed'
}
>
已预约
<
/button
>
...
...
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