wxd / MShopWeApp

Commit 0225c18b2b5f569567248f9dec00c4fcac830356

Authored by iceling
2 parents 81bb33f0 fda66ba3

Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

Inline Side-by-side
Showing 1 changed file with 24 additions and 8 deletions
pages/user/assistance/task_assistance.js
  View file @0225c18
... ... @@ -213,6 +213,10 @@ Page({
213 213  
214 214 //帮拆记录的
215 215 dismantle_record: function(e) {
  216 + //优化444444444444444444
  217 + if (this.data.switch_head == 1) {
  218 + return false;
  219 + }
216 220 var aitem = this.data.aitem; //任务的数据集
217 221 var sw_index = this.data.sw_index; //轮播的下标
218 222 //任务id
... ... @@ -229,7 +233,8 @@ Page({
229 233 }
230 234 this.setData({
231 235 is_task: 1,
232   - switch_head: 1
  236 + switch_head: 1,
  237 + block: 0,
233 238 });
234 239 var bc_page = th.data.bc_page;
235 240 rq.get("/api/weshop/marketing/help/help/task/involve/page", {
... ... @@ -250,7 +255,7 @@ Page({
250 255 is_bc_show: 1
251 256 })
252 257 } else {
253   - getApp().showWarning("暂无更多内容", 0, th);
  258 + getApp().my_warnning("暂无更多内容", 0, th);
254 259 }
255 260  
256 261 th.setData({
... ... @@ -306,6 +311,8 @@ Page({
306 311 // 获取会员的参与的任务列表 我的任务
307 312 user_task_list: function(e) {
308 313 var th = this;
  314 + //防止已经当前位置的时候多次点击
  315 + if (th.data.block == 1) { return false; }
309 316 var index = 0;
310 317 var is_task = this.data.is_task; //0任务，1帮拆
311 318 if (is_task == undefined || is_task == null) {
... ... @@ -331,6 +338,7 @@ Page({
331 338 userId: user_id
332 339 },
333 340 success: function(su) {
  341 + th.setData({block:1});
334 342 if (su.data.code == 0) {
335 343 if (su.data.data.total > 5) {
336 344 var rw_page = th.data.rw_page + 1;
... ... @@ -338,14 +346,15 @@ Page({
338 346 rw_page: rw_page,
339 347 is_show: 1
340 348 })
341   - getApp().my_warnning();
342   - getApp().showWarning("暂无更多内容", 0);
  349 + getApp().my_warnning(su.data.msg, 1, th);
343 350 }
344 351  
345 352 var user_list = su.data.data.pageData;
346 353 th.setData({
347 354 user_task_list: user_list
348 355 });
  356 + } else {
  357 + getApp().my_warnning(su.data.msg, 0, th);
349 358 }
350 359 }
351 360 })
... ... @@ -876,7 +885,6 @@ Page({
876 885 info_head: async function(func) {
877 886 var th = this;
878 887 var images = th.data.dynamic.zlHelpUser;
879   - console.log(images,"图片长度", images.length);
880 888 var arr = new Array();
881 889 var block = th.data.block;
882 890 if (images) {
... ... @@ -890,7 +898,13 @@ Page({
890 898 }
891 899 func();
892 900 },
  901 +//立即兑换修改
  902 + redeem_now: function (e) {
893 903  
  904 + 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);
  907 + },
894 908  
895 909  
896 910 //礼包的详情 轮播图
... ... @@ -900,9 +914,11 @@ Page({
900 914 var taskId = th.data.taskid; //任务id
901 915 getApp().goto("/pages/user/assistance/giftpacklist?help_id=" + help_id + "&is_libao=" + 0 + "&taskId=" + taskId);
902 916 },
903   - //正在进行任务
904   - test: function(e) {
905   - getApp().goto("/pages/user/assistance/friend_assistance?tasking=13");
  917 + //测试正在进行任务
  918 + test: function (e) {
  919 + var taskid = e.currentTarget.dataset.taskid;
  920 + var uset_id = this.data.zlisuers_id;
  921 + getApp().goto("/pages/user/assistance/friend_assistance?tasking=" + taskid + "&userId=" + uset_id);
906 922 },
907 923  
908 924 })
909 925 \ No newline at end of file
... ...