From 59222870258a3a25e91bbbcc596d4efa9d6eeb81 Mon Sep 17 00:00:00 2001 From: wans <747101512@qq.com> Date: Thu, 27 Aug 2020 15:06:43 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9haders=E4=B8=A2=E5=A4=B1?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 1 - pages/book/book.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app.js b/app.js index f992a35..f200905 100644 --- a/app.js +++ b/app.js @@ -10,7 +10,6 @@ App({ venueUrl: 'https://www.wgink.ink/venuebooking', activityUrl: 'https://www.wgink.ink/culturalactivity', volunteerUrl: 'https://www.wgink.ink/volunteer', - venueUrl: 'https://www.wgink.ink/venuebooking', activityUrl: 'https://www.wgink.ink/culturalactivity', volunteerUrl: 'https://www.wgink.ink/volunteer', liveUrl: 'https://www.wgink.ink/live', diff --git a/pages/book/book.js b/pages/book/book.js index 20b4180..d6663cf 100644 --- a/pages/book/book.js +++ b/pages/book/book.js @@ -123,7 +123,7 @@ Page({ return false; } app.restAjax.get(app.restAjax.path('{venueUrl}/app/booking/listgrouninfoanditemrelease/{venuesProjectId}', - [app.venueUrl,self.data.selectVenuesProject]), {headers : {token:self.data.token}}, null, + [app.venueUrl,self.data.selectVenuesProject]), {}, {headers : {token:self.data.token}}, function(code,data){ if(data.data.length > 0 ){ self.setData({ From edcf529ee0eb70eb0d1a3e662d6efa22d140fded Mon Sep 17 00:00:00 2001 From: dong_bo0602 <358256383@qq.com> Date: Tue, 13 Oct 2020 16:15:57 +0800 Subject: [PATCH 2/3] 1013 --- pages/book/book.js | 2 +- pages/center/center.js | 5 +++++ pages/heritage/heritage.wxml | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pages/book/book.js b/pages/book/book.js index 20b4180..afb789e 100644 --- a/pages/book/book.js +++ b/pages/book/book.js @@ -123,7 +123,7 @@ Page({ return false; } app.restAjax.get(app.restAjax.path('{venueUrl}/app/booking/listgrouninfoanditemrelease/{venuesProjectId}', - [app.venueUrl,self.data.selectVenuesProject]), {headers : {token:self.data.token}}, null, + [app.venueUrl,self.data.selectVenuesProject]), null, {headers : {token:self.data.token}} , function(code,data){ if(data.data.length > 0 ){ self.setData({ diff --git a/pages/center/center.js b/pages/center/center.js index 1ef3b73..b901ff1 100644 --- a/pages/center/center.js +++ b/pages/center/center.js @@ -278,6 +278,11 @@ Page({ app.dialog.msg(data.msg); }) }, + cancelPhone: function () { + this.setData({ + showPhone: false + }) + }, /** * 生命周期函数--监听页面加载 */ diff --git a/pages/heritage/heritage.wxml b/pages/heritage/heritage.wxml index 4e0f303..68beadc 100644 --- a/pages/heritage/heritage.wxml +++ b/pages/heritage/heritage.wxml @@ -9,10 +9,10 @@ 文化直播 --> - + 文化地图 From f1eff69198504079759bf289a71907006b988a79 Mon Sep 17 00:00:00 2001 From: wans <747101512@qq.com> Date: Tue, 13 Oct 2020 16:40:53 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 4 + pages/broadcastList/broadcastList.js | 6 +- pages/broadcastList/broadcastList.wxml | 7 +- pages/center/center.js | 6 +- pages/heritage/heritage.wxml | 4 +- pages/index/index.js | 128 +++------------------- pages/index/index.wxml | 30 +++--- pages/resource/resource.js | 143 ++++++++++++++++++++++++ pages/resource/resource.json | 3 + pages/resource/resource.wxml | 25 +++++ pages/resource/resource.wxss | 141 ++++++++++++++++++++++++ pages/template/template.js | 100 +++++++++++++++++ pages/template/template.json | 3 + pages/template/template.wxml | 1 + pages/template/template.wxss | 1 + pages/train/train.js | 144 +++++++++++++++++++++++++ pages/train/train.json | 3 + pages/train/train.wxml | 25 +++++ pages/train/train.wxss | 141 ++++++++++++++++++++++++ pages/travel/travel.js | 118 ++++++++++++++++++++ pages/travel/travel.json | 3 + pages/travel/travel.wxml | 8 ++ pages/travel/travel.wxss | 52 +++++++++ webview/flv/index.html | 22 +--- 24 files changed, 964 insertions(+), 154 deletions(-) create mode 100644 pages/resource/resource.js create mode 100644 pages/resource/resource.json create mode 100644 pages/resource/resource.wxml create mode 100644 pages/resource/resource.wxss create mode 100644 pages/template/template.js create mode 100644 pages/template/template.json create mode 100644 pages/template/template.wxml create mode 100644 pages/template/template.wxss create mode 100644 pages/train/train.js create mode 100644 pages/train/train.json create mode 100644 pages/train/train.wxml create mode 100644 pages/train/train.wxss create mode 100644 pages/travel/travel.js create mode 100644 pages/travel/travel.json create mode 100644 pages/travel/travel.wxml create mode 100644 pages/travel/travel.wxss diff --git a/app.json b/app.json index 23a3a17..7c3a774 100644 --- a/app.json +++ b/app.json @@ -1,6 +1,10 @@ { "pages": [ "pages/index/index", + "pages/travel/travel", + "pages/resource/resource", + "pages/template/template", + "pages/train/train", "pages/cultureMap/cultureMap", "pages/order/order", "pages/venue/venue", diff --git a/pages/broadcastList/broadcastList.js b/pages/broadcastList/broadcastList.js index fad4509..75190f2 100644 --- a/pages/broadcastList/broadcastList.js +++ b/pages/broadcastList/broadcastList.js @@ -33,7 +33,11 @@ Page({ duration: 1500 }) } - console.log(self.data.liveRecordList) + if (self.data.page == 1) { + self.setData({ + videoPath: data.rows[0].recordFilePath + }) + } } ) }, diff --git a/pages/broadcastList/broadcastList.wxml b/pages/broadcastList/broadcastList.wxml index 4a58288..6cc484a 100644 --- a/pages/broadcastList/broadcastList.wxml +++ b/pages/broadcastList/broadcastList.wxml @@ -1,6 +1,7 @@ - - + + \ No newline at end of file diff --git a/pages/center/center.js b/pages/center/center.js index a9550a2..b901ff1 100644 --- a/pages/center/center.js +++ b/pages/center/center.js @@ -256,7 +256,6 @@ Page({ randomName: true }) } else { - wx.hideTabBar() self.setData({ randomName: false }) @@ -279,6 +278,11 @@ Page({ app.dialog.msg(data.msg); }) }, + cancelPhone: function () { + this.setData({ + showPhone: false + }) + }, /** * 生命周期函数--监听页面加载 */ diff --git a/pages/heritage/heritage.wxml b/pages/heritage/heritage.wxml index 4e0f303..68beadc 100644 --- a/pages/heritage/heritage.wxml +++ b/pages/heritage/heritage.wxml @@ -9,10 +9,10 @@ 文化直播 --> - + 文化地图 diff --git a/pages/index/index.js b/pages/index/index.js index 65fc369..1618d1a 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -185,133 +185,36 @@ Page({ url: '../cultureDetail/cultureDetail?libraryId='+ event.currentTarget.dataset.libraryId, }) }, - // 获取输入的手机号 - phoneNum: function (res) { - this.setData({ - phone: res.detail.value - }) - }, - // 校验手机号 - testPhone: function () { + // 获取用户信息 + getUserInfo: function () { var self = this - if (self.data.phone) { - if (!/^1(3|4|5|6|7|8|9)\d{9}$/.test(self.data.phone)) { - wx.showToast({ - title: '请输入正确的手机号', - icon: 'none', - duration: 1500 - }) - } else { - self.getCode() - } - } else { - wx.showToast({ - title: '手机号不能为空', - icon: 'none', - duration: 1500 - }) - } - }, - // 获取验证码 - getCode: function () { - var self = this; - self.setData({ - gotCode: true - }) - self.data.timer = setInterval(function () { - var cur = self.data.restTime - 1 - if (cur == 0) { - clearInterval(self.data.timer) - self.setData({ - restTime: 120, - gotCode: false - }) - } else { - self.setData({ - restTime: cur - }) - } - }, 1000) - app.restAjax.get(app.restAjax.path('{usercenterUrl}/api/sms/getverificationcode/' + self.data.phone, [app.usercenterUrl]), {}, null, - function (code, data) {}, - function (code, data) { - wx.showToast({ - title: data.msg, - icon: 'none', - duration: 1500 - }) - }) - }, - // 提交绑定手机 - submitPhone: function () { - var self = this; - self.setData({ - isConfirm: true - }) - app.restAjax.put(app.restAjax.path('{usercenterUrl}/app/user/updateminiappdefaultusername', [app.usercenterUrl]), { - phone: self.data.phone, - verificationCode: self.data.code - }, { + app.restAjax.get(app.restAjax.path('{usercenterUrl}/app/user/getappuser', [app.usercenterUrl]), {}, { headers: { token: self.data.token } }, function (code, data) { - wx.setStorageSync('token', data.data); - wx.setStorageSync('isRandomUsername', 0) - clearInterval(self.data.timer) self.setData({ - showPhone: false + userInfo: data }) - wx.showTabBar(); - self.getUserInfo() }, function (code, data) { app.dialog.msg(data.msg); - self.setData({ - isConfirm: false - }) }) }, - // 验证码 - inputCode: function (e) { - this.setData({ - code: e.detail.value + goTrain: function () { + wx.navigateTo({ + url: '../train/train', }) }, - // 判断用户是否为随机名称 - isRandomName: function () { - var self = this - wx.getStorage({ - key: 'isRandomUsername', - success: function (res) { - if (res.data == 1) { - wx.hideTabBar() - self.setData({ - randomName: true - }) - } else { - wx.hideTabBar() - self.setData({ - randomName: false - }) - } - } + goTravel: function () { + wx.navigateTo({ + url: '../travel/travel', + }) + }, + goResource: function () { + wx.navigateTo({ + url: '../resource/resource', }) }, - // 获取用户信息 - getUserInfo: function () { - var self = this - app.restAjax.get(app.restAjax.path('{usercenterUrl}/app/user/getappuser', [app.usercenterUrl]), {}, { - headers: { - token: self.data.token - } - }, function (code, data) { - self.setData({ - userInfo: data - }) - }, function (code, data) { - app.dialog.msg(data.msg); - }) - }, /** * 生命周期函数--监听页面加载 */ @@ -323,7 +226,6 @@ Page({ self.doGetLiveList(); self.doGetVenueList(); self.doGetActivityList(); - self.isRandomName(); }, /** diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 5dc676c..8ce8aaf 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -34,6 +34,18 @@ 直播点播 + + + 在线培训 + + + + 文化旅游 + + + + 数图资源 + @@ -133,20 +145,4 @@ 错误 - - \ No newline at end of file + \ No newline at end of file diff --git a/pages/resource/resource.js b/pages/resource/resource.js new file mode 100644 index 0000000..9cdef80 --- /dev/null +++ b/pages/resource/resource.js @@ -0,0 +1,143 @@ +// pages/resource/resource.js +const app = getApp() +Page({ + + /** + * 页面的初始数据 + */ + data: { + newsUrl: app.newsUrl, + directoriesParentId: '98c74389-2088-499b-a046-8611bdc57ea4', + typeList: [], + currentPage: 1, + rows: 10, + currentNewsDictionariesId: '', + trainList: [] + }, + getType: function () { + var self = this + app.restAjax.get(app.restAjax.path('{newsUrl}/app/newsdirectories/listnewsdirectoriesrelease', [app.newsUrl]), { + directoriesParentId: self.data.directoriesParentId + }, null, function (code, data) { + self.setData({ + typeList: data + }) + self.getList(1) + }) + }, + changeType: function (e) { + this.setData({ + currentNewsDictionariesId: e.currentTarget.dataset.newsDirectoriesId + }) + this.getList(1) + }, + getList: function (page) { + var self = this + app.dialog.loading('正在加载'); + var info = { + newsDirectoriesParentId: self.data.directoriesParentId, + newsDirectoriesId: self.data.currentNewsDictionariesId ? self.data.currentNewsDictionariesId : '', + page: page, + rows: self.data.rows + } + app.restAjax.get(app.restAjax.path('{newsUrl}/app/newscontent/listpagenewscontentrelease', [app.newsUrl]), info, null, function (code, data) { + var newsArray; + for (var i = 0; i < data.rows.length; i++) { + data.rows[i].newsContentCoverList = data.rows[i].newsContentCoverList[0].contentCoverId + } + if(page <= 1) { + newsArray = data.rows; + } else { + newsArray = self.data.trainList; + newsArray = newsArray.concat(data.rows); + } + self.setData({ + currentPage: page, + trainList: newsArray + }) + if(data.rows.length == 0) { + app.dialog.msg('暂无数据'); + return; + } + }, function(code, data) { + app.dialog.msg(data.msg); + }, function() { + wx.stopPullDownRefresh(); + wx.hideLoading(); + }) + }, + goNewsDetail: function (e) { + var url = e.currentTarget.dataset.templateRecordUrl + var link = e.currentTarget.dataset.contentLink + if (link) { + wx.navigateTo({ + url: '../template/template?link=' + encodeURIComponent(link), + }) + } else { + wx.navigateTo({ + url: '../template/template?url=' + encodeURIComponent(url), + }) + } + }, + doClearCurrentNewsDictionariesId: function () { + this.setData({ + currentNewsDictionariesId: '' + }) + this.getList(1) + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + this.getType() + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + this.getList(1); + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + this.getList(this.data.currentPage + 1); + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pages/resource/resource.json b/pages/resource/resource.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/resource/resource.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/resource/resource.wxml b/pages/resource/resource.wxml new file mode 100644 index 0000000..6761b90 --- /dev/null +++ b/pages/resource/resource.wxml @@ -0,0 +1,25 @@ + + + + + 全部 + + + + + {{item.directoriesName}} + + + + + + + {{item.newsContentTitle}} + + + + + {{item.newsContentPublishTime}} + + + \ No newline at end of file diff --git a/pages/resource/resource.wxss b/pages/resource/resource.wxss new file mode 100644 index 0000000..7912152 --- /dev/null +++ b/pages/resource/resource.wxss @@ -0,0 +1,141 @@ +.top-tab{ + position: fixed; + top: 0; + left: 0; + right: 0; + background: #fff; + overflow-x: auto; +} +.type{ + display: flex; +} +.tab-box{ + display: inline-flex; + justify-content: center; + align-items: center; + width: 30%; + position: relative; + height: 90rpx; + font-size: 30rpx; + color: #242424; + flex-shrink: 0; + padding: 0 10rpx; +} +.tab-box.active{ + color: #9F1512; +} +.tab-box image{ + position: absolute; + width: 15rpx; + height: 40rpx; + top: 50%; + margin-top: -20rpx; + display: none; +} +.tab-box.active image{ + display: block; +} +.tab-box image.selected-l{ + left: 10rpx; +} +.tab-box image.selected-r{ + right: 10rpx; +} +.area{ + overflow-x: auto; + white-space: nowrap; + position: fixed; + top: 90rpx; + left: 0; + right: 0; + border-bottom: 1px solid #DDD; + background: #fff; +} +.area-box{ + display: inline-flex; + width: 30%; + height: 90rpx; + /* line-height: 90rpx; + text-align: center; */ + align-items: center; + justify-content: center; + padding: 0 20px; + box-sizing: border-box; + position: relative; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + font-size: 30rpx; +} +.area-box.active{ + color: #9F1512; +} +.area-box image{ + position: absolute; + width: 15rpx; + height: 40rpx; + top: 50%; + margin-top: -20rpx; + display: none; +} +.area-box.active image{ + display: block; +} +.area-box image.selected-l{ + left: 20rpx; +} +.area-box image.selected-r{ + right: 20rpx; +} +.news{ + padding: 0 30rpx; + border-bottom: 5px solid #FBFBFB; + margin-top: 90rpx; +} +.news-box{ + padding: 30rpx 0; + border-bottom: 1px solid #EBEBEB; + display: flex; + flex-direction: column; +} +.news-box:first-child{ + padding-top: 0; +} +.news-title{ + color: #242424; + font-size: 30rpx; + font-weight: bold; +} +.news-info{ + color: #949494; + margin-top: 15rpx; + font-size: 24rpx; +} +.news-info text{ + margin-right: 20rpx; +} +.news-big-pic, .news-small-pic{ + margin-top: 10rpx; +} +.news-big-pic image{ + width: 100%; +} +.news-small-pic image{ + width: 100%; + height: 400rpx; +} +.transverse-news{ + flex-direction: row; + justify-content: space-between; +} +.news-row-img{ + width: 30%; + height: 150rpx; +} +.news-row-img image{ + width: 100%; + height: 100%; +} +.news-row-info{ + width: 68%; +} \ No newline at end of file diff --git a/pages/template/template.js b/pages/template/template.js new file mode 100644 index 0000000..c5b50f2 --- /dev/null +++ b/pages/template/template.js @@ -0,0 +1,100 @@ +// pages/template/template.js +const app = getApp(); +Page({ + + /** + * 页面的初始数据 + */ + data: { + url: '' + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + console.log(options) + if (options.link) { + options.link = decodeURIComponent(options.link) + app.dialog.loading('正在加载'); + var type = options.link.split('.') + if (type[type.length-1] == 'pdf') { + wx.downloadFile({ + url: options.link, + success: function (res) { + const filePath = res.tempFilePath + wx.openDocument({ + filePath: filePath, + fileType: 'pdf', + success: function (res) { + wx.stopPullDownRefresh(); + wx.hideLoading(); + } + }) + }, + fail: function (error) { + console.log(error) + } + }) + } else { + this.setData({ + url: options.link + }) + } + } else { + options.url = decodeURIComponent(options.url) + this.setData({ + url: 'https://www.wgink.ink/' + options.url + }) + } + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pages/template/template.json b/pages/template/template.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/template/template.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/template/template.wxml b/pages/template/template.wxml new file mode 100644 index 0000000..4839609 --- /dev/null +++ b/pages/template/template.wxml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/pages/template/template.wxss b/pages/template/template.wxss new file mode 100644 index 0000000..71de55a --- /dev/null +++ b/pages/template/template.wxss @@ -0,0 +1 @@ +/* pages/template/template.wxss */ \ No newline at end of file diff --git a/pages/train/train.js b/pages/train/train.js new file mode 100644 index 0000000..bfe316c --- /dev/null +++ b/pages/train/train.js @@ -0,0 +1,144 @@ +// pages/train/train.js +const app = getApp(); +Page({ + + /** + * 页面的初始数据 + */ + data: { + newsUrl: app.newsUrl, + typeList: [], + currentNewsDictionariesId: '', + currentPage: 1, + rows: 10, + directoriesParentId: 'd9d8c7ea-32e0-43ed-ad17-7c99a3c389b9', + trainList: [] + }, + getType: function () { + var self = this + app.restAjax.get(app.restAjax.path('{newsUrl}/app/newsdirectories/listnewsdirectoriesrelease', [app.newsUrl]), { + directoriesParentId: self.data.directoriesParentId + }, null, function (code, data) { + self.setData({ + typeList: data + }) + self.getList(1) + }) + }, + changeType: function (e) { + this.setData({ + currentNewsDictionariesId: e.currentTarget.dataset.newsDirectoriesId + }) + this.getList(1) + }, + doClearCurrentNewsDictionariesId: function() { + var self = this; + self.setData({ + currentNewsDictionariesId: '' + }); + this.getList(1) + }, + getList: function (page) { + var self = this + app.dialog.loading('正在加载'); + var info = { + newsDirectoriesParentId: self.data.directoriesParentId, + newsDirectoriesId: self.data.currentNewsDictionariesId ? self.data.currentNewsDictionariesId : '', + page: page, + rows: self.data.rows + } + app.restAjax.get(app.restAjax.path('{newsUrl}/app/newscontent/listpagenewscontentrelease', [app.newsUrl]), info, null, function (code, data) { + var newsArray; + for (var i = 0; i < data.rows.length; i++) { + data.rows[i].newsContentCoverList = data.rows[i].newsContentCoverList[0].contentCoverId + } + if(page <= 1) { + newsArray = data.rows; + } else { + newsArray = self.data.news.newsList; + newsArray = newsArray.concat(data.rows); + } + self.setData({ + currentPage: page, + trainList: newsArray + }) + if(data.rows.length == 0) { + app.dialog.msg('暂无数据'); + return; + } + }, function(code, data) { + app.dialog.msg(data.msg); + }, function() { + wx.stopPullDownRefresh(); + wx.hideLoading(); + }) + }, + goNewsDetail: function (e) { + var url = e.currentTarget.dataset.templateRecordUrl + var link = e.currentTarget.dataset.contentLink + if (link) { + wx.navigateTo({ + url: '../template/template?link=' + encodeURIComponent(link), + }) + } else { + wx.navigateTo({ + url: '../template/template?url=' + encodeURIComponent(url), + }) + } + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + this.getType() + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pages/train/train.json b/pages/train/train.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/train/train.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/train/train.wxml b/pages/train/train.wxml new file mode 100644 index 0000000..6761b90 --- /dev/null +++ b/pages/train/train.wxml @@ -0,0 +1,25 @@ + + + + + 全部 + + + + + {{item.directoriesName}} + + + + + + + {{item.newsContentTitle}} + + + + + {{item.newsContentPublishTime}} + + + \ No newline at end of file diff --git a/pages/train/train.wxss b/pages/train/train.wxss new file mode 100644 index 0000000..7912152 --- /dev/null +++ b/pages/train/train.wxss @@ -0,0 +1,141 @@ +.top-tab{ + position: fixed; + top: 0; + left: 0; + right: 0; + background: #fff; + overflow-x: auto; +} +.type{ + display: flex; +} +.tab-box{ + display: inline-flex; + justify-content: center; + align-items: center; + width: 30%; + position: relative; + height: 90rpx; + font-size: 30rpx; + color: #242424; + flex-shrink: 0; + padding: 0 10rpx; +} +.tab-box.active{ + color: #9F1512; +} +.tab-box image{ + position: absolute; + width: 15rpx; + height: 40rpx; + top: 50%; + margin-top: -20rpx; + display: none; +} +.tab-box.active image{ + display: block; +} +.tab-box image.selected-l{ + left: 10rpx; +} +.tab-box image.selected-r{ + right: 10rpx; +} +.area{ + overflow-x: auto; + white-space: nowrap; + position: fixed; + top: 90rpx; + left: 0; + right: 0; + border-bottom: 1px solid #DDD; + background: #fff; +} +.area-box{ + display: inline-flex; + width: 30%; + height: 90rpx; + /* line-height: 90rpx; + text-align: center; */ + align-items: center; + justify-content: center; + padding: 0 20px; + box-sizing: border-box; + position: relative; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + font-size: 30rpx; +} +.area-box.active{ + color: #9F1512; +} +.area-box image{ + position: absolute; + width: 15rpx; + height: 40rpx; + top: 50%; + margin-top: -20rpx; + display: none; +} +.area-box.active image{ + display: block; +} +.area-box image.selected-l{ + left: 20rpx; +} +.area-box image.selected-r{ + right: 20rpx; +} +.news{ + padding: 0 30rpx; + border-bottom: 5px solid #FBFBFB; + margin-top: 90rpx; +} +.news-box{ + padding: 30rpx 0; + border-bottom: 1px solid #EBEBEB; + display: flex; + flex-direction: column; +} +.news-box:first-child{ + padding-top: 0; +} +.news-title{ + color: #242424; + font-size: 30rpx; + font-weight: bold; +} +.news-info{ + color: #949494; + margin-top: 15rpx; + font-size: 24rpx; +} +.news-info text{ + margin-right: 20rpx; +} +.news-big-pic, .news-small-pic{ + margin-top: 10rpx; +} +.news-big-pic image{ + width: 100%; +} +.news-small-pic image{ + width: 100%; + height: 400rpx; +} +.transverse-news{ + flex-direction: row; + justify-content: space-between; +} +.news-row-img{ + width: 30%; + height: 150rpx; +} +.news-row-img image{ + width: 100%; + height: 100%; +} +.news-row-info{ + width: 68%; +} \ No newline at end of file diff --git a/pages/travel/travel.js b/pages/travel/travel.js new file mode 100644 index 0000000..d7a147b --- /dev/null +++ b/pages/travel/travel.js @@ -0,0 +1,118 @@ +// pages/travel/travel.js +const app = getApp(); +Page({ + + /** + * 页面的初始数据 + */ + data: { + newsUrl: app.newsUrl, + newsDirectoriesId: '51ae7beb-f277-47a4-937a-088e6d47656d', + currentPage: 1, + rows: 10, + travelList: [] + }, + getTravel: function (page) { + var self = this + app.dialog.loading('正在加载'); + var info = { + page: page, + rows: self.data.rows, + newsDirectoriesId: self.data.newsDirectoriesId + } + app.restAjax.get(app.restAjax.path('{newsUrl}/app/newscontent/listpagenewscontentrelease', [app.newsUrl]), info, null, function (code, data) { + var newsArray; + for (var i = 0; i < data.rows.length; i++) { + data.rows[i].newsContentCoverList = data.rows[i].newsContentCoverList[0].contentCoverId + } + if(page <= 1) { + newsArray = data.rows; + } else { + newsArray = self.data.travelList; + newsArray = newsArray.concat(data.rows); + } + console.log(newsArray) + self.setData({ + currentPage: page, + travelList: newsArray + }) + if(data.rows.length == 0) { + app.dialog.msg('暂无数据'); + return; + } + }, function(code, data) { + app.dialog.msg(data.msg); + }, function() { + wx.stopPullDownRefresh(); + wx.hideLoading(); + }) + }, + goNewsDetail: function (e) { + var url = e.currentTarget.dataset.templateRecordUrl + var link = e.currentTarget.dataset.contentLink + if (link) { + wx.navigateTo({ + url: '../template/template?link=' + encodeURIComponent(link), + }) + } else { + wx.navigateTo({ + url: '../template/template?url=' + encodeURIComponent(url), + }) + } + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + this.getTravel(1) + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pages/travel/travel.json b/pages/travel/travel.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/travel/travel.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/travel/travel.wxml b/pages/travel/travel.wxml new file mode 100644 index 0000000..f99efab --- /dev/null +++ b/pages/travel/travel.wxml @@ -0,0 +1,8 @@ + + + {{item.newsContentTitle}} + + + + + \ No newline at end of file diff --git a/pages/travel/travel.wxss b/pages/travel/travel.wxss new file mode 100644 index 0000000..2670b7d --- /dev/null +++ b/pages/travel/travel.wxss @@ -0,0 +1,52 @@ +.news{ + padding: 0 30rpx; + border-bottom: 5px solid #FBFBFB; + margin-top: 10rpx; +} +.news-box{ + padding: 30rpx 0; + border-bottom: 1px solid #EBEBEB; + display: flex; + flex-direction: column; +} +.news-box:first-child{ + padding-top: 0; +} +.news-title{ + color: #242424; + font-size: 30rpx; + font-weight: bold; +} +.news-info{ + color: #949494; + margin-top: 15rpx; + font-size: 24rpx; +} +.news-info text{ + margin-right: 20rpx; +} +.news-big-pic, .news-small-pic{ + margin-top: 10rpx; +} +.news-big-pic image{ + width: 100%; +} +.news-small-pic image{ + width: 100%; + height: 400rpx; +} +.transverse-news{ + flex-direction: row; + justify-content: space-between; +} +.news-row-img{ + width: 30%; + height: 150rpx; +} +.news-row-img image{ + width: 100%; + height: 100%; +} +.news-row-info{ + width: 68%; +} \ No newline at end of file diff --git a/webview/flv/index.html b/webview/flv/index.html index 1245e43..4f4fedf 100644 --- a/webview/flv/index.html +++ b/webview/flv/index.html @@ -11,7 +11,7 @@
- +