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

iceling
2 parents 81bb33f0 fda66ba3
Showing 1 changed file with 24 additions and 8 deletions
pages/user/assistance/task_assistance.js
@@ -213,6 +213,10 @@ Page({
   //帮拆记录的
   dismantle_record: function(e) {
+    //优化444444444444444444
+    if (this.data.switch_head == 1) {
+      return false;
+    }
     var aitem = this.data.aitem; //任务的数据集
     var sw_index = this.data.sw_index; //轮播的下标
     //任务id
@@ -229,7 +233,8 @@ Page({
     }
     this.setData({
       is_task: 1,
-      switch_head: 1
+      switch_head: 1,
+      block: 0,
     });
     var bc_page = th.data.bc_page;
     rq.get("/api/weshop/marketing/help/help/task/involve/page", {
@@ -250,7 +255,7 @@ Page({
               is_bc_show: 1
             })
           } else {
-            getApp().showWarning("暂无更多内容", 0, th);
+            getApp().my_warnning("暂无更多内容", 0, th);
           }
           th.setData({
@@ -306,6 +311,8 @@ Page({
   // 获取会员的参与的任务列表 我的任务
   user_task_list: function(e) {
     var th = this;
+    //防止已经当前位置的时候多次点击 
+    if (th.data.block == 1) { return false; }
     var index = 0;
     var is_task = this.data.is_task; //0任务，1帮拆
     if (is_task == undefined || is_task == null) {
@@ -331,6 +338,7 @@ Page({
         userId: user_id
       },
       success: function(su) {
+        th.setData({block:1});
         if (su.data.code == 0) {
           if (su.data.data.total > 5) {
             var rw_page = th.data.rw_page + 1;
@@ -338,14 +346,15 @@ Page({
               rw_page: rw_page,
               is_show: 1
             })
-            getApp().my_warnning();
-            getApp().showWarning("暂无更多内容", 0);
+            getApp().my_warnning(su.data.msg, 1, th);
           }
           var user_list = su.data.data.pageData;
           th.setData({
             user_task_list: user_list
           });
+        } else {
+          getApp().my_warnning(su.data.msg, 0, th);
         }
       }
     })
@@ -876,7 +885,6 @@ Page({
   info_head: async function(func) {
     var th = this;
     var images = th.data.dynamic.zlHelpUser;
-    console.log(images,"图片长度", images.length);
     var arr = new Array();
     var block = th.data.block;
     if (images) {
@@ -890,7 +898,13 @@ Page({
     }
     func();
   },
+//立即兑换修改
+  redeem_now: function (e) {
+    var libao_id = e.currentTarget.dataset.libaoid;
+    console.log("立即兑换的礼包id", libao_id);
+    getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + libao_id + "&is_libao=" + 1);
+  },
   //礼包的详情 轮播图
@@ -900,9 +914,11 @@ Page({
     var taskId = th.data.taskid; //任务id
     getApp().goto("/pages/user/assistance/giftpacklist?help_id=" + help_id + "&is_libao=" + 0 + "&taskId=" + taskId);
   },
-  //正在进行任务
-  test: function(e) {
-    getApp().goto("/pages/user/assistance/friend_assistance?tasking=13");
+  //测试正在进行任务
+  test: function (e) {
+    var taskid = e.currentTarget.dataset.taskid;
+    var uset_id = this.data.zlisuers_id;
+    getApp().goto("/pages/user/assistance/friend_assistance?tasking=" + taskid + "&userId=" + uset_id);
   },
 })
 \ No newline at end of file