直播列表
This commit is contained in:
parent
9a0df17f17
commit
4f82d9fd00
5
app.json
5
app.json
@ -1,6 +1,11 @@
|
||||
{
|
||||
"pages": [
|
||||
"pages/index/index",
|
||||
"pages/center/center",
|
||||
"pages/broadcastList/broadcastList",
|
||||
"pages/orderDetail/orderDetail",
|
||||
"pages/myVenueOrder/myVenueOrder",
|
||||
"pages/book/book",
|
||||
"pages/broadcast/broadcast",
|
||||
"pages/center/center",
|
||||
"pages/book/book",
|
||||
|
@ -1,11 +1,15 @@
|
||||
// pages/broadcastList/broadcastList.js
|
||||
<<<<<<< HEAD
|
||||
var app = getApp();
|
||||
=======
|
||||
>>>>>>> master
|
||||
Page({
|
||||
|
||||
/**
|
||||
* 页面的初始数据
|
||||
*/
|
||||
data: {
|
||||
<<<<<<< HEAD
|
||||
liveUrl: app.liveUrl,
|
||||
liveRecordUrl: app.liveRecordUrl,
|
||||
liveRecordSrc: null,
|
||||
@ -61,10 +65,16 @@ Page({
|
||||
onPlayStateChange: function(event) {
|
||||
console.log(event.detail.code)
|
||||
},
|
||||
=======
|
||||
|
||||
},
|
||||
|
||||
>>>>>>> master
|
||||
/**
|
||||
* 生命周期函数--监听页面加载
|
||||
*/
|
||||
onLoad: function (options) {
|
||||
<<<<<<< HEAD
|
||||
this.videoContext = wx.createLivePlayerContext('liveRecordVideo');
|
||||
this.setData({
|
||||
livePlanId: options.livePlanId
|
||||
@ -108,6 +118,11 @@ Page({
|
||||
}
|
||||
});
|
||||
},
|
||||
=======
|
||||
|
||||
},
|
||||
|
||||
>>>>>>> master
|
||||
/**
|
||||
* 生命周期函数--监听页面初次渲染完成
|
||||
*/
|
||||
@ -140,14 +155,22 @@ Page({
|
||||
* 页面相关事件处理函数--监听用户下拉动作
|
||||
*/
|
||||
onPullDownRefresh: function () {
|
||||
<<<<<<< HEAD
|
||||
this.getLivePlanRecordList(1);
|
||||
=======
|
||||
|
||||
>>>>>>> master
|
||||
},
|
||||
|
||||
/**
|
||||
* 页面上拉触底事件的处理函数
|
||||
*/
|
||||
onReachBottom: function () {
|
||||
<<<<<<< HEAD
|
||||
this.getLivePlanRecordList(this.data.currentPage + 1);
|
||||
=======
|
||||
|
||||
>>>>>>> master
|
||||
},
|
||||
|
||||
/**
|
||||
|
@ -1,5 +1,9 @@
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
"usingComponents": {},
|
||||
"enablePullDownRefresh": true,
|
||||
"backgroundTextStyle": "dark"
|
||||
=======
|
||||
"usingComponents": {}
|
||||
>>>>>>> master
|
||||
}
|
@ -1,4 +1,5 @@
|
||||
<view class="broadcast">
|
||||
<<<<<<< HEAD
|
||||
<view class="play-button-box" wx:if="{{!isPlay}}" bindtap="doPlay">
|
||||
<view class="play-button"></view>
|
||||
</view>
|
||||
@ -6,4 +7,13 @@
|
||||
</view>
|
||||
<view class="broadcast-list">
|
||||
<view class="broadcast-title" bindtap="doChangeSrc" data-live-record-src="{{item.recordFilePath}}" wx:for="{{liveRecoreList}}" wx:for-index="index" wx:for-item="item" wx:key="liveRecoreList">{{index + 1}}.{{item.recordFileName}}</view>
|
||||
=======
|
||||
<live-player id="liveVideo" src="{{liveDetail.liveDeviceRtmpUrl}}" mode="live" object-fit="contain" style="width: 100%; height: 400rpx;"/>
|
||||
</view>
|
||||
<view class="broadcast-list">
|
||||
<view class="broadcast-title">标题</view>
|
||||
<view class="broadcast-title">标题</view>
|
||||
<view class="broadcast-title">标题</view>
|
||||
<view class="broadcast-title">标题</view>
|
||||
>>>>>>> master
|
||||
</view>
|
@ -1,7 +1,11 @@
|
||||
.broadcast{
|
||||
width: 100%;
|
||||
height: 400rpx;
|
||||
<<<<<<< HEAD
|
||||
background: #000000;
|
||||
=======
|
||||
background: #D8D8D8;
|
||||
>>>>>>> master
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
@ -19,6 +23,7 @@ video{
|
||||
}
|
||||
.broadcast-list{
|
||||
margin-top: 400rpx;
|
||||
<<<<<<< HEAD
|
||||
}
|
||||
.play-button-box {
|
||||
width: 200rpx;
|
||||
@ -46,4 +51,6 @@ video{
|
||||
position: absolute;
|
||||
top: 40rpx;
|
||||
left: 60rpx;
|
||||
=======
|
||||
>>>>>>> master
|
||||
}
|
@ -117,12 +117,17 @@
|
||||
<view class="broadcast-container">
|
||||
<view class="broadcast-box" bindtap="goBroadcastDetail" data-live-plan-id="{{item.livePlanId}}" wx:for="{{live.liveList}}" wx:for-index="index" wx:for-item="item" wx:key="liveList">
|
||||
<image src="{{live.liveUrl}}/route/file/downloadfile/true/{{item.livePlanPhoto}}"></image>
|
||||
<<<<<<< HEAD
|
||||
<view class="broadcast-text">{{item.livePlanName}}</view>
|
||||
<view class="broadcast-status">直播中</view>
|
||||
<view class="broadcast-status" wx:if="{{item.liveStatus == 0}}">已结束</view>
|
||||
<view class="broadcast-status" wx:elif="{{item.liveStatus == 1}}">未开始</view>
|
||||
<view class="broadcast-status" wx:elif="{{item.liveStatus == 2}}">直播中</view>
|
||||
<view class="broadcast-status" wx:else>错误</view>
|
||||
=======
|
||||
<view class="broadcast-text">文字</view>
|
||||
<view class="broadcast-status">直播中</view>
|
||||
>>>>>>> master
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
Loading…
Reference in New Issue
Block a user