From a2d1b9886b00b5f4d4722c3379d3bd4f2f94b421 Mon Sep 17 00:00:00 2001
From: LAPTOP-RI7D261L\Mr Ke <545800322@qq.com>
Date: Mon, 09 Mar 2020 17:02:35 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/nsjcy/frontEnd/nsjcy

---
 SunshineLnsMinApp/pages/zhwj/zhwj.js |   39 +++++++++++++++++++++++++++++++++++----
 1 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/SunshineLnsMinApp/pages/zhwj/zhwj.js b/SunshineLnsMinApp/pages/zhwj/zhwj.js
index e6889cc..e6c1907 100644
--- a/SunshineLnsMinApp/pages/zhwj/zhwj.js
+++ b/SunshineLnsMinApp/pages/zhwj/zhwj.js
@@ -6,7 +6,7 @@
    * 页面的初始数据
    */
   data: {
-    wjgk:'./../../images/wjgk.jpg',
+    wjgk: './../../images/wjgk.jpg',
     dongtai1_1: app.globalData.imgUrl + '/image/dongtai1-1.jpg',
     dongtai2_1: app.globalData.imgUrl + '/image/dongtai2-1.jpg',
     dongtai3_1: app.globalData.imgUrl + '/image/dongtai3-1.jpg',
@@ -61,17 +61,48 @@
       badge: 0,
       name: '版权'
     }],
+    dataSet: []
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function(options) {
-
+  onLoad: function (options) {
+    var that = this;
+    wx.showLoading();
+    wx.request({
+      url: app.globalData.url + '/api/article/publicMsgQuery',
+      data: {
+        page: 1,
+        size: 1000,
+        flag: '未检动态',
+      },
+      success: function (res) {
+        wx.hideLoading();
+        console.log('res', res);
+        if (res.data.code == 0) {
+          let content = res.data.data.result.content.map(({
+            createTime,
+            ...i
+          }) => ({
+            ...i,
+            createTime: app.formatDate(createTime),
+          }));
+          console.log(content)
+          that.setData({
+            dataSet: content
+          })
+        } else {
+          wx.showToast({
+            title: res.data.msg,
+          })
+        }
+      }
+    })
   },
 
   // 跳转
-  linkFunction: function(event) {
+  linkFunction: function (event) {
     var str = event.currentTarget.dataset['str'];
     var id = event.currentTarget.dataset['id'];
     wx.navigateTo({

--
Gitblit v1.8.0