Merge branch 'dev' of http://116.63.33.55/git/nazw into dev

nnzwminiapp/pages/nnzzd/nnzzd.js

@@ -12,14 +12,30 @@ Page({
    */
   data: {
     dyrs:1000,
-    imgUrl:imgUrl
+    imgUrl:imgUrl,
+    eventDataList: []
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-    
+    request({
+        url: '/mini/page?page=1&limit=9999',
+        method: 'GET'
+    }).then(res => {
+        this.setData({
+            eventDataList: res.data
+        })
+    })
+    request({
+        url: '/mini/getSubscribeNumber',
+        method: 'GET'
+    }).then(res => {
+        this.setData({
+            dyrs: res.data
+        })
+    })
   },
 
   /**