fe / yohobuywap-node · Commits

Go to a project

Authored by 陈轩
Commit 24a0700d3e98294f98f6fef0434e8609f2260dc5 1 parent 59bc5bbf

fix YH-3940

Inline Side-by-side
Showing 3 changed files with 13 additions and 6 deletions
@@ -37,8 +37,7 @@ exports.main = (req, res, next) => { @@ -37,8 +37,7 @@ exports.main = (req, res, next) => {
37 model.fetchInfo(id, isReplay) 37 model.fetchInfo(id, isReplay)
38 .then(result => { 38 .then(result => {
39 if (!result.data) { 39 if (!result.data) {
40 - next(result.message);  
41 - return; 40 + return next();
42 } 41 }
43 res.render('live/play', result.data); 42 res.render('live/play', result.data);
44 }) 43 })
@@ -73,7 +73,8 @@ @@ -73,7 +73,8 @@
73 {{/canPlay}} 73 {{/canPlay}}
74 74
75 {{！直播已结束}} 75 {{！直播已结束}}
76 - <div id="live-state-end" class="live-state is-no-start {{#atEnd}}show{{/atEnd}}" style="background-image: url('{{background_pic}}');"> 76 + <div id="live-state-end" class="live-state is-no-start {{#atEnd}}show{{/atEnd}}">
  77 + <div class="live-state-inner" style="background-image: url('{{background_pic}}');">
77 <div class="live-state__txt">直播已结束</div> 78 <div class="live-state__txt">直播已结束</div>
78 <ul class="live-state-info"> 79 <ul class="live-state-info">
79 <li class="audience text-center"> 80 <li class="audience text-center">
@@ -100,10 +101,12 @@ @@ -100,10 +101,12 @@
100 <i class="iconfont">&#xe623</i> 101 <i class="iconfont">&#xe623</i>
101 </a> 102 </a>
102 </div> 103 </div>
  104 + </div>
103 105
104 {{！直播未开始}} 106 {{！直播未开始}}
105 {{#notBegin}} 107 {{#notBegin}}
106 - <div class="live-state is-no-start show" style="background-image: url('{{background_pic}}');"> 108 + <div class="live-state is-no-start show">
  109 + <div class="live-state-inner" style="background-image: url('{{background_pic}}');">
107 <div class="live-state__txt">直播未开始</div> 110 <div class="live-state__txt">直播未开始</div>
108 <div class="live-state-info text-center"> 111 <div class="live-state-info text-center">
109 <img src="{{master_pic}}" alt="" class="avatar"> 112 <img src="{{master_pic}}" alt="" class="avatar">
@@ -115,6 +118,7 @@ @@ -115,6 +118,7 @@
115 <i class="iconfont">&#xe623</i> 118 <i class="iconfont">&#xe623</i>
116 </a> 119 </a>
117 </div> 120 </div>
  121 + </div>
118 {{/notBegin}} 122 {{/notBegin}}
119 123
120 {{! footer}} 124 {{! footer}}
@@ -9,14 +9,18 @@ @@ -9,14 +9,18 @@
9 width: 100%; 9 width: 100%;
10 max-width: 100%; 10 max-width: 100%;
11 min-height: 100vh; 11 min-height: 100vh;
12 - background-size: 100% 100%;  
13 color: white; 12 color: white;
14 - overflow: hidden; 13 + overflow: auto;
15 .live-btn-close { 14 .live-btn-close {
16 z-index: 200; 15 z-index: 200;
17 } 16 }
18 } 17 }
19 18
  19 +.live-state-inner {
  20 + overflow: hidden;
  21 + background-size: 100% 100%;
  22 +}
  23 +
20 .live-state__txt { 24 .live-state__txt {
21 width: 428px; 25 width: 428px;
22 font-size: 31px; 26 font-size: 31px;