diff --git a/images/tab6.png b/images/tab6.png new file mode 100644 index 0000000..22c3870 Binary files /dev/null and b/images/tab6.png differ diff --git a/images/tab7.png b/images/tab7.png new file mode 100644 index 0000000..4d22afd Binary files /dev/null and b/images/tab7.png differ diff --git a/pages/index/index.js b/pages/index/index.js index c7a82cf..8b63aa1 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -122,9 +122,9 @@ Page({ url: '../newsDetail/newsDetail?templateRecordUrl='+ event.currentTarget.dataset.templateRecordUrl, }) }, - goNewsList: function() { + goNewsList: function(event) { wx.navigateTo({ - url: '../newsList/newsList', + url: '../newsList/newsList?type='+ event.currentTarget.dataset.type, }) }, goVolunteer: function () { diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 5760780..f737008 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -6,13 +6,21 @@ + + + 展览展示 + + + + 文化动态 + 志愿者服务 - 精品活动 + 精彩活动 @@ -46,7 +54,7 @@ - + 文化动态 diff --git a/pages/newsList/newsList.js b/pages/newsList/newsList.js index 21566fc..fe2a4bf 100644 --- a/pages/newsList/newsList.js +++ b/pages/newsList/newsList.js @@ -84,6 +84,16 @@ Page({ */ onLoad: function (options) { var self = this; + console.log(options); + if(options.type == 1) { + self.setData({ + directoriesParentId: 'f497904b-7727-4832-891c-604c36ae4167' + }); + } else { + self.setData({ + directoriesParentId: 'f1d5d313-f728-4dda-9843-1116d97e17b0' + }); + } self.doGetNewsDictionariesList(); },