Merge branch 'release/live'

@@ -37,8 +37,7 @@ exports.main = (req, res, next) => {
     model.fetchInfo(id, isReplay)
     model.fetchInfo(id, isReplay)
         .then(result => {
         .then(result => {
             if (!result.data) {
             if (!result.data) {
-                next(result.message);
-                return;
+                return next();
             }
             }
             res.render('live/play', result.data);
             res.render('live/play', result.data);
         })
         })

@@ -179,7 +179,6 @@ const fetchLiveInfo = (roomID) => {
                 d.master_pic = helpers.image(d.master_pic, 180, 180);
                 d.master_pic = helpers.image(d.master_pic, 180, 180);
                 d.humanTime = _formatTime(d.starting_time * 1000);   // 预告 开始时间
                 d.humanTime = _formatTime(d.starting_time * 1000);   // 预告 开始时间
                 d.video_src = d.hls_downstream_address;
                 d.video_src = d.hls_downstream_address;
-                d.audience_num = false; // 直播 观众人数 由弹幕获取
 
 
                 // 自定义数据
                 // 自定义数据
                 d.duration = _getHumanDuration(d.live_last_time);
                 d.duration = _getHumanDuration(d.live_last_time);

@@ -37,7 +37,7 @@
             <div class="liverec_info">
             <div class="liverec_info">
                 <img class="liverec_head" src="{{image master_pic 120 120}}" alt="头像">
                 <img class="liverec_head" src="{{image master_pic 120 120}}" alt="头像">
                 <div class="liverec_pannel">
                 <div class="liverec_pannel">
-                    <p class="liverec_name">
+                    <p class="liverec_name clearfix">
                         <span class="name-name">{{master_name}}</span>
                         <span class="name-name">{{master_name}}</span>
                         <span class="name-tag">{{master_meta}}</span>
                         <span class="name-tag">{{master_meta}}</span>
                     </p>
                     </p>

@@ -73,46 +73,51 @@
     {{/canPlay}}
     {{/canPlay}}
 
 
     {{！直播已结束}}
     {{！直播已结束}}
-    <div  id="live-state-end" class="live-state is-no-start {{#atEnd}}show{{/atEnd}}" style="background-image: url('{{background_pic}}');">
-        <div class="live-state__txt">直播已结束</div>
-        <ul class="live-state-info">
-            <li class="audience text-center">
-                <span class="val">{{audience_num}}</span>
-                <span class="label">总观看人数</span>
-            </li>
-            <li class="duration">
-                <div class="inner pull-right">
-                    <span class="val">{{duration}}</span>
+    <div  id="live-state-end" class="live-state is-no-start {{#atEnd}}show{{/atEnd}}">
+        <div class="live-state-inner" style="background-image: url('{{background_pic}}');">
+            <div class="live-state__txt">直播已结束</div>
+            <ul class="live-state-info">
+                <li class="audience text-center">
+                    <span class="val">{{audience_num}}</span>
                     <br>
                     <br>
-                    <span class="label">直播时长</span>
-                </div>
-            </li>
-            <li class="favorite">
-                <div class="inner pull-left">
-                    <span class="val">{{like_num}}</span>
-                    <br>
-                    <span class="label">点赞数</span>
-                </div>
-            </li>
-        </ul>
-        <a href="javascript: history.back();" class="live-btn-close">
-            <i class="iconfont">&#xe623</i>
-        </a>
+                    <span class="label">总观看人数</span>
+                </li>
+                <li class="duration">
+                    <div class="inner pull-right">
+                        <span class="val">{{duration}}</span>
+                        <br>
+                        <span class="label">直播时长</span>
+                    </div>
+                </li>
+                <li class="favorite">
+                    <div class="inner pull-left">
+                        <span class="val">{{like_num}}</span>
+                        <br>
+                        <span class="label">点赞数</span>
+                    </div>
+                </li>
+            </ul>
+            <a href="javascript: history.back();" class="live-btn-close">
+                <i class="iconfont">&#xe623</i>
+            </a>
+        </div>
     </div>
     </div>
 
 
     {{！直播未开始}}
     {{！直播未开始}}
     {{#notBegin}}
     {{#notBegin}}
-    <div class="live-state is-no-start show" style="background-image: url('{{background_pic}}');">
-        <div class="live-state__txt">直播未开始</div>
-        <div class="live-state-info text-center">
-            <img src="{{master_pic}}" alt="" class="avatar">
-            <span class="name text-overflow">{{master_name}}</span><br>
-            <h5 class="title">直播主题: {{title}}</h5>
-            <p class="begin-time">开始时间: {{humanTime}}</p>
+    <div class="live-state is-no-start show">
+        <div class="live-state-inner" style="background-image: url('{{background_pic}}');">
+            <div class="live-state__txt">直播未开始</div>
+            <div class="live-state-info text-center">
+                <img src="{{master_pic}}" alt="" class="avatar">
+                <span class="name text-overflow">{{master_name}}</span><br>
+                <h5 class="title">直播主题: {{title}}</h5>
+                <p class="begin-time">开始时间: {{humanTime}}</p>
+            </div>
+            <a href="javascript: history.back();" class="live-btn-close">
+                <i class="iconfont">&#xe623</i>
+            </a>
         </div>
         </div>
-        <a href="javascript: history.back();" class="live-btn-close">
-            <i class="iconfont">&#xe623</i>
-        </a>
     </div>
     </div>
     {{/notBegin}}
     {{/notBegin}}
 
 

@@ -12,12 +12,11 @@ $border: #e0e0e0;
 }
 }
 
 
 .liverec {
 .liverec {
-    height: 423px;
     width: 640px;
     width: 640px;
+    overflow: hidden;
 
 
     &_child {
     &_child {
         position: relative;
         position: relative;
-        height: 100%;
         width: 50%;
         width: 50%;
         float: left;
         float: left;
         border-right: 1px solid $border;
         border-right: 1px solid $border;
@@ -69,7 +68,6 @@ $border: #e0e0e0;
 }
 }
 
 
 .liverec_info {
 .liverec_info {
-    height: 100px;
     padding: 20px 10px 20px 30px;
     padding: 20px 10px 20px 30px;
 }
 }
 
 
@@ -94,23 +92,27 @@ $border: #e0e0e0;
 
 
     .name-name {
     .name-name {
         display: inline-block;
         display: inline-block;
-        height: 26px;
-        max-width: 85px;
+        max-width: 105px;
+        text-overflow: ellipsis;
         overflow: hidden;
         overflow: hidden;
+        white-space: nowrap;
     }
     }
 
 
     .name-tag {
     .name-tag {
         display: inline-block;
         display: inline-block;
+        float: right;
         font-size: 18px;
         font-size: 18px;
         height: 26px;
         height: 26px;
+        max-width: 100%;
         line-height: 26px;
         line-height: 26px;
         padding: 0 8px;
         padding: 0 8px;
-        max-width: 90px;
         text-align: center;
         text-align: center;
         background: $black;
         background: $black;
         border-radius: 20px;
         border-radius: 20px;
         color: $white;
         color: $white;
         vertical-align: top;
         vertical-align: top;
+        white-space: nowrap;
+        text-overflow: ellipsis;
     }           
     }           
 }
 }
 
 

@@ -9,14 +9,18 @@
     width: 100%;
     width: 100%;
     max-width: 100%;
     max-width: 100%;
     min-height: 100vh;
     min-height: 100vh;
-    background-size: 100% 100%;
     color: white;
     color: white;
-    overflow: hidden;
+    overflow: auto;
     .live-btn-close {
     .live-btn-close {
         z-index: 200;
         z-index: 200;
     }
     }
 }
 }
 
 
+.live-state-inner {
+    overflow: hidden;
+    background-size: 100% 100%;
+}
+
 .live-state__txt {
 .live-state__txt {
     width: 428px;
     width: 428px;
     font-size: 31px;
     font-size: 31px;