Commit 2388345c749e7448ba940e350fbacdee50edd9c2

Authored by iceling
1 parent 2de37968

助力首页的bug修改

pages/user/assistance/assistance.js
@@ -168,14 +168,15 @@ Page({ @@ -168,14 +168,15 @@ Page({
168 168
169 // 领取礼包 169 // 领取礼包
170 get_libao: function(e) { 170 get_libao: function(e) {
171 - var help_id = e.currentTarget.dataset.help_id; 171 + var help_id = e.currentTarget.dataset.help_id;//活动id
172 var taskId = e.currentTarget.dataset.taskid;//任务id 172 var taskId = e.currentTarget.dataset.taskid;//任务id
173 - getApp().goto("/pages/user/assistance/giftpacklist?help_id=" + help_id + "&is_libao=" + 1 + "&taskId=" + taskId); 173 + var id = e.currentTarget.dataset.id;//用于跳到礼包详情一键全部领取用的任务id
  174 + getApp().goto("/pages/user/assistance/giftpacklist?help_id=" + help_id + "&is_libao=" + 1 + "&taskId=" + taskId+"&id="+id);
174 }, 175 },
175 176
176 //查看礼包id 177 //查看礼包id
177 - select_libao: function() {  
178 - var orderSn = e.currentTarget.dataset.orderSn; //订单号 178 + select_libao: function(e) {
  179 + var orderSn = e.currentTarget.dataset.ordersn; //订单号
179 getApp().goto("/pages/user/assistance/giftpacklist?orderSn=" + orderSn); 180 getApp().goto("/pages/user/assistance/giftpacklist?orderSn=" + orderSn);
180 } 181 }
181 182
pages/user/assistance/assistance.wxml
@@ -51,7 +51,7 @@ @@ -51,7 +51,7 @@
51 51
52 <!-- 已完成的颜色nostate --> 52 <!-- 已完成的颜色nostate -->
53 <view class="flex-center width state" wx:if="{{item.status==1}}"> 53 <view class="flex-center width state" wx:if="{{item.status==1}}">
54 - <view class="ellipsis-1" bindtap="get_libao" data-help_id="{{item.helpFormId}}" data-taskId="{{item.helpTaskId}}">领取礼包</view> 54 + <view class="ellipsis-1" bindtap="get_libao" data-help_id="{{item.helpFormId}}" data-taskId="{{item.helpTaskId}}" data-id="{{item.id}}">领取礼包</view>
55 </view> 55 </view>
56 <view class="flex-center width state" wx:if="{{item.status==0}}"> 56 <view class="flex-center width state" wx:if="{{item.status==0}}">
57 <view class="ellipsis-1">{{item.zlHelpNum}}/{{item.helpNum}}</view> 57 <view class="ellipsis-1">{{item.zlHelpNum}}/{{item.helpNum}}</view>