Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
yohobuywap-node
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Plain Diff
Browse Files
Authored by
ccbikai
2016-08-23 15:56:35 +0800
Commit
dc74f5ed916f0ad9aabd4d47c481005ead9aec2b
2 parents
10b04749
5e29e242
Merge branch 'feature/live' of git.yoho.cn:fe/yohobuywap-node into feature/live
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
3 deletions
apps/activity/views/action/live/entry.hbs
apps/activity/views/action/live/play.hbs
public/js/activity/live-play.page.js
public/js/activity/live/yoho_live_detail_main.js
apps/activity/views/action/live/entry.hbs
View file @
dc74f5e
...
...
@@ -100,7 +100,7 @@
</div>
</header>
<section>
<a
href=
'http://m.yohobuy.com/activity/live/replay/
{{
video_id
}}
?openby:yohobuy={"action":"go.videoreplay", "params":{"videoid":"
{{
video_id
}}
"
,"videourl":"
{{
url
}}
"
}}'
>
<a
href=
'http://m.yohobuy.com/activity/live/replay/
{{
video_id
}}
?openby:yohobuy={"action":"go.videoreplay", "params":{"videoid":"
{{
video_id
}}
"}}'
>
<div
class=
"record-icon"
></div>
<img
class=
"main-bg"
src=
"
{{
image
pic
640
640
}}
"
alt=
"精彩回放"
>
<p
class=
"main-living"
>
回放
</p>
...
...
apps/activity/views/action/live/play.hbs
View file @
dc74f5e
...
...
@@ -65,7 +65,7 @@
{{/
canPlay
}}
{{
!直播已结束
}}
<div
id=
"live-state-end"
class=
"live-state is-no-start
{{#
isEnd
}}
show
{{/
is
End
}}
"
style=
"background-image: url('
{{
pic
}}
');"
>
<div
id=
"live-state-end"
class=
"live-state is-no-start
{{#
atEnd
}}
show
{{/
at
End
}}
"
style=
"background-image: url('
{{
pic
}}
');"
>
<div
class=
"live-state__txt"
>
直播已结束
</div>
<ul
class=
"live-state-info"
>
<li
class=
"audience text-center"
>
...
...
public/js/activity/live-play.page.js
View file @
dc74f5e
...
...
@@ -6,6 +6,14 @@ require('./live/yoho_live_detail_main');
require
(
'./live/temp'
);
require
(
'./live/yoho_live_share'
);
global
.
$
=
$
;
$
(
'.live-wrapper'
).
css
({
position
:
'relative'
,
height
:
window
.
innerHeight
,
width
:
window
.
innerWidth
});
$
(
function
()
{
var
$share
=
$
(
'.live-btn-share'
);
...
...
public/js/activity/live/yoho_live_detail_main.js
View file @
dc74f5e
...
...
@@ -111,7 +111,7 @@ function init_play_button() {
var
v_width
=
temp_width
+
'px'
;
var
v_height
=
32.575
*
scale
+
'rem'
;
$
(
'.live-loading-container'
).
show
();
//显示loading
init_video
(
video_source
,
_is_wechat
,
_is_ios
,
v_width
,
'100vh
'
);
init_video
(
video_source
,
_is_wechat
,
_is_ios
,
'auto'
,
window
.
innerHeight
+
'px
'
);
setTimeout
(
function
()
{
...
...
Please
register
or
login
to post a comment