diff --git a/app.json b/app.json
index e1f57e6..9df5009 100644
--- a/app.json
+++ b/app.json
@@ -1,7 +1,7 @@
{
"pages": [
- "pages/friendCircle/friendCircle",
"pages/index/index",
+ "pages/friendCircle/friendCircle",
"pages/venue/venue",
"pages/broadcastList/broadcastList",
"pages/orderDetail/orderDetail",
diff --git a/pages/cultureDetail/cultureDetail.js b/pages/cultureDetail/cultureDetail.js
index c9444ea..e32b2f2 100644
--- a/pages/cultureDetail/cultureDetail.js
+++ b/pages/cultureDetail/cultureDetail.js
@@ -1,20 +1,19 @@
// pages/cultureDetail/cultureDetail.js
+var app = getApp();
Page({
/**
* 页面的初始数据
*/
data: {
+ libraryUrl: app.libraryUrl,
swiper: {
- imgUrl: [
- '../../images/culture-slide.png',
- '../../images/culture-slide.png',
- '../../images/culture-slide.png'
- ],
+ imgUrl: [],
indicatorDots: false,
autoplay: true,
current: 0
- }
+ },
+ library: null
},
prevImg: function () {
var swiper = this.data.swiper;
@@ -33,11 +32,31 @@ Page({
swiper: swiper,
})
},
+ doGetLibrary: function(libraryId) {
+ var self = this;
+ app.dialog.loading('正在加载');
+ app.restAjax.get(app.restAjax.path('{libraryUrl}/app/intangiblelibrary/getintangiblelibrarybyidrelease/{libraryId}', [self.data.libraryUrl, libraryId]), {}, null, function(code, data) {
+ var covers = data.libraryCover.split(',');
+ var imageArray = [];
+ for(var i = 0, item; item = covers[i++];) {
+ imageArray.push(app.restAjax.path('{libraryUrl}/route/file/downloadfile/true/{cover}', [self.data.libraryUrl, item]));
+ }
+ self.setData({
+ library: data,
+ 'swiper.imgUrl': imageArray
+ })
+ }, function(code, data) {
+ app.dialog.msg(data.msg);
+ }, function() {
+ wx.stopPullDownRefresh();
+ wx.hideLoading();
+ })
+ },
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
-
+ this.doGetLibrary(options.libraryId);
},
/**
diff --git a/pages/cultureDetail/cultureDetail.wxml b/pages/cultureDetail/cultureDetail.wxml
index ceab619..8dae8cb 100644
--- a/pages/cultureDetail/cultureDetail.wxml
+++ b/pages/cultureDetail/cultureDetail.wxml
@@ -12,55 +12,55 @@
- 民间舞蹈
+ {{library.libraryTitle}}
项目编号：
- EKLAJNKAS09
+ {{library.libraryNumber}}
数据来源：
- EKLAJNKAS09
+ {{library.librarySource}}
公布时间：
- 2020-02-03
+ {{library.libraryOpenDateValue}}
非遗级别：
- 三级
+ {{library.libraryLevel}}级
所属地区：
- 西藏林芝市
+ {{library.libraryArea}}
类 型：
- 新增项目
+ {{library.libraryTypeValue}}
申报地区或单位：
- 测试
+ {{library.libraryAddress}}
保护单位：
- 测试
+ {{library.libraryAuthor}}
相关描述
- 光拉便半运县写员二到院细天县见运命运感知争公着解全得律号深共权发市以家情军少先意单理样好族权达保很具你住红许气已第白知题候其然知王公众我头务族观经市指或七比生。适基历然题和低是局着先重信知议过说心龙素标安放大支入完二种设力果每角解收美约声里历美节办约管运但然新分活们心毛手过共点家或。革解快和特技县应精术被心走小器风育相条际北些有品同自群素革拉林积张严求选马打书。力问业光者最论快决装争每保时造何历入越日劳经干好东此金区法思设断这层压很决给地确思引光各年与队太习面方加族社种斗表越划快。
+ {{library.librarySummary}}
@@ -68,11 +68,11 @@
编 号：
- EKLAJNKAS09
+ {{library.libraryNumber}}
姓 名：
- Ruby Pope
+ {{library.libraryAuthor}}
@@ -93,6 +93,3 @@
-
- 报名
-
diff --git a/pages/heritage/heritage.js b/pages/heritage/heritage.js
index 281ba87..5839247 100644
--- a/pages/heritage/heritage.js
+++ b/pages/heritage/heritage.js
@@ -1,22 +1,57 @@
// pages/heritage/heritage.js
+var app = getApp();
Page({
-
/**
* 页面的初始数据
*/
data: {
-
+ libraryUrl: app.libraryUrl,
+ libraryList: [],
+ currentPage: 1,
+ rows: 20
},
- goDetail: function () {
+ goDetail: function (event) {
wx.navigateTo({
- url: '../cultureDetail/cultureDetail',
+ url: '../cultureDetail/cultureDetail?libraryId='+ event.currentTarget.dataset.libraryId,
})
},
+ doGetLibraryList: function(page) {
+ var self = this;
+ app.dialog.loading('正在加载');
+ app.restAjax.get(app.restAjax.path('{libraryUrl}/app/intangiblelibrary/listpageintangiblelibraryrelease', [self.data.libraryUrl]), {
+ page: page,
+ rows: self.data.rows
+ }, null, function(code, data) {
+ if(data.rows.length == 0) {
+ app.dialog.msg('暂无数据');
+ return;
+ }
+ for(var i = 0, item; item = data.rows[i++];) {
+ item.libraryApplyTime = item.libraryApplyTime.substring(0, item.libraryApplyTime.length - 10);
+ }
+ var libraryArray;
+ if(page <= 1) {
+ libraryArray = data.rows;
+ } else {
+ libraryArray = self.data.news.newsList;
+ libraryArray = libraryArray.concat(data.rows);
+ }
+ self.setData({
+ currentPage: page,
+ libraryList: libraryArray
+ })
+ }, function(code, data) {
+ app.dialog.msg(data.msg);
+ }, function() {
+ wx.stopPullDownRefresh();
+ wx.hideLoading();
+ });
+ },
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
-
+ this.doGetLibraryList(1);
},
/**
@@ -51,14 +86,14 @@ Page({
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
-
+ this.doGetLibraryList(1);
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
-
+ this.doGetLibraryList(this.data.currentPage + 1);
},
/**
diff --git a/pages/heritage/heritage.json b/pages/heritage/heritage.json
index 8835af0..8275159 100644
--- a/pages/heritage/heritage.json
+++ b/pages/heritage/heritage.json
@@ -1,3 +1,6 @@
{
- "usingComponents": {}
+ "usingComponents": {},
+ "enablePullDownRefresh": true,
+ "backgroundTextStyle": "dark",
+ "onReachBottomDistance": 50
}
\ No newline at end of file
diff --git a/pages/heritage/heritage.wxml b/pages/heritage/heritage.wxml
index 3321cbd..624f1f7 100644
--- a/pages/heritage/heritage.wxml
+++ b/pages/heritage/heritage.wxml
@@ -1,49 +1,27 @@
- 非遗数据库
+ 非物质文化遗产数据库
- 非遗数据库
+ 文化直播
- 非遗数据库
+ 文化分享
-
+
-
+
- 银保监会印发《关于加快推进意外险改…
+ {{item.libraryTitle}}
- 2020-02-02 14:00:00至2020-02-03 14:00:00
-
-
-
-
-
-
-
-
- 银保监会印发《关于加快推进意外险改…
-
- 2020-02-02 14:00:00至2020-02-03 14:00:00
-
-
-
-
-
-
-
-
- 银保监会印发《关于加快推进意外险改…
-
- 2020-02-02 14:00:00至2020-02-03 14:00:00
+ {{item.libraryApplyTime}}
\ No newline at end of file
diff --git a/pages/index/index.js b/pages/index/index.js
index cb3b660..4c9248a 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -65,6 +65,9 @@ Page({
page: 1,
rows: 5
}, null, function(code, data) {
+ for(var i = 0, item; item = data.rows[i++];) {
+ item.cover = item.libraryCover.split(',')[0];
+ }
self.setData({
'library.bannerLibrary': data.rows
});
@@ -124,6 +127,11 @@ Page({
app.dialog.msg(data.msg);
});
},
+ goCultureDetail: function(event) {
+ wx.navigateTo({
+ url: '../cultureDetail/cultureDetail?libraryId='+ event.currentTarget.dataset.libraryId,
+ })
+ },
goNewsDetail: function (event) {
wx.navigateTo({
url: '../newsDetail/newsDetail?templateRecordUrl='+ event.currentTarget.dataset.templateRecordUrl,
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 763dda0..df5b0ff 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -1,7 +1,7 @@
-
-
+
+