新闻详情，点播列表
This commit is contained in:
parent
4f82d9fd00
commit
8792375b65
1
app.js
1
app.js
@ -5,6 +5,7 @@ App({
|
||||
loginUrl: 'http://192.168.0.113:7001/usercenter',
|
||||
usercenterUrl: 'http://192.168.0.113:7001/usercenter',
|
||||
newsUrl: 'http://192.168.0.113:8082/news',
|
||||
newsContentUrl: 'http://192.168.0.113',
|
||||
libraryUrl: 'http://192.168.0.113:8081/library',
|
||||
venueUrl: 'http://192.168.0.109:8082/venuebooking',
|
||||
activityUrl: 'http://192.168.0.111:8080/culturalactivity',
|
||||
|
||||
5
app.json
5
app.json
@ -7,11 +7,6 @@
|
||||
"pages/myVenueOrder/myVenueOrder",
|
||||
"pages/book/book",
|
||||
"pages/broadcast/broadcast",
|
||||
"pages/center/center",
|
||||
"pages/book/book",
|
||||
"pages/broadcastList/broadcastList",
|
||||
"pages/orderDetail/orderDetail",
|
||||
"pages/myVenueOrder/myVenueOrder",
|
||||
"pages/activityDialog/activityDialog",
|
||||
"pages/teamDetail/teamDetail",
|
||||
"pages/volunteerRegister/volunteerRegister",
|
||||
|
||||
@ -1,15 +1,11 @@
|
||||
// pages/broadcastList/broadcastList.js
|
||||
<<<<<<< HEAD
|
||||
var app = getApp();
|
||||
=======
|
||||
>>>>>>> master
|
||||
Page({
|
||||
|
||||
/**
|
||||
* 页面的初始数据
|
||||
*/
|
||||
data: {
|
||||
<<<<<<< HEAD
|
||||
liveUrl: app.liveUrl,
|
||||
liveRecordUrl: app.liveRecordUrl,
|
||||
liveRecordSrc: null,
|
||||
@ -65,16 +61,10 @@ Page({
|
||||
onPlayStateChange: function(event) {
|
||||
console.log(event.detail.code)
|
||||
},
|
||||
=======
|
||||
|
||||
},
|
||||
|
||||
>>>>>>> master
|
||||
/**
|
||||
* 生命周期函数--监听页面加载
|
||||
*/
|
||||
onLoad: function (options) {
|
||||
<<<<<<< HEAD
|
||||
this.videoContext = wx.createLivePlayerContext('liveRecordVideo');
|
||||
this.setData({
|
||||
livePlanId: options.livePlanId
|
||||
@ -118,11 +108,6 @@ Page({
|
||||
}
|
||||
});
|
||||
},
|
||||
=======
|
||||
|
||||
},
|
||||
|
||||
>>>>>>> master
|
||||
/**
|
||||
* 生命周期函数--监听页面初次渲染完成
|
||||
*/
|
||||
@ -155,22 +140,14 @@ Page({
|
||||
* 页面相关事件处理函数--监听用户下拉动作
|
||||
*/
|
||||
onPullDownRefresh: function () {
|
||||
<<<<<<< HEAD
|
||||
this.getLivePlanRecordList(1);
|
||||
=======
|
||||
|
||||
>>>>>>> master
|
||||
},
|
||||
|
||||
/**
|
||||
* 页面上拉触底事件的处理函数
|
||||
*/
|
||||
onReachBottom: function () {
|
||||
<<<<<<< HEAD
|
||||
this.getLivePlanRecordList(this.data.currentPage + 1);
|
||||
=======
|
||||
|
||||
>>>>>>> master
|
||||
},
|
||||
|
||||
/**
|
||||
|
||||
@ -1,9 +1,5 @@
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
"usingComponents": {},
|
||||
"enablePullDownRefresh": true,
|
||||
"backgroundTextStyle": "dark"
|
||||
=======
|
||||
"usingComponents": {}
|
||||
>>>>>>> master
|
||||
}
|
||||
@ -1,19 +1,9 @@
|
||||
<view class="broadcast">
|
||||
<<<<<<< HEAD
|
||||
<view class="play-button-box" wx:if="{{!isPlay}}" bindtap="doPlay">
|
||||
<view class="play-button"></view>
|
||||
</view>
|
||||
<live-player id="liveRecordVideo" bindtap="doStop" src="{{liveRecordUrl}}/{{liveRecordSrc}}" bindstatechange="onPlayStateChange" mode="live" object-fit="contain" style="width: 100%; height: 400rpx;" wx:if="{{liveRecordSrc}}"/>
|
||||
<live-player id="liveRecordVideo" bindtap="doStop" max-cache="20" src="{{liveRecordUrl}}/{{liveRecordSrc}}" bindstatechange="onPlayStateChange" mode="live" object-fit="contain" style="width: 100%; height: 400rpx;" wx:if="{{liveRecordSrc}}"/>
|
||||
</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,11 +1,7 @@
|
||||
.broadcast{
|
||||
width: 100%;
|
||||
height: 400rpx;
|
||||
<<<<<<< HEAD
|
||||
background: #000000;
|
||||
=======
|
||||
background: #D8D8D8;
|
||||
>>>>>>> master
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
@ -23,7 +19,6 @@ video{
|
||||
}
|
||||
.broadcast-list{
|
||||
margin-top: 400rpx;
|
||||
<<<<<<< HEAD
|
||||
}
|
||||
.play-button-box {
|
||||
width: 200rpx;
|
||||
@ -51,6 +46,4 @@ video{
|
||||
position: absolute;
|
||||
top: 40rpx;
|
||||
left: 60rpx;
|
||||
=======
|
||||
>>>>>>> master
|
||||
}
|
||||
@ -118,9 +118,9 @@ Page({
|
||||
app.dialog.msg(data.msg);
|
||||
});
|
||||
},
|
||||
goNewsDetail: function () {
|
||||
goNewsDetail: function (event) {
|
||||
wx.navigateTo({
|
||||
url: '../newsDetail/newsDetail',
|
||||
url: '../newsDetail/newsDetail?templateRecordUrl='+ event.currentTarget.dataset.templateRecordUrl,
|
||||
})
|
||||
},
|
||||
goNewsList: function() {
|
||||
|
||||
@ -53,7 +53,7 @@
|
||||
</view>
|
||||
</view>
|
||||
<view wx:for="{{news.newsList}}" wx:for-index="idx" wx:for-item="item" wx:key="newsList">
|
||||
<view class="news-box" bindtap="goNewsDetail" wx:if="{{item.typesettingCode == 'key_1'}}">
|
||||
<view class="news-box" bindtap="goNewsDetail" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_1'}}">
|
||||
<view class="news-title">{{item.newsContentTitle}}</view>
|
||||
<view class="news-small-pic">
|
||||
<image src="{{news.newsUrl}}/route/file/downloadfile/true/{{coverItem.contentCoverId}}" wx:for="{{item.newsContentCoverList}}" wx:for-item="coverItem" wx:key="coverItem"></image>
|
||||
@ -63,7 +63,7 @@
|
||||
<text>{{item.newsContentPublishTime}}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="news-box transverse-news" bindtap="goNewsDetail" wx:if="{{item.typesettingCode == 'key_2'}}">
|
||||
<view class="news-box transverse-news" bindtap="goNewsDetail" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_2'}}">
|
||||
<view class="news-row-img">
|
||||
<image src="{{news.newsUrl}}/route/file/downloadfile/true/{{coverItem.contentCoverId}}" wx:for="{{item.newsContentCoverList}}" wx:for-item="coverItem" wx:key="coverItem"></image>
|
||||
</view>
|
||||
@ -75,7 +75,7 @@
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="news-box transverse-news" bindtap="goNewsDetail" wx:if="{{item.typesettingCode == 'key_3'}}">
|
||||
<view class="news-box transverse-news" bindtap="goNewsDetail" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_3'}}">
|
||||
<view class="news-row-info">
|
||||
<view class="news-title">{{item.newsContentTitle}}</view>
|
||||
<view class="news-info">
|
||||
@ -87,7 +87,7 @@
|
||||
<image src="{{news.newsUrl}}/route/file/downloadfile/true/{{coverItem.contentCoverId}}" wx:for="{{item.newsContentCoverList}}" wx:for-item="coverItem" wx:key="coverItem"></image>
|
||||
</view>
|
||||
</view>
|
||||
<view class="news-box" bindtap="goNewsDetail" wx:if="{{item.typesettingCode == 'key_4'}}">
|
||||
<view class="news-box" bindtap="goNewsDetail" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_4'}}">
|
||||
<view class="news-title">{{item.newsContentTitle}}</view>
|
||||
<view class="news-big-pic">
|
||||
<image src="{{news.newsUrl}}/route/file/downloadfile/true/{{coverItem.contentCoverId}}" wx:for="{{item.newsContentCoverList}}" wx:for-item="coverItem" wx:key="coverItem"></image>
|
||||
@ -97,7 +97,7 @@
|
||||
<text>{{item.newsContentPublishTime}}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="news-box" bindtap="goNewsDetail" wx:if="{{item.typesettingCode == 'key_5'}}">
|
||||
<view class="news-box" bindtap="goNewsDetail" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_5'}}">
|
||||
<view class="news-title">{{item.newsContentTitle}}</view>
|
||||
<view class="news-info">
|
||||
<text>来源：{{item.newsContentResource}}</text>
|
||||
@ -117,17 +117,12 @@
|
||||
<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>
|
||||
@ -1,18 +1,22 @@
|
||||
// pages/newsDetail/newsDetail.js
|
||||
var app = getApp();
|
||||
Page({
|
||||
|
||||
/**
|
||||
* 页面的初始数据
|
||||
*/
|
||||
data: {
|
||||
|
||||
newsContentUrl: app.newsContentUrl,
|
||||
templateRecordUrl: null
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面加载
|
||||
*/
|
||||
onLoad: function (options) {
|
||||
|
||||
this.setData({
|
||||
templateRecordUrl: options.templateRecordUrl
|
||||
})
|
||||
},
|
||||
|
||||
/**
|
||||
@ -60,7 +64,5 @@ Page({
|
||||
/**
|
||||
* 用户点击右上角分享
|
||||
*/
|
||||
onShareAppMessage: function () {
|
||||
|
||||
}
|
||||
onShareAppMessage: function () {}
|
||||
})
|
||||
@ -1,4 +1,5 @@
|
||||
<view class="news-title">
|
||||
<web-view src="{{newsContentUrl}}/{{templateRecordUrl}}" wx:if="{{templateRecordUrl}}"></web-view>
|
||||
<!-- <view class="news-title">
|
||||
<view class="title">银保监会印发《关于加快推进意外险改革的意见》</view>
|
||||
<view class="news-info">
|
||||
<text>来源</text>
|
||||
@ -90,4 +91,4 @@
|
||||
<image src="../../images/share.png"></image>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view> -->
|
||||
@ -41,6 +41,11 @@ Page({
|
||||
wx.hideLoading();
|
||||
});
|
||||
},
|
||||
goNewsDetail: function (event) {
|
||||
wx.navigateTo({
|
||||
url: '../newsDetail/newsDetail?templateRecordUrl='+ event.currentTarget.dataset.templateRecordUrl,
|
||||
})
|
||||
},
|
||||
/**
|
||||
* 生命周期函数--监听页面加载
|
||||
*/
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<view class="news">
|
||||
<view wx:for="{{news.newsList}}" wx:for-index="idx" wx:for-item="item" wx:key="newsList">
|
||||
<view class="news-box" bindtap="goNewsDetail" wx:if="{{item.typesettingCode == 'key_1'}}">
|
||||
<view class="news-box" bindtap="goNewsDetail" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_1'}}">
|
||||
<view class="news-title">{{item.newsContentTitle}}</view>
|
||||
<view class="news-small-pic">
|
||||
<image src="{{news.newsUrl}}/route/file/downloadfile/true/{{coverItem.contentCoverId}}" wx:for="{{item.newsContentCoverList}}" wx:for-item="coverItem" wx:key="coverItem"></image>
|
||||
@ -10,7 +10,7 @@
|
||||
<text>{{item.newsContentPublishTime}}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="news-box transverse-news" bindtap="goNewsDetail" wx:if="{{item.typesettingCode == 'key_2'}}">
|
||||
<view class="news-box transverse-news" bindtap="goNewsDetail" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_2'}}">
|
||||
<view class="news-row-img">
|
||||
<image src="{{news.newsUrl}}/route/file/downloadfile/true/{{coverItem.contentCoverId}}" wx:for="{{item.newsContentCoverList}}" wx:for-item="coverItem" wx:key="coverItem"></image>
|
||||
</view>
|
||||
@ -22,7 +22,7 @@
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="news-box transverse-news" bindtap="goNewsDetail" wx:if="{{item.typesettingCode == 'key_3'}}">
|
||||
<view class="news-box transverse-news" bindtap="goNewsDetail" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_3'}}">
|
||||
<view class="news-row-info">
|
||||
<view class="news-title">{{item.newsContentTitle}}</view>
|
||||
<view class="news-info">
|
||||
@ -34,7 +34,7 @@
|
||||
<image src="{{news.newsUrl}}/route/file/downloadfile/true/{{coverItem.contentCoverId}}" wx:for="{{item.newsContentCoverList}}" wx:for-item="coverItem" wx:key="coverItem"></image>
|
||||
</view>
|
||||
</view>
|
||||
<view class="news-box" bindtap="goNewsDetail" wx:if="{{item.typesettingCode == 'key_4'}}">
|
||||
<view class="news-box" bindtap="goNewsDetail" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_4'}}">
|
||||
<view class="news-title">{{item.newsContentTitle}}</view>
|
||||
<view class="news-big-pic">
|
||||
<image src="{{news.newsUrl}}/route/file/downloadfile/true/{{coverItem.contentCoverId}}" wx:for="{{item.newsContentCoverList}}" wx:for-item="coverItem" wx:key="coverItem"></image>
|
||||
@ -44,7 +44,7 @@
|
||||
<text>{{item.newsContentPublishTime}}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="news-box" bindtap="goNewsDetail" wx:if="{{item.typesettingCode == 'key_5'}}">
|
||||
<view class="news-box" bindtap="goNewsDetail" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_5'}}">
|
||||
<view class="news-title">{{item.newsContentTitle}}</view>
|
||||
<view class="news-info">
|
||||
<text>来源：{{item.newsContentResource}}</text>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user