fix

陈轩
Commit d29d6b61ee384c8d28d12197877434a9d18fa7bc 1 parent 4b3e9319
Showing 4 changed files with 75 additions and 24 deletions
apps/activity/controllers/live.js
apps/activity/models/live.js
public/js/activity/live/yoho_live_detail_main.js
public/scss/activity/live/_play.css
--- a/apps/activity/controllers/live.js
View file @d29d6b6
+++ b/apps/activity/controllers/live.js
View file @d29d6b6
@@ -26,17 +26,6 @@ exports.index = (req, res, next) => {
     }).catch(next);
 };
-let mockData = {
-    living: 2,
-    audience_num: 300,
-    like_num: '12.3万',
-    duration: '01:23',
-    master_name: 'MR.SHEN',
-    title: '有货潮流新品节正式开幕',
-    live_start_time: 1471485267668,
-    pic: '/img/live.png'
-};
-
 exports.main = (req, res, next) => {
     const isReplay = /^\/live\/replay\//.test(req.path);
     const id = req.params.id;
--- a/apps/activity/models/live.js
View file @d29d6b6
+++ b/apps/activity/models/live.js
View file @d29d6b6
@@ -169,23 +169,39 @@ const fetchLiveInfo = (roomID) => {
                 d.background_pic = helpers.image(d.background_pic, 640, 968);
                 d.pic = helpers.image(d.pic, 640, 968);
                 d.master_pic = helpers.image(d.master_pic, 180, 180);
-                d.humanTime = _formatTime(d.live_start_time * 1000);
+                d.humanTime = _formatTime(d.starting_time * 1000);   // 预告 开始时间
                 d.video_src = d.hls_downstream_address;
-                let durationH = parseInt(d.live_last_time / 3600, 10); // 1h =3600s
-                let durationM = parseInt((d.live_last_time - durationH * 3600) / 60, 10);
-                let duration = [durationH, durationM];
+                let duration = moment.duration(d.live_last_time, 's');
+                let durationH = duration.hours();
+                let durationM = duration.minutes();
+                let durationS = duration.seconds();
-                duration.forEach((val, index) => {
-                    if (val < 10) {
-                        duration[index] = `0${val}`;
+                [durationH, durationM, durationS].forEach((item, index, arr) => {
+                    if (item < 10) {
+                        arr[index] = `0${item}`;
                     } else {
-                        duration[index] = '' + val;
+                        arr[index] = String(item);
                     }
                 });
+
+                // let durationH = parseInt(d.live_last_time / 3600, 10); // 1h =3600s
+                // let durationM = parseInt((d.live_last_time - durationH * 3600) / 60, 10);
+                // let duration = [durationH, durationM];
+
+                // duration.forEach((val, index) => {
+                //     if (val < 10) {
+                //         duration[index] = `0${val}`;
+                //     } else {
+                //         duration[index] = '' + val;
+                //     }
+                // });
+
+
+
                 // 自定义数据
-                d.duration = `${duration[0]} : ${duration[1]}`;
+                d.duration = `${durationH}:${durationM}:${durationS}`;
                 d.canPlay = d.living === 1;
                 d.notBegin = d.living === 0;
                 d.atEnd = d.living === 2;
--- a/public/js/activity/live/yoho_live_detail_main.js
View file @d29d6b6
+++ b/public/js/activity/live/yoho_live_detail_main.js
View file @d29d6b6
@@ -531,12 +531,13 @@ function send_heart_beat() {
 function insert_msg(obj) {
     var $ul = $('#live_chat_ul');
+    var msg_html
     if (obj.avatar == '' || obj.avatar == undefined) {
         var rand = Math.floor(Math.random() * 5) + 1;
-        obj.avatar = site_url + '/img/activity/live/live/head_' + rand + '.png';
-    }
-    var msg_html = '<div class="live-item2"><div class="live-item2-head">' +
-        '<img src="' + obj.avatar + '?imageMogr2/thumbnail/50x50"></div>' +
+        // obj.avatar = site_url + '/img/activity/live/live/head_' + rand + '.png';
+
+        msg_html = '<div class="live-item2"><div class="live-item2-head">' +
+        '<img class="avatar' + rand + '"></div>' +
         '<div class="live-item2_1">' +
         '<span class="live-replay">@' + obj.name + '</span>'+
         '<div class="live-item2_2">' +
@@ -544,6 +545,27 @@ function insert_msg(obj) {
         '</div>' +
         '</div>' +
         '</div>';
+    } else {
+        obj.avatar = obj.avatar.replace(/(\{width}|\{height}|\{mode})/g, function($0) {
+            const dict = {
+                '{width}': width,
+                '{height}': height,
+                '{mode}': mode || 2
+            };
+
+            return dict[$0];
+        })
+
+        msg_html = '<div class="live-item2"><div class="live-item2-head">' +
+        '<img src="' + obj.avatar + '"></div>' +
+        '<div class="live-item2_1">' +
+        '<span class="live-replay">@' + obj.name + '</span>'+
+        '<div class="live-item2_2">' +
+        obj.msg +
+        '</div>' +
+        '</div>' +
+        '</div>';
+    }
     var li = document.createElement('li');
     li.innerHTML = msg_html;
     if ($ul.children().length >= 4) {
--- a/public/scss/activity/live/_play.css
View file @d29d6b6
+++ b/public/scss/activity/live/_play.css
View file @d29d6b6
@@ -118,6 +118,30 @@
 }
 .live-wrapper {
+    .avatar1 {
+        background-image: resolve('activity/live/live/head_1.png');
+    }
+    .avatar2 {
+        background-image: resolve('activity/live/live/head_2.png');
+    }
+    .avatar3 {
+        background-image: resolve('activity/live/live/head_3.png');
+    }
+    .avatar4 {
+        background-image: resolve('activity/live/live/head_4.png');
+    }
+    .avatar5 {
+        background-image: resolve('activity/live/live/head_5.png');
+    }
+
+    .avatar1,
+    .avatar2,
+    .avatar3,
+    .avatar4,
+    .avatar5{
+        background-position: center center;
+        background-size: contain;
+    }
     .float-layer {
         height: 128px;
         background: rgba(68, 68, 68, 0.95);