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/zhgh/zhgh.js |   63 +++++++++++++++++++++++--------
 1 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/SunshineLnsMinApp/pages/zhgh/zhgh.js b/SunshineLnsMinApp/pages/zhgh/zhgh.js
index dc3cb2e..c2eaa37 100644
--- a/SunshineLnsMinApp/pages/zhgh/zhgh.js
+++ b/SunshineLnsMinApp/pages/zhgh/zhgh.js
@@ -1,4 +1,5 @@
 // pages/zhgh/zhgh.js
+var app = getApp();
 Page({
 
   /**
@@ -6,27 +7,53 @@
    */
   data: {
     TabCur: 0,
-    list: ['合适成年人', '跟踪帮教', '社会调查', '疏导干预'],
-    infoList: [{
-      img: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1576749884261&di=4aea8bc541cc566e82c98bbab89c3a50&imgtype=0&src=http%3A%2F%2F5b0988e595225.cdn.sohucs.com%2Fimages%2F20180329%2Fd244aac01ed543d5a9ddbfdde6796e67.jpeg',
-      name: '农村老人关护',
-      status: '待完成'
-    }, {
-        img: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1576749926263&di=25f2103c52b624a5333b195cafa1feb4&imgtype=0&src=http%3A%2F%2Fphotocdn.sohu.com%2F20131023%2FImg388741073.jpg',
-      name: '老人院陪护聊天',
-      status: '已完成'
-    }, {
-        img: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1576749996179&di=3285ac9bfc16e70040ab17572ddc9adb&imgtype=0&src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_match%2F0%2F10906442862%2F0.jpg',
-      name: '广场卫生执勤辅助',
-      status: '已完成'
-    }, ]
+    list: ['全部', '跟踪帮教', '合适成年人', '社会调查', '心理疏导'],
+    infoList: [],
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function(options) {
+  onLoad: function (options) {
+    this.daTatoGet('')
+  },
 
+  daTatoGet: function (type) {
+    var that = this;
+    wx.showLoading();
+    wx.request({
+      url: app.globalData.url + '/api/social/myTask',
+      data: {
+        page: 1,
+        size: 1000,
+        userId: wx.getStorageSync('id'),
+        taskType: type,
+      },
+      success: function (res) {
+        wx.hideLoading();
+        console.log('res', res);
+        if (res.data.code == 0) {
+          let content = res.data.data.content.map(({
+            startTime,
+            endTime,
+            status,
+            ...i
+          }) => ({
+            ...i,
+            startTime: app.formatDate(startTime),
+            endTime: app.formatDate(endTime),
+            status:status==0?'未开始':status==1?'进行中':status==2?'已结束':status==3?'结束':status==99?'':'(未知)'
+          }));
+          that.setData({
+            infoList: content
+          })
+        } else {
+          wx.showToast({
+            title: res.data.msg,
+          })
+        }
+      }
+    })
   },
 
 
@@ -35,13 +62,15 @@
       TabCur: e.currentTarget.dataset.id,
       scrollLeft: (e.currentTarget.dataset.id - 1) * 60
     })
+    this.daTatoGet(e.currentTarget.dataset.id)
   },
 
   // 跳转
-  linkFunction: function(event) {
+  linkFunction: function (event) {
     var str = event.currentTarget.dataset['str'];
+    var id = event.currentTarget.dataset['id'];
     wx.navigateTo({
-      url: '../' + str + '/' + str
+      url: '../' + str + '/' + str + '?id=' + id
     })
   }
 })
\ No newline at end of file

--
Gitblit v1.8.0