Commit df08707d31149de42089dda9e371359fcd41929f
1 parent
a234c286
助力
Showing
6 changed files
with
68 additions
and
50 deletions
pages/user/assistance/assistance_success.json
pages/user/assistance/friend_assistance.js
pages/user/assistance/friend_assistance.json
pages/user/assistance/task_assistance.js
... | ... | @@ -32,6 +32,10 @@ Page({ |
32 | 32 | dismantle: null, //帮拆记录数据集 |
33 | 33 | is_user_task: null, //判断是不是领取的任务 |
34 | 34 | zzjx_id: "", //真正进行的任务id |
35 | + is_show:0,//任务的加载更多 | |
36 | + is_bc_show:0,//帮拆的加载更多 | |
37 | + bc_page:1,//帮拆的页码 | |
38 | + rw_page:1,//任务的页码 | |
35 | 39 | //*********************************************start钱 |
36 | 40 | canvasHidden: 0, //分享图片是否已经生成 |
37 | 41 | is_share: 0, //是否显示画布 |
... | ... | @@ -77,7 +81,6 @@ Page({ |
77 | 81 | add_onlicke: function(e) { |
78 | 82 | var th = this; |
79 | 83 | var taskid = e.target.dataset.taskid; |
80 | - console.log("任务id5555555", taskid); | |
81 | 84 | var help_id = th.data.help_id; |
82 | 85 | var user_id = getApp().globalData.user_id; |
83 | 86 | var stoid = os.stoid |
... | ... | @@ -88,10 +91,12 @@ Page({ |
88 | 91 | taskId: taskid |
89 | 92 | }, |
90 | 93 | function(res) { |
91 | - | |
92 | 94 | if (res.data.code == 0) { |
93 | - console.log(res.data.data); | |
94 | 95 | getApp().my_warnning(res.data.data, 1, th); |
96 | + //判断是不是领取的任务 | |
97 | + th.get_user_task(); | |
98 | + //会员任务列表 | |
99 | + th.user_task_list(); | |
95 | 100 | } else { |
96 | 101 | getApp().my_warnning(res.data.msg, 0, th); |
97 | 102 | } |
... | ... | @@ -127,17 +132,18 @@ Page({ |
127 | 132 | }, |
128 | 133 | success: function(res) { |
129 | 134 | if (res.data.code == 0) { |
130 | - | |
131 | 135 | var help_data = res.data.data; |
132 | - console.log('助力活动(判断)', res.data.data); | |
133 | 136 | th.setData({ |
134 | 137 | endDate: help_data.endDate, |
135 | 138 | }); |
136 | 139 | |
137 | 140 | //任务时间 设置全局定时器 |
138 | - th.data.timer = setInterval(function() { | |
139 | - th.countDown(); | |
140 | - }, 1000); | |
141 | + th.setData({ | |
142 | + timer:setInterval(function () { | |
143 | + th.countDown(); | |
144 | + }, 1000) | |
145 | + }) | |
146 | + | |
141 | 147 | |
142 | 148 | } |
143 | 149 | } |
... | ... | @@ -194,7 +200,7 @@ Page({ |
194 | 200 | |
195 | 201 | //会员任务列表 |
196 | 202 | this.user_task_list(); |
197 | - // 获取会员的参与的任务列表 我的任务 | |
203 | + //获取助力活动参与的人数 | |
198 | 204 | this.get_user_task_num(); |
199 | 205 | |
200 | 206 | }, |
... | ... | @@ -210,7 +216,6 @@ Page({ |
210 | 216 | var sw_index = this.data.sw_index; //轮播的下标 |
211 | 217 | //任务id |
212 | 218 | var taskid = aitem[sw_index].id; |
213 | - console.log("任务id", taskid); | |
214 | 219 | var th = this; |
215 | 220 | var index = 1; //获取当前选择的是任务还是活动说明 |
216 | 221 | var is_task = this.data.is_task; //0任务,1帮拆 |
... | ... | @@ -221,24 +226,31 @@ Page({ |
221 | 226 | if (switch_head == undefined || switch_head == null) { |
222 | 227 | switch_head = 1; |
223 | 228 | } |
224 | - | |
225 | - console.log("0任务,1帮拆", is_task, ); | |
226 | 229 | this.setData({ |
227 | 230 | is_task: 1, |
228 | 231 | switch_head: 1 |
229 | 232 | }); |
233 | + var bc_page = th.data.bc_page; | |
230 | 234 | rq.get("/api/weshop/marketing/help/help/task/involve/page", { |
231 | 235 | data: { |
236 | + page: bc_page, | |
237 | + pageSize: 5, | |
232 | 238 | taskId: taskid, |
233 | 239 | userId: getApp().globalData.user_id, |
234 | 240 | storeId: os.stoid |
235 | 241 | }, |
236 | 242 | success: function(res) { |
237 | - | |
238 | 243 | if (res.data.code == 0) { |
239 | 244 | var dismantle = res.data.data.pageData[0].zlHelpUser; |
240 | - console.log(dismantle.toString, "帮拆记录", dismantle[0].nickName); | |
241 | - | |
245 | + if(res.data.data.total>5){ | |
246 | + var bc_page = th.data.bc_page + 1; | |
247 | + th.data({ bc_page: bc_page, | |
248 | + is_bc_show:1 | |
249 | + }) | |
250 | + }else{ | |
251 | + getApp().showWarning("暂无更多内容", 0); | |
252 | + } | |
253 | + | |
242 | 254 | th.setData({ |
243 | 255 | dismantle: dismantle |
244 | 256 | }); |
... | ... | @@ -292,13 +304,11 @@ Page({ |
292 | 304 | var th = this; |
293 | 305 | var nav_b = th.selectComponent("#nav_b"); //组件的id |
294 | 306 | nav_b.close_box(); |
295 | - nav_b.set_name("助力", ""); | |
307 | + nav_b.set_name("助力", "/pages/user/assistance/assistance"); | |
296 | 308 | }, |
297 | 309 | // 获取会员的参与的任务列表 我的任务 |
298 | 310 | user_task_list: function(e) { |
299 | - | |
300 | 311 | var th = this; |
301 | - | |
302 | 312 | var index = 0; |
303 | 313 | var is_task = this.data.is_task; //0任务,1帮拆 |
304 | 314 | if (is_task == undefined || is_task == null) { |
... | ... | @@ -314,24 +324,34 @@ Page({ |
314 | 324 | }); |
315 | 325 | var help_id = th.data.help_id; |
316 | 326 | var user_id = getApp().globalData.user_id; |
327 | + var rw_page=th.data.rw_page; | |
317 | 328 | rq.get("/api/weshop/marketing/help/help/user/page", { |
318 | 329 | data: { |
330 | + page:rw_page, | |
331 | + pageSize:5, | |
319 | 332 | helpId: help_id, |
320 | 333 | storeId: os.stoid, |
321 | 334 | userId: user_id |
322 | 335 | }, |
323 | 336 | success: function(su) { |
324 | - | |
325 | 337 | if (su.data.code == 0) { |
338 | + if (su.data.data.total > 5){ | |
339 | + th.setData({ | |
340 | + rw_page: rw_page, | |
341 | + is_show: 1 | |
342 | + }) | |
343 | + getApp().showWarning("暂无更多内容", 0); | |
344 | + }else{ | |
345 | + var rw_page = th.data.rw_page + 1; | |
346 | + th.setData({ | |
347 | + rw_page: rw_page, | |
348 | + | |
349 | + }) | |
350 | + } | |
326 | 351 | var user_list = su.data.data.pageData; |
327 | - console.log("会员列表", user_list); | |
328 | 352 | th.setData({ |
329 | 353 | user_task_list: user_list |
330 | 354 | }); |
331 | - } else { | |
332 | - th.setData({ | |
333 | - user_task_list: null | |
334 | - }); | |
335 | 355 | } |
336 | 356 | } |
337 | 357 | }) |
... | ... | @@ -342,9 +362,7 @@ Page({ |
342 | 362 | var th = this; |
343 | 363 | var aitem = th.data.aitem; |
344 | 364 | var sw_index = th.data.sw_index; |
345 | - console.log(sw_index, "判断是否有领取任务", aitem); | |
346 | 365 | var taskid = aitem[sw_index].id |
347 | - console.log("判断是否有领取任务 任务的id", taskid); | |
348 | 366 | rq.get("/api/weshop/marketing/help/help/task/get", { |
349 | 367 | data: { |
350 | 368 | storeId: os.stoid, |
... | ... | @@ -354,7 +372,6 @@ Page({ |
354 | 372 | success: function(res) { |
355 | 373 | if (res.data.code == 0) { |
356 | 374 | var is_usertask = res.data.data; |
357 | - console.log('判断是不是领取的任务', is_usertask); | |
358 | 375 | th.setData({ |
359 | 376 | is_user_task: is_usertask |
360 | 377 | }); |
... | ... | @@ -424,7 +441,6 @@ Page({ |
424 | 441 | var aitem = this.data.aitem; |
425 | 442 | var task_number = aitem[index].giftQty - aitem[index].useGiftQty; |
426 | 443 | var task_id = aitem[index].id; |
427 | - console.log("轮播图点击左边"); | |
428 | 444 | this.setData({ |
429 | 445 | sw_index: index, |
430 | 446 | task_number: task_number, |
... | ... | @@ -446,7 +462,6 @@ Page({ |
446 | 462 | var aitem = this.data.aitem; |
447 | 463 | var task_number = aitem[index].giftQty - aitem[index].useGiftQty; |
448 | 464 | var task_id = aitem[index].id; |
449 | - console.log("轮播图点击右边"); | |
450 | 465 | this.setData({ |
451 | 466 | sw_index: index, |
452 | 467 | task_number: task_number, |
... | ... | @@ -462,8 +477,7 @@ Page({ |
462 | 477 | */ |
463 | 478 | onHide: function() { |
464 | 479 | //--清理定时器-- |
465 | - console.log("清理定时器"); | |
466 | - clearInterval(this.timer); | |
480 | + clearInterval(this.data.timer); | |
467 | 481 | }, |
468 | 482 | |
469 | 483 | /** |
... | ... | @@ -489,14 +503,13 @@ Page({ |
489 | 503 | // 对结束时间进行处理渲染到页面 |
490 | 504 | |
491 | 505 | // var o = endTimeList[i]; |
492 | - var endTime = th.data.endDate | |
493 | - | |
506 | + var endTime = th.data.endDate; | |
507 | + console.log("结束时间5555555", endTime); | |
494 | 508 | // if (o.status == 0) endTime = o.start_time |
495 | 509 | |
496 | 510 | var obj = null; |
497 | 511 | // 如果活动未结束,对时间进行处理 |
498 | 512 | if (endTime - newTime > 0) { |
499 | - | |
500 | 513 | var time = (endTime - newTime); |
501 | 514 | // 获取天、时、分、秒 |
502 | 515 | var day = parseInt(time / (60 * 60 * 24)); |
... | ... | @@ -518,15 +531,10 @@ Page({ |
518 | 531 | sec: '00' |
519 | 532 | } |
520 | 533 | } |
521 | - | |
534 | + var txt = "aitem[" +0+ "].djs"; | |
522 | 535 | th.setData({ |
523 | - djs: obj | |
536 | + [txt]: obj | |
524 | 537 | }); |
525 | - | |
526 | - | |
527 | - | |
528 | - | |
529 | - | |
530 | 538 | }, |
531 | 539 | //---小于10的格式化函数---- |
532 | 540 | timeFormat(param) { |
... | ... | @@ -1032,7 +1040,8 @@ Page({ |
1032 | 1040 | //礼包的详情 轮播图 |
1033 | 1041 | libao_details: function(e) { |
1034 | 1042 | var giftbagid = e.currentTarget.dataset.giftbagid; |
1035 | - getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + giftbagid + "&is_libao=" + 0); | |
1043 | + var help_id = this.data.help_id; | |
1044 | + getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + giftbagid + "&is_libao=" + 0+"help_id"); | |
1036 | 1045 | }, |
1037 | 1046 | //正在进行任务 |
1038 | 1047 | test: function(e) { | ... | ... |
pages/user/assistance/task_assistance.json
pages/user/assistance/task_assistance.wxml
1 | -<wxs module="filter" src="../../../utils/filter.wxs"></wxs> | |
1 | + <wxs module="filter" src="../../../utils/filter.wxs"></wxs> | |
2 | 2 | <view class="top-back" style="background-image: url({{iurl}}/miniapp/images/friendhelp/lumi.png)"> |
3 | 3 | <!-- 助力活动头部 --> |
4 | 4 | <view class="top-frame"> |
... | ... | @@ -44,9 +44,9 @@ |
44 | 44 | <view wx:if="{{is_user_task!=null}}" class="task_clike fs40 t-c flex-center" bindtap="save_share"> |
45 | 45 | 好友拆一拆 |
46 | 46 | </view> |
47 | - <view wx:if="{{is_user_task!=null}}" class="task_clike fs40 t-c flex-center"data-taskid="{{is_user_task.id}}" bindtap="test"> | |
47 | + <!-- <view wx:if="{{is_user_task!=null}}" class="task_clike fs40 t-c flex-center"data-taskid="{{is_user_task.id}}" bindtap="test"> | |
48 | 48 | 测试专用 |
49 | - </view> | |
49 | + </view> --> | |
50 | 50 | |
51 | 51 | </view> |
52 | 52 | <!-- 底部列表 --> |
... | ... | @@ -108,8 +108,13 @@ |
108 | 108 | <view class="ellipsis-1">{{filter.format_time(item.zltime)}} |
109 | 109 | </view> |
110 | 110 | </view> |
111 | - | |
112 | 111 | </view> |
112 | + | |
113 | + <view class="flex-center fs32" wx:if="{{is_bc_show==1}}"> | |
114 | + <view class="line"></view> | |
115 | + <view class="load white" bindtap="dismantle_record">点击加载更多</view> | |
116 | + <view class="line"></view> | |
117 | + </view> | |
113 | 118 | </block> |
114 | 119 | |
115 | 120 | <view class="fs30" wx:if="{{dismantle==null|| dismantle==''}}"> |
... | ... | @@ -124,9 +129,9 @@ |
124 | 129 | </view> |
125 | 130 | <!-- 加载更多 --> |
126 | 131 | <view class="fs32"> |
127 | - <view class="flex-center" wx:if="{{user_task_list}}"> | |
132 | + <view class="flex-center" wx:if="{{is_show==1}}"> | |
128 | 133 | <view class="line"></view> |
129 | - <view class="load white" bindtap="">点击加载更多</view> | |
134 | + <view class="load white" bindtap="user_task_list">点击加载更多</view> | |
130 | 135 | <view class="line"></view> |
131 | 136 | </view> |
132 | 137 | <view class="flex-center white" style="margin-top: 20rpx;"> | ... | ... |