Commit 47e9534a5192b08db777a7e0250e0109c3eb656e
1 parent
d5965e68
进入直播详情优化
Showing
3 changed files
with
14 additions
and
4 deletions
packageA/pages/liveStream/liveStream.js
| @@ -59,8 +59,18 @@ Page({ | @@ -59,8 +59,18 @@ Page({ | ||
| 59 | clickItem: function (e) { | 59 | clickItem: function (e) { |
| 60 | // id：列表项id | 60 | // id：列表项id |
| 61 | // live：直播类别 即将开始/直播中/精彩回放 | 61 | // live：直播类别 即将开始/直播中/精彩回放 |
| 62 | + | ||
| 63 | + if(e.currentTarget.dataset.live==101){ | ||
| 64 | + var live_status = 'ing' | ||
| 65 | + } | ||
| 66 | + if(e.currentTarget.dataset.live==102){ | ||
| 67 | + var live_status = 'toBegin' | ||
| 68 | + } | ||
| 69 | + if(e.currentTarget.dataset.live==103){ | ||
| 70 | + var live_status = 'over' | ||
| 71 | + } | ||
| 62 | wx.navigateTo({ | 72 | wx.navigateTo({ |
| 63 | - url: '/packageA/pages/liveStreamDetails/liveStreamDetails?id=' + e.currentTarget.dataset.id + '&live=' + e.currentTarget.dataset.live | 73 | + url: '/packageA/pages/liveStreamDetails/liveStreamDetails?id=' + e.currentTarget.dataset.id + '&live=' + live_status |
| 64 | }) | 74 | }) |
| 65 | // console.log('options-->'); | 75 | // console.log('options-->'); |
| 66 | }, | 76 | }, |
packageA/pages/liveStream/liveStream.wxml
| @@ -63,7 +63,7 @@ | @@ -63,7 +63,7 @@ | ||
| 63 | <view class="list" style="margin-top: 23rpx;"> | 63 | <view class="list" style="margin-top: 23rpx;"> |
| 64 | <block wx:for="{{living.pageData}}" wx:key="item"> | 64 | <block wx:for="{{living.pageData}}" wx:key="item"> |
| 65 | <view class="list-item" data-id="{{item.id}}" data-live="ing" style="display: block;margin-top: 23rpx;margin: 20rpx 4%; border-radius: 25rpx;;background-color: white;"> | 65 | <view class="list-item" data-id="{{item.id}}" data-live="ing" style="display: block;margin-top: 23rpx;margin: 20rpx 4%; border-radius: 25rpx;;background-color: white;"> |
| 66 | - <view class="list-item-left" catchtap="clickItem"> | 66 | + <view class="list-item-left" catchtap="clickItem" data-id="{{item.id}}" data-live="{{item.live_status}}"> |
| 67 | <view class="item-btn" catchtap="clickLive" data-roomid="{{item.roomid}}" wx:if="{{item.live_status==101}}">正在直播</view> | 67 | <view class="item-btn" catchtap="clickLive" data-roomid="{{item.roomid}}" wx:if="{{item.live_status==101}}">正在直播</view> |
| 68 | <view class="item-btnjjkb" catchtap="clickLive" data-roomid="{{item.roomid}}" wx:if="{{item.live_status==102}}">即将开播</view> | 68 | <view class="item-btnjjkb" catchtap="clickLive" data-roomid="{{item.roomid}}" wx:if="{{item.live_status==102}}">即将开播</view> |
| 69 | <view class="item-btnhf" catchtap="clickLive" data-roomid="{{item.roomid}}" wx:if="{{item.live_status==103}}">回放</view> | 69 | <view class="item-btnhf" catchtap="clickLive" data-roomid="{{item.roomid}}" wx:if="{{item.live_status==103}}">回放</view> |
| @@ -77,7 +77,7 @@ | @@ -77,7 +77,7 @@ | ||
| 77 | 77 | ||
| 78 | <view class="list-item-right"> | 78 | <view class="list-item-right"> |
| 79 | <view style="display: flex;"> | 79 | <view style="display: flex;"> |
| 80 | - <view style="display: block;width: 70%;" catchtap="clickItem"> | 80 | + <view style="display: block;width: 70%;" catchtap="clickItem" data-id="{{item.id}}" data-live="{{item.live_status}}"> |
| 81 | <view class="item-title">{{item.name}}</view> | 81 | <view class="item-title">{{item.name}}</view> |
| 82 | <view class="item-anchor"> | 82 | <view class="item-anchor"> |
| 83 | <image src="../../images/bar/user_on.png" mode="" style="width: 25rpx;height: 25rpx;"/> | 83 | <image src="../../images/bar/user_on.png" mode="" style="width: 25rpx;height: 25rpx;"/> |
packageA/pages/liveStreamDetails/liveStreamDetails.js
| @@ -530,7 +530,7 @@ drawText: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, un | @@ -530,7 +530,7 @@ drawText: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, un | ||
| 530 | switch(options.live) { | 530 | switch(options.live) { |
| 531 | case 'toBegin': { | 531 | case 'toBegin': { |
| 532 | this.setData({ | 532 | this.setData({ |
| 533 | - btnText: '订阅' | 533 | + btnText: '即将开播' |
| 534 | }) | 534 | }) |
| 535 | break; | 535 | break; |
| 536 | } | 536 | } |