Merge branch 'master' of http://120.79.193.119:9090/r/nsjcy/frontEnd/nsjcy

Mr Ke

2020-05-27 0ec802e93557b2b1422ddbd68aafa994fa68f455

 SunshineLnsMinApp/pages/zhgh/zhgh.js

@@ -7,7 +7,7 @@
   */
  data: {
    TabCur: 0,
    list: ['全部', '跟踪帮教', '合适成年人', '社会调查', '心理疏导'],
    list: ['全部', '跟踪帮教', '合适成年人', '社会调查', '心理疏导','法律援助'],
    infoList: [],
  },

@@ -42,7 +42,7 @@
            ...i,
            startTime: app.formatDate(startTime),
            endTime: app.formatDate(endTime),
            status:status==0?'未开始':status==1?'进行中':status==2?'已结束':status==3?'结束':status==99?'':'(未知)'
            status:status==0?'未开始':status==1?'进行中':status==2?'已结束':status==3?'结束':status==99?'暂停':'(未知)'
          }));
          that.setData({
            infoList: content