diff --git a/pages/user/assistance/assistance.js b/pages/user/assistance/assistance.js
index bea0ea2..88dd11d 100644
--- a/pages/user/assistance/assistance.js
+++ b/pages/user/assistance/assistance.js
@@ -182,6 +182,13 @@ Page({
select_libao: function(e) {
var orderSn = e.currentTarget.dataset.ordersn; //订单号
getApp().goto("/pages/user/assistance/giftpacklist?orderSn=" + orderSn);
+ },
+
+ //---查看任务---
+ go_to_task:function (e) {
+ var help_id = this.data.help_id;
+ var taskid=e.currentTarget.dataset.taskid;
+ getApp().goto("/pages/user/assistance/task_assistance?help_id=" + help_id+"&taskid="+taskid);
}
})
diff --git a/pages/user/assistance/assistance.wxml b/pages/user/assistance/assistance.wxml
index 5db3f19..6a6c89b 100644
--- a/pages/user/assistance/assistance.wxml
+++ b/pages/user/assistance/assistance.wxml
@@ -53,7 +53,7 @@
领取礼包
-
+
{{item.zlHelpNum}}/{{item.helpNum}}
@@ -107,4 +107,4 @@
-
\ No newline at end of file
+
diff --git a/pages/user/assistance/task_assistance.js b/pages/user/assistance/task_assistance.js
index 5a58f7b..facf62f 100644
--- a/pages/user/assistance/task_assistance.js
+++ b/pages/user/assistance/task_assistance.js
@@ -82,6 +82,10 @@ Page({
gid: options.gid
})
}
+ if (options.taskid != undefined) {
+ th.setData({taskid:options.taskid})
+ }
+
th.close();
th.syinfo();
th.imageinfo();
@@ -181,7 +185,6 @@ Page({
var nt = ut.gettimestamp();
data_aissa.forEach(function (val, ind) {
-
//已开始
if (val.start_time < nt && val.end_time > nt) data_aissa[ind].status = 0;
//未开始
@@ -191,14 +194,21 @@ Page({
});
var task_number = data_aissa[0].giftQty - data_aissa[0].useGiftQty;
var taskid = data_aissa[0].id;
- th.setData({
- aitem: data_aissa,
- task_number: task_number,
- taskid: taskid
- });
- //判断是不是领取的任务
- th.get_user_task();
-
+ if(th.data.taskid) {
+ th.setData({
+ aitem: data_aissa,
+ task_number: task_number,
+ });
+ th.go_to_task(th.data.taskid);
+ }else{
+ th.setData({
+ aitem: data_aissa,
+ task_number: task_number,
+ taskid: taskid
+ });
+ //判断是不是领取的任务
+ th.get_user_task();
+ }
}
}
@@ -1002,6 +1012,27 @@ Page({
this.user_task_list();
},
+ go_task:function(e){
+ var taskid=e.currentTarget.dataset.taskid;
+ this.go_to_task(taskid);
+
+ },
+
+ go_to_task(task_id){
+ var index = 0;
+ var aitem = this.data.aitem;
+ for(var i=0;i
- {{item.zlHelpNum}}/{{item.helpNum}}
+ {{item.zlHelpNum}}/{{item.helpNum}}
查看礼包
领取礼包