From 0ec802e93557b2b1422ddbd68aafa994fa68f455 Mon Sep 17 00:00:00 2001
From: Mr Ke <kelq@hugeinfo.com.cn>
Date: Wed, 27 May 2020 10:04:29 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/nsjcy/frontEnd/nsjcy
---
SunshineLnsMinApp/pages/zhghInfo/zhghInfo.js | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/SunshineLnsMinApp/pages/zhghInfo/zhghInfo.js b/SunshineLnsMinApp/pages/zhghInfo/zhghInfo.js
index 6205ef6..f703e13 100644
--- a/SunshineLnsMinApp/pages/zhghInfo/zhghInfo.js
+++ b/SunshineLnsMinApp/pages/zhghInfo/zhghInfo.js
@@ -11,7 +11,7 @@
del: app.globalData.imgUrl + '/image/del.svg',
evalList: {},
id: "",
- status: 4,
+ status: null,
disabled: false,
socialTaskObject: {}
},
@@ -52,10 +52,11 @@
createTime: app.formatDate(res.data.data.createTime),
startTime: app.formatDate(res.data.data.startTime),
endTime: app.formatDate(res.data.data.endTime),
- status: res.data.data.status == 0 ? '未开始' : res.data.data.status == 1 ? '进行中' : res.data.data.status == 2 ? '已结束' : res.data.data.status == 99 ? '结束' : '(未知)',
+ status: res.data.data.status == 0 ? '正常' : '暂停',
},
disabled: res.data.data.status == 2 ? true : false,
+ status: res.data.data.status,
id: res.data.data.id,
evalList,
taskReport: res.data.data.taskReport || '',
@@ -149,6 +150,17 @@
})
},
+ // 跳转
+ linkcFunction: function(event) {
+ var that = this;
+ var status = that.data.status;
+ var str = event.currentTarget.dataset['str'];
+ var id = event.currentTarget.dataset['id'];
+ wx.navigateTo({
+ url: '../' + str + '/' + str + '?id=' + id + '&status=' + status
+ })
+ },
+
// 提交
linkFunction: function() {
var that = this;
--
Gitblit v1.8.0