Commit 79e7955e9642384948f4a6808ecf2a03925e7d77
1 parent
09f0f7ac
助力的跳转问题已经修复
Showing
4 changed files
with
50 additions
and
12 deletions
pages/user/assistance/assistance.js
@@ -182,6 +182,13 @@ Page({ | @@ -182,6 +182,13 @@ Page({ | ||
182 | select_libao: function(e) { | 182 | select_libao: function(e) { |
183 | var orderSn = e.currentTarget.dataset.ordersn; //订单号 | 183 | var orderSn = e.currentTarget.dataset.ordersn; //订单号 |
184 | getApp().goto("/pages/user/assistance/giftpacklist?orderSn=" + orderSn); | 184 | getApp().goto("/pages/user/assistance/giftpacklist?orderSn=" + orderSn); |
185 | + }, | ||
186 | + | ||
187 | + //---查看任务--- | ||
188 | + go_to_task:function (e) { | ||
189 | + var help_id = this.data.help_id; | ||
190 | + var taskid=e.currentTarget.dataset.taskid; | ||
191 | + getApp().goto("/pages/user/assistance/task_assistance?help_id=" + help_id+"&taskid="+taskid); | ||
185 | } | 192 | } |
186 | 193 | ||
187 | }) | 194 | }) |
pages/user/assistance/assistance.wxml
@@ -53,7 +53,7 @@ | @@ -53,7 +53,7 @@ | ||
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}}" data-id="{{item.id}}">领取礼包</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}}" data-taskId="{{item.helpTaskId}}" bindtap="go_to_task"> |
57 | <view class="ellipsis-1">{{item.zlHelpNum}}/{{item.helpNum}}</view> | 57 | <view class="ellipsis-1">{{item.zlHelpNum}}/{{item.helpNum}}</view> |
58 | </view> | 58 | </view> |
59 | <view class="flex-center width state" wx:if="{{item.status==2}}"> | 59 | <view class="flex-center width state" wx:if="{{item.status==2}}"> |
@@ -107,4 +107,4 @@ | @@ -107,4 +107,4 @@ | ||
107 | <!-- 引入提示组件 --> | 107 | <!-- 引入提示组件 --> |
108 | <warn id="warn"></warn> | 108 | <warn id="warn"></warn> |
109 | <!-- 制作一个圆球导航 --> | 109 | <!-- 制作一个圆球导航 --> |
110 | -<nav_b id="nav_b"></nav_b> | ||
111 | \ No newline at end of file | 110 | \ No newline at end of file |
111 | +<nav_b id="nav_b"></nav_b> |
pages/user/assistance/task_assistance.js
@@ -82,6 +82,10 @@ Page({ | @@ -82,6 +82,10 @@ Page({ | ||
82 | gid: options.gid | 82 | gid: options.gid |
83 | }) | 83 | }) |
84 | } | 84 | } |
85 | + if (options.taskid != undefined) { | ||
86 | + th.setData({taskid:options.taskid}) | ||
87 | + } | ||
88 | + | ||
85 | th.close(); | 89 | th.close(); |
86 | th.syinfo(); | 90 | th.syinfo(); |
87 | th.imageinfo(); | 91 | th.imageinfo(); |
@@ -181,7 +185,6 @@ Page({ | @@ -181,7 +185,6 @@ Page({ | ||
181 | var nt = ut.gettimestamp(); | 185 | var nt = ut.gettimestamp(); |
182 | 186 | ||
183 | data_aissa.forEach(function (val, ind) { | 187 | data_aissa.forEach(function (val, ind) { |
184 | - | ||
185 | //已开始 | 188 | //已开始 |
186 | if (val.start_time < nt && val.end_time > nt) data_aissa[ind].status = 0; | 189 | if (val.start_time < nt && val.end_time > nt) data_aissa[ind].status = 0; |
187 | //未开始 | 190 | //未开始 |
@@ -191,14 +194,21 @@ Page({ | @@ -191,14 +194,21 @@ Page({ | ||
191 | }); | 194 | }); |
192 | var task_number = data_aissa[0].giftQty - data_aissa[0].useGiftQty; | 195 | var task_number = data_aissa[0].giftQty - data_aissa[0].useGiftQty; |
193 | var taskid = data_aissa[0].id; | 196 | var taskid = data_aissa[0].id; |
194 | - th.setData({ | ||
195 | - aitem: data_aissa, | ||
196 | - task_number: task_number, | ||
197 | - taskid: taskid | ||
198 | - }); | ||
199 | - //判断是不是领取的任务 | ||
200 | - th.get_user_task(); | ||
201 | - | 197 | + if(th.data.taskid) { |
198 | + th.setData({ | ||
199 | + aitem: data_aissa, | ||
200 | + task_number: task_number, | ||
201 | + }); | ||
202 | + th.go_to_task(th.data.taskid); | ||
203 | + }else{ | ||
204 | + th.setData({ | ||
205 | + aitem: data_aissa, | ||
206 | + task_number: task_number, | ||
207 | + taskid: taskid | ||
208 | + }); | ||
209 | + //判断是不是领取的任务 | ||
210 | + th.get_user_task(); | ||
211 | + } | ||
202 | } | 212 | } |
203 | 213 | ||
204 | } | 214 | } |
@@ -1002,6 +1012,27 @@ Page({ | @@ -1002,6 +1012,27 @@ Page({ | ||
1002 | this.user_task_list(); | 1012 | this.user_task_list(); |
1003 | }, | 1013 | }, |
1004 | 1014 | ||
1015 | + go_task:function(e){ | ||
1016 | + var taskid=e.currentTarget.dataset.taskid; | ||
1017 | + this.go_to_task(taskid); | ||
1018 | + | ||
1019 | + }, | ||
1020 | + | ||
1021 | + go_to_task(task_id){ | ||
1022 | + var index = 0; | ||
1023 | + var aitem = this.data.aitem; | ||
1024 | + for(var i=0;i<aitem.length;i++){ | ||
1025 | + if(aitem[i].id==task_id){ | ||
1026 | + index=i;break; | ||
1027 | + } | ||
1028 | + } | ||
1029 | + this.setData({ | ||
1030 | + sw_index: index, | ||
1031 | + taskid: task_id, | ||
1032 | + is_dismantle: 0, | ||
1033 | + bc_page: 1, | ||
1034 | + }) | ||
1035 | + }, | ||
1005 | 1036 | ||
1006 | //--测试用-- | 1037 | //--测试用-- |
1007 | test:function(){ | 1038 | test:function(){ |
pages/user/assistance/task_assistance.wxml
@@ -88,7 +88,7 @@ | @@ -88,7 +88,7 @@ | ||
88 | </view> | 88 | </view> |
89 | <view class="flex-center width state"> | 89 | <view class="flex-center width state"> |
90 | <view class="ellipsis-1"> | 90 | <view class="ellipsis-1"> |
91 | - <text wx:if="{{item.status==0}}">{{item.zlHelpNum}}/{{item.helpNum}}</text> | 91 | + <text wx:if="{{item.status==0}}" bindtap="go_task" data-taskid="{{item.helpTaskId}}">{{item.zlHelpNum}}/{{item.helpNum}}</text> |
92 | <text wx:if="{{item.status==2}}" bindtap="select_libao" data-orderSn="{{item.orderSn}}">查看礼包</text> | 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}}"data-taskingid="{{item.id}}" data-taskid="{{item.helpTaskId}}">领取礼包 </text> | 93 | <text wx:if="{{item.status==1}}" bindtap="get_libao" data-libaoid="{{item.helpListGiftBagId}}"data-taskingid="{{item.id}}" data-taskid="{{item.helpTaskId}}">领取礼包 </text> |
94 | </view> | 94 | </view> |