Merge branch 'feature/live' of git.yoho.cn:fe/yohobuywap-node into feature/live

@@ -100,7 +100,7 @@
             </div>
             </div>
         </header>
         </header>
         <section>
         <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>
                 <div class="record-icon"></div>
                 <img class="main-bg" src="{{image pic 640 640}}" alt="精彩回放">
                 <img class="main-bg" src="{{image pic 640 640}}" alt="精彩回放">
                 <p class="main-living">回放</p>
                 <p class="main-living">回放</p>

@@ -65,7 +65,7 @@
     {{/canPlay}}
     {{/canPlay}}
 
 
     {{！直播已结束}}
     {{！直播已结束}}
-    <div  id="live-state-end" class="live-state is-no-start {{#isEnd}}show{{/isEnd}}" style="background-image: url('{{pic}}');">
+    <div  id="live-state-end" class="live-state is-no-start {{#atEnd}}show{{/atEnd}}" style="background-image: url('{{pic}}');">
         <div class="live-state__txt">直播已结束</div>
         <div class="live-state__txt">直播已结束</div>
         <ul class="live-state-info">
         <ul class="live-state-info">
             <li class="audience text-center">
             <li class="audience text-center">

@@ -6,6 +6,14 @@ require('./live/yoho_live_detail_main');
 require('./live/temp');
 require('./live/temp');
 require('./live/yoho_live_share');
 require('./live/yoho_live_share');
 
 
+global.$ = $;
+
+$('.live-wrapper').css({
+    position: 'relative',
+    height: window.innerHeight,
+    width: window.innerWidth
+});
+
 $(function() {
 $(function() {
     var $share = $('.live-btn-share');
     var $share = $('.live-btn-share');
 
 

@@ -111,7 +111,7 @@ function init_play_button() {
                 var v_width = temp_width + 'px';
                 var v_width = temp_width + 'px';
                 var v_height = 32.575 * scale + 'rem';
                 var v_height = 32.575 * scale + 'rem';
                 $('.live-loading-container').show(); //显示loading
                 $('.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() {
                 setTimeout(function() {