diff --git a/pages/newsList/newsList.js b/pages/newsList/newsList.js index 77adf23..1e10070 100644 --- a/pages/newsList/newsList.js +++ b/pages/newsList/newsList.js @@ -15,22 +15,31 @@ Page({ }, doGetNewsList: function(page) { var self = this; + app.dialog.loading('正在加载'); app.restAjax.get(app.restAjax.path('{newsUrl}/app/newscontent/listpagenewscontentrelease', [self.data.news.newsUrl]), { page: page, rows: self.data.rows }, null, function(code, data) { - if(data.length == 0) { + if(data.rows.length == 0) { app.dialog.msg('暂无数据'); return; } + var newsArray; + if(page <= 1) { + newsArray = data.rows; + } else { + newsArray = self.data.news.newsList; + newsArray = newsArray.concat(data.rows); + } self.setData({ currentPage: page, - 'news.newsList': data.rows + 'news.newsList': newsArray }) }, function(code, data) { app.dialog.msg(data.msg); }, function() { wx.stopPullDownRefresh(); + wx.hideLoading(); }); }, /** diff --git a/utils/dialog.js b/utils/dialog.js index dda9142..ef95156 100644 --- a/utils/dialog.js +++ b/utils/dialog.js @@ -5,4 +5,11 @@ function msg(text) { duration: 1000 }) } -module.exports.msg = msg; \ No newline at end of file +function loading(msg) { + wx.showLoading({ + title: msg, + mask: true + }) +} +module.exports.msg = msg; +module.exports.loading = loading; \ No newline at end of file