fe / yohobuywap-node · Commits

Go to a project

Authored by 陈轩
Commit ef76618b1ab115d63c89d759205bc8157701e1d4 1 parent ea3cbea4

fix

Inline Side-by-side
Showing 4 changed files with 4 additions and 3 deletions
@@ -15,7 +15,7 @@ const _formatTime = (timestamp, b) => { @@ -15,7 +15,7 @@ const _formatTime = (timestamp, b) => {
15 15
16 switch (diff) { 16 switch (diff) {
17 case 0: 17 case 0:
18 - date = b ? '[]' : '[今天]'; 18 + date = '[今天]';
19 break; 19 break;
20 case 1: 20 case 1:
21 date = '[明日]'; 21 date = '[明日]';
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 {{#if now_living}} 31 {{#if now_living}}
32 <p class="living">直播</p> 32 <p class="living">直播</p>
33 {{else if pre_living}} 33 {{else if pre_living}}
34 - <p class="pre-living">{{starting_time}}</p> 34 + <p class="pre-living">预告 {{starting_time}}</p>
35 {{/if}} 35 {{/if}}
36 </a> 36 </a>
37 <div class="liverec_info"> 37 <div class="liverec_info">
@@ -51,7 +51,7 @@ @@ -51,7 +51,7 @@
51 <span>{{audience_num}}人观看</span> 51 <span>{{audience_num}}人观看</span>
52 </div> 52 </div>
53 </div> 53 </div>
54 - <div class="title"> 54 + <div class="title hide" id="live-watermark">
55 <span>{{watermark}}</span> 55 <span>{{watermark}}</span>
56 </div> 56 </div>
57 </div> 57 </div>
@@ -104,6 +104,7 @@ function init_play_button() { @@ -104,6 +104,7 @@ function init_play_button() {
104 global.$btn_play = $btn_play = $('.live-video-play-button a'); 104 global.$btn_play = $btn_play = $('.live-video-play-button a');
105 var video_source = $('#video_container').attr('data-video'); 105 var video_source = $('#video_container').attr('data-video');
106 $btn_play.on('click', function() { 106 $btn_play.on('click', function() {
  107 + $('#live-watermark').removeClass('hide');
107 if (live_type === 1 || live_type === 3) { 108 if (live_type === 1 || live_type === 3) {
108 if ($('#' + video_id)[0] == undefined) { 109 if ($('#' + video_id)[0] == undefined) {
109 get_chat_info(); //获取弹幕信息 110 get_chat_info(); //获取弹幕信息