Commit 2932b490b90861b87a91a1a5d88b4513026091c1
1 parent
0225c18b
助力优化
Showing
2 changed files
with
7 additions
and
8 deletions
pages/user/assistance/task_assistance.js
... | ... | @@ -9,7 +9,6 @@ var e = getApp(), |
9 | 9 | app_d = e.globalData; |
10 | 10 | var regeneratorRuntime = require('../../../utils/runtime.js'); |
11 | 11 | Page({ |
12 | - | |
13 | 12 | /** |
14 | 13 | * 页面的初始数据 |
15 | 14 | */ |
... | ... | @@ -273,7 +272,8 @@ Page({ |
273 | 272 | // 领取礼包 |
274 | 273 | get_libao: function(e) { |
275 | 274 | var libao_id = e.currentTarget.dataset.libaoid; //礼包id |
276 | - getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + libao_id + "&is_libao=" + 1); | |
275 | + var taskid= e.currentTarget.dataset.taskid; | |
276 | + getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + libao_id + "&is_libao=" + 1 +"&taskId="+taskid); | |
277 | 277 | }, |
278 | 278 | //查看礼包id |
279 | 279 | select_libao: function(e) { |
... | ... | @@ -898,12 +898,11 @@ Page({ |
898 | 898 | } |
899 | 899 | func(); |
900 | 900 | }, |
901 | -//立即兑换修改 | |
901 | +//立即兑换 | |
902 | 902 | redeem_now: function (e) { |
903 | - | |
904 | 903 | var libao_id = e.currentTarget.dataset.libaoid; |
905 | - console.log("立即兑换的礼包id", libao_id); | |
906 | - getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + libao_id + "&is_libao=" + 1); | |
904 | + var taskid = e.currentTarget.dataset.taskid; | |
905 | + getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + libao_id + "&is_libao=" + 1 + "&taskId=" + taskid); | |
907 | 906 | }, |
908 | 907 | |
909 | 908 | ... | ... |
pages/user/assistance/task_assistance.wxml
... | ... | @@ -52,7 +52,7 @@ |
52 | 52 | <view wx:if="{{is_user_task!=null&&is_user_task.status==0}}" class="task_clike fs40 t-c flex-center" bindtap="save_share"> |
53 | 53 | 好友拆一拆 |
54 | 54 | </view> |
55 | - <view wx:if="{{is_user_task!=null&&is_user_task.status==1}}" class="task_clike fs40 t-c flex-center" data-libaoid="{{is_user_task.helpListGiftBagId}}" bindtap="redeem_now"> | |
55 | + <view wx:if="{{is_user_task!=null&&is_user_task.status==1}}" class="task_clike fs40 t-c flex-center" data-libaoid="{{is_user_task.helpListGiftBagId}}"data-taskid="{{is_user_task.id}}" bindtap="redeem_now"> | |
56 | 56 | 立即兑换 |
57 | 57 | </view> |
58 | 58 | <view wx:if="{{is_user_task!=null&&is_user_task.status==0}}" class="task_clike fs40 t-c flex-center"data-taskid="{{is_user_task.id}}" bindtap="test"> |
... | ... | @@ -90,7 +90,7 @@ |
90 | 90 | <view class="ellipsis-1"> |
91 | 91 | <text wx:if="{{item.status==0}}">{{item.zlHelpNum}}/{{item.helpNum}}</text> |
92 | 92 | <text wx:if="{{item.status==2}}" bindtap="select_libao" data-orderSn="{{item.orderSn}}">查看礼包</text> |
93 | - <text wx:if="{{item.status==1}}" bindtap="get_libao" data-libaoid="{{item.helpListGiftBagId}}">领取礼包 </text> | |
93 | + <text wx:if="{{item.status==1}}" bindtap="get_libao" data-libaoid="{{item.helpListGiftBagId}}"data-taskid="{{item.id}}">领取礼包 </text> | |
94 | 94 | </view> |
95 | 95 | </view> |
96 | 96 | </view> | ... | ... |