From 8792375b65cb6457d4c525f5d5ca24032775f2b1 Mon Sep 17 00:00:00 2001 From: wenc000 <450292408@qq.com> Date: Tue, 30 Jun 2020 19:38:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E9=97=BB=E8=AF=A6=E6=83=85=EF=BC=8C?= =?UTF-8?q?=E7=82=B9=E6=92=AD=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 1 + app.json | 5 ----- pages/broadcastList/broadcastList.js | 23 ----------------------- pages/broadcastList/broadcastList.json | 4 ---- pages/broadcastList/broadcastList.wxml | 12 +----------- pages/broadcastList/broadcastList.wxss | 7 ------- pages/index/index.js | 4 ++-- pages/index/index.wxml | 15 +++++---------- pages/newsDetail/newsDetail.js | 12 +++++++----- pages/newsDetail/newsDetail.wxml | 5 +++-- pages/newsList/newsList.js | 5 +++++ pages/newsList/newsList.wxml | 10 +++++----- 12 files changed, 29 insertions(+), 74 deletions(-) diff --git a/app.js b/app.js index 8e6ad0e..963a639 100644 --- a/app.js +++ b/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', diff --git a/app.json b/app.json index 86578bb..64d7f6e 100644 --- a/app.json +++ b/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", diff --git a/pages/broadcastList/broadcastList.js b/pages/broadcastList/broadcastList.js index f222527..32d6ffa 100644 --- a/pages/broadcastList/broadcastList.js +++ b/pages/broadcastList/broadcastList.js @@ -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 }, /** diff --git a/pages/broadcastList/broadcastList.json b/pages/broadcastList/broadcastList.json index 333eaaa..09e623a 100644 --- a/pages/broadcastList/broadcastList.json +++ b/pages/broadcastList/broadcastList.json @@ -1,9 +1,5 @@ { -<<<<<<< HEAD "usingComponents": {}, "enablePullDownRefresh": true, "backgroundTextStyle": "dark" -======= - "usingComponents": {} ->>>>>>> master } \ No newline at end of file diff --git a/pages/broadcastList/broadcastList.wxml b/pages/broadcastList/broadcastList.wxml index 82cdcb8..7459baf 100644 --- a/pages/broadcastList/broadcastList.wxml +++ b/pages/broadcastList/broadcastList.wxml @@ -1,19 +1,9 @@ -<<<<<<< HEAD - + {{index + 1}}.{{item.recordFileName}} -======= - - - - 标题 - 标题 - 标题 - 标题 ->>>>>>> master \ No newline at end of file diff --git a/pages/broadcastList/broadcastList.wxss b/pages/broadcastList/broadcastList.wxss index 725b05e..faf0eb8 100644 --- a/pages/broadcastList/broadcastList.wxss +++ b/pages/broadcastList/broadcastList.wxss @@ -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 } \ No newline at end of file diff --git a/pages/index/index.js b/pages/index/index.js index 4057d26..c3a68b2 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -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() { diff --git a/pages/index/index.wxml b/pages/index/index.wxml index d107ec9..456d041 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -53,7 +53,7 @@ - + {{item.newsContentTitle}} @@ -63,7 +63,7 @@ {{item.newsContentPublishTime}} - + @@ -75,7 +75,7 @@ - + {{item.newsContentTitle}} @@ -87,7 +87,7 @@ - + {{item.newsContentTitle}} @@ -97,7 +97,7 @@ {{item.newsContentPublishTime}} - + {{item.newsContentTitle}} 来源：{{item.newsContentResource}} @@ -117,17 +117,12 @@ -<<<<<<< HEAD {{item.livePlanName}} 直播中 已结束 未开始 直播中 错误 -======= - 文字 - 直播中 ->>>>>>> master \ No newline at end of file diff --git a/pages/newsDetail/newsDetail.js b/pages/newsDetail/newsDetail.js index b08b40a..9ab6664 100644 --- a/pages/newsDetail/newsDetail.js +++ b/pages/newsDetail/newsDetail.js @@ -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 () {} }) \ No newline at end of file diff --git a/pages/newsDetail/newsDetail.wxml b/pages/newsDetail/newsDetail.wxml index 9146010..ff79424 100644 --- a/pages/newsDetail/newsDetail.wxml +++ b/pages/newsDetail/newsDetail.wxml @@ -1,4 +1,5 @@ - + + \ No newline at end of file diff --git a/pages/newsList/newsList.js b/pages/newsList/newsList.js index 76803bd..98fbf79 100644 --- a/pages/newsList/newsList.js +++ b/pages/newsList/newsList.js @@ -41,6 +41,11 @@ Page({ wx.hideLoading(); }); }, + goNewsDetail: function (event) { + wx.navigateTo({ + url: '../newsDetail/newsDetail?templateRecordUrl='+ event.currentTarget.dataset.templateRecordUrl, + }) + }, /** * 生命周期函数--监听页面加载 */ diff --git a/pages/newsList/newsList.wxml b/pages/newsList/newsList.wxml index e6cbc7d..18b4c9d 100644 --- a/pages/newsList/newsList.wxml +++ b/pages/newsList/newsList.wxml @@ -1,6 +1,6 @@ - + {{item.newsContentTitle}} @@ -10,7 +10,7 @@ {{item.newsContentPublishTime}} - + @@ -22,7 +22,7 @@ - + {{item.newsContentTitle}} @@ -34,7 +34,7 @@ - + {{item.newsContentTitle}} @@ -44,7 +44,7 @@ {{item.newsContentPublishTime}} - + {{item.newsContentTitle}} 来源：{{item.newsContentResource}}