diff --git a/packageA/pages/liveStream/liveStream.js b/packageA/pages/liveStream/liveStream.js index 3d48339..3a27020 100644 --- a/packageA/pages/liveStream/liveStream.js +++ b/packageA/pages/liveStream/liveStream.js @@ -59,8 +59,18 @@ Page({ clickItem: function (e) { // id:列表项id // live:直播类别 即将开始/直播中/精彩回放 + + if(e.currentTarget.dataset.live==101){ + var live_status = 'ing' + } + if(e.currentTarget.dataset.live==102){ + var live_status = 'toBegin' + } + if(e.currentTarget.dataset.live==103){ + var live_status = 'over' + } wx.navigateTo({ - url: '/packageA/pages/liveStreamDetails/liveStreamDetails?id=' + e.currentTarget.dataset.id + '&live=' + e.currentTarget.dataset.live + url: '/packageA/pages/liveStreamDetails/liveStreamDetails?id=' + e.currentTarget.dataset.id + '&live=' + live_status }) // console.log('options-->'); }, diff --git a/packageA/pages/liveStream/liveStream.wxml b/packageA/pages/liveStream/liveStream.wxml index cb55640..9b403f7 100644 --- a/packageA/pages/liveStream/liveStream.wxml +++ b/packageA/pages/liveStream/liveStream.wxml @@ -63,7 +63,7 @@ - + 正在直播 即将开播 回放 @@ -77,7 +77,7 @@ - + {{item.name}} diff --git a/packageA/pages/liveStreamDetails/liveStreamDetails.js b/packageA/pages/liveStreamDetails/liveStreamDetails.js index 8ac2e74..5a211c9 100644 --- a/packageA/pages/liveStreamDetails/liveStreamDetails.js +++ b/packageA/pages/liveStreamDetails/liveStreamDetails.js @@ -530,7 +530,7 @@ drawText: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, un switch(options.live) { case 'toBegin': { this.setData({ - btnText: '订阅' + btnText: '即将开播' }) break; }