diff --git a/pages/user/assistance/assistance.js b/pages/user/assistance/assistance.js
index 6f22649..4900b35 100644
--- a/pages/user/assistance/assistance.js
+++ b/pages/user/assistance/assistance.js
@@ -168,14 +168,15 @@ Page({
 
   // 领取礼包
   get_libao: function(e) {
-    var help_id = e.currentTarget.dataset.help_id;
+    var help_id = e.currentTarget.dataset.help_id;//活动id
     var taskId = e.currentTarget.dataset.taskid;//任务id
-    getApp().goto("/pages/user/assistance/giftpacklist?help_id=" + help_id + "&is_libao=" + 1 + "&taskId=" + taskId);
+    var id = e.currentTarget.dataset.id;//用于跳到礼包详情一键全部领取用的任务id
+    getApp().goto("/pages/user/assistance/giftpacklist?help_id=" + help_id + "&is_libao=" + 1 + "&taskId=" + taskId+"&id="+id);
   },
 
   //查看礼包id
-  select_libao: function() {
-    var orderSn = e.currentTarget.dataset.orderSn; //订单号
+  select_libao: function(e) {
+    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 857a981..5db3f19 100644
--- a/pages/user/assistance/assistance.wxml
+++ b/pages/user/assistance/assistance.wxml
@@ -51,7 +51,7 @@
 
               <!-- 已完成的颜色nostate -->
               <view class="flex-center width state" wx:if="{{item.status==1}}">
-                <view class="ellipsis-1" bindtap="get_libao" data-help_id="{{item.helpFormId}}" data-taskId="{{item.helpTaskId}}">领取礼包</view>
+                <view class="ellipsis-1" bindtap="get_libao" data-help_id="{{item.helpFormId}}" data-taskId="{{item.helpTaskId}}" data-id="{{item.id}}">领取礼包</view>
               </view>
               <view class="flex-center width state" wx:if="{{item.status==0}}">
                 <view class="ellipsis-1">{{item.zlHelpNum}}/{{item.helpNum}}</view>