From 5eb282a80f0c263ae0a8b1477eb3600ed4238cfe Mon Sep 17 00:00:00 2001
From: wenc000 <450292408@qq.com>
Date: Fri, 26 Jun 2020 12:45:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E9=97=BB=E5=88=97=E8=A1=A8=E5=92=8C?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9Edialog=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/newsList/newsList.js | 13 +++++++++++--
 utils/dialog.js            |  9 ++++++++-
 2 files changed, 19 insertions(+), 3 deletions(-)

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