diff --git a/pages/user/assistance/assistance.js b/pages/user/assistance/assistance.js
index fb12862..c19b322 100644
--- a/pages/user/assistance/assistance.js
+++ b/pages/user/assistance/assistance.js
@@ -131,8 +131,7 @@ Page({
})
}
} else {
- console.log("是什么鬼",res.data.msg);
- getApp().my_warnning(res.data.msg,0,th);
+ getApp().my_warnning(res.data.msg, 0, th);
th.setData({
is_show_more: 1,
page: page
@@ -170,12 +169,13 @@ Page({
// 领取礼包
get_libao: function(e) {
var libao_id = e.currentTarget.dataset.libaoid;
- getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + libao_id + "&is_libao=" + 1);
+ var taskId = e.currentTarget.dataset.taskid;//任务id
+ getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + libao_id + "&is_libao=" + 1 + "&taskId=" + taskId);
},
//查看礼包id
select_libao: function() {
- var orderSn = e.currentTarget.dataset.orderSn;//订单号
+ var orderSn = e.currentTarget.dataset.orderSn; //订单号
getApp().goto("/pages/user/assistance/giftpacklist?orderSn=" + orderSn);
}
diff --git a/pages/user/assistance/assistance.wxml b/pages/user/assistance/assistance.wxml
index cfb00d9..54b3391 100644
--- a/pages/user/assistance/assistance.wxml
+++ b/pages/user/assistance/assistance.wxml
@@ -14,7 +14,7 @@
-
+
活动时间:{{filter_s.format_time(zl_act.beginDate,0)}} 至 {{filter_s.format_time(zl_act.endDate,0)}}
@@ -51,7 +51,7 @@
- 领取礼包
+ 领取礼包
{{item.zlHelpNum}}/{{item.helpNum}}
@@ -78,8 +78,8 @@
暂无任务记录
-
- 已有 {{s_num}}人领取了任务
+
+ 已有{{s_num}}人领取了任务
diff --git a/pages/user/assistance/assistance.wxss b/pages/user/assistance/assistance.wxss
index 18d173b..7fe3e0e 100644
--- a/pages/user/assistance/assistance.wxss
+++ b/pages/user/assistance/assistance.wxss
@@ -116,6 +116,8 @@ page {
.item {
margin-bottom: 35rpx;
+ display: flex;
+ align-items: baseline;
}
.state {