diff --git a/pages/user/assistance/task_assistance.js b/pages/user/assistance/task_assistance.js
index c7a6af6..4760a66 100644
--- a/pages/user/assistance/task_assistance.js
+++ b/pages/user/assistance/task_assistance.js
@@ -13,6 +13,8 @@ Page({
* 页面的初始数据
*/
data: {
+ swpie_img: s.imghost +"/miniapp/images/user_index_powder.jpg",
+ defaultAvatar: s.imghost + "/miniapp/images/no-head.jpg",//助力头像的默认图
sw_index: 0, //轮播的下标控制
url: s.url, //接口网址
iurl: s.imghost,
@@ -25,17 +27,22 @@ Page({
help_id: "", //活动的id canvasHidden: 0, //分享图片是否已经生成
gid: "",
timer: null, //全局的定时器
- user_task_list: null, //会员列表
+ user_task_list: [], //会员列表
taskid: "", //任务id
usercount: 0, //参与的人数
- dismantle: null, //帮拆记录数据集
+ dismantle:[], //帮拆记录数据集
is_user_task: null, //判断是不是领取的任务
zzjx_id: "", //真正进行的任务id
is_show: 0, //任务的加载更多
is_bc_show: 0, //帮拆的加载更多
bc_page: 1, //帮拆的页码
rw_page: 1, //任务的页码
- block: 0, //阻断助力的用户图片多次添加
+ block: 0, //阻断助力的我的任务在当前位置多次点击
+ is_dismantle:0, //阻断助力的帮拆记录在当前位置多次点击
+ is_clik:0,//点击的时候控制划动
+ is_dis_list:0,//多个数据的时候
+ is_user_list:0,//我的任务点击加载更多的后
+
//*********************************************start钱
canvasHidden: 0, //分享图片是否已经生成
is_share: 0, //是否显示画布
@@ -208,14 +215,18 @@ Page({
this.get_user_task_num();
},
-
-
+ //记录加载更多
+ dismantle_record_list:function(){
+ this.setData({ is_dismantle:0});
+ this.dismantle_record();
+ },
//帮拆记录的
dismantle_record: function(e) {
- //优化444444444444444444
- if (this.data.switch_head == 1) {
+ //优化
+ if (this.data.is_dismantle == 1) {
return false;
}
+
var aitem = this.data.aitem; //任务的数据集
var sw_index = this.data.sw_index; //轮播的下标
//任务id
@@ -235,6 +246,7 @@ Page({
switch_head: 1,
block: 0,
});
+
var bc_page = th.data.bc_page;
rq.get("/api/weshop/marketing/help/help/task/involve/page", {
data: {
@@ -246,19 +258,32 @@ Page({
},
success: function(res) {
if (res.data.code == 0) {
+ th.setData({is_dismantle: 1});
var dismantle = res.data.data.pageData[0].zlHelpUser;
if (res.data.data.total > 5) {
var bc_page = th.data.bc_page + 1;
- th.data({
+ var dismantle_s = th.data.dismantle.concat(dismantle);
+ th.setData({
bc_page: bc_page,
- is_bc_show: 1
+ is_bc_show: 1,
+ dismantle: dismantle_s,
+ is_dis_list:1
})
} else {
- getApp().my_warnning("暂无更多内容", 0, th);
+ th.setData({
+ dismantle: dismantle,
+ is_dis_list: 0
+ });
+ }
+ var dis_len=th.data.dismantle.length;
+ if (res.data.data.total == dis_len){
+ th.setData({
+ is_dis_list: 0,
+ })
}
-
th.setData({
- dismantle: dismantle
+
+ is_clik: 0,
});
} else {
th.setData({
@@ -273,7 +298,8 @@ Page({
get_libao: function(e) {
var libao_id = e.currentTarget.dataset.libaoid; //礼包id
var taskid= e.currentTarget.dataset.taskid;
- getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + libao_id + "&is_libao=" + 1 +"&taskId="+taskid);
+ var taskingid = e.currentTarget.dataset.taskingid;
+ getApp().goto("/pages/user/assistance/giftpacklist?help_id=" + this.data.help_id + "&is_libao=" + 1 + "&taskId=" + taskid + "&id="+taskingid);
},
//查看礼包id
select_libao: function(e) {
@@ -283,6 +309,10 @@ Page({
//划动的时候监听
onSli: function(e) {
+ var arr=[];
+ this.setData({
+ dismantle: arr
+ });
var th = this;
var ind = e.detail.current;
var aitem = this.data.aitem;
@@ -291,10 +321,12 @@ Page({
th.setData({
sw_index: ind,
task_number: task_number,
- taskid: task_id
+ taskid: task_id,
+ is_dismantle: 0,
+ bc_page:1
});
-
- if (this.data.switch_head == 1) {
+
+ if (this.data.switch_head == 1&&th.data.is_clik==0) {
//判断有没有帮拆记录
this.dismantle_record();
}
@@ -308,6 +340,11 @@ Page({
var nav_b = th.selectComponent("#nav_b"); //组件的id
nav_b.close_box();
},
+ //我的任务点击加载更多
+ task_list:function(){
+ this.setData({ block:0});
+ this.user_task_list();
+ },
// 获取会员的参与的任务列表 我的任务
user_task_list: function(e) {
var th = this;
@@ -346,14 +383,24 @@ Page({
rw_page: rw_page,
is_show: 1
})
- getApp().my_warnning(su.data.msg, 1, th);
+
}
-
- var user_list = su.data.data.pageData;
+
+
+ var user_list = su.data.data.pageData;
+ // if (user_list == "" || user_list.length == 0 || user_list==null){
+ // th.setData({
+ // is_user_list: 1
+ // });
+ // console.log("走哪里1111");
+ // }else{}
+ console.log("走哪里22222222");
+ var user_lists=th.data.user_task_list.concat(user_list);
th.setData({
- user_task_list: user_list
+ user_task_list: user_lists
});
} else {
+ th.setData({ is_user_list: 1 });
getApp().my_warnning(su.data.msg, 0, th);
}
}
@@ -436,6 +483,10 @@ Page({
// 轮播图点击左边
click_pre: function() {
+ var arr=[];
+ this.setData({
+ dismantle:arr
+ });
var index = this.data.sw_index;
index--;
if (index < 0) return;
@@ -445,18 +496,29 @@ Page({
this.setData({
sw_index: index,
task_number: task_number,
- taskid: task_id
+ taskid: task_id,
+ is_dismantle: 0,
+ is_clik:1,
+ bc_page:1
})
if (this.data.switch_head == 1) {
//判断有没有帮拆记录
+ console.log("往左点////////////////////");
this.dismantle_record();
}
- //判断有没有领取任务
- this.get_user_task();
+ if (this.data.switch_head == 0){
+ //判断有没有领取任务
+ this.get_user_task();
+ }
+
},
//轮播图点击右边
click_next: function() {
-
+ var arr=[];
+ this.setData({
+ is_clik:1,
+ dismantle: arr
+ });
var index = this.data.sw_index;
index++;
if (index >= this.data.aitem.length) return;
@@ -466,7 +528,9 @@ Page({
this.setData({
sw_index: index,
task_number: task_number,
- taskid: task_id
+ taskid: task_id,
+ is_dismantle: 0,
+ bc_page:1,
})
if (this.data.switch_head == 1) {
this.dismantle_record();
@@ -901,8 +965,11 @@ Page({
//立即兑换
redeem_now: function (e) {
var libao_id = e.currentTarget.dataset.libaoid;
- var taskid = e.currentTarget.dataset.taskid;
- getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + libao_id + "&is_libao=" + 1 + "&taskId=" + taskid);
+ var sw_index=this.data.sw_index;
+ var aitem=this.data.aitem;
+ var taskid = aitem[sw_index].id;
+ var taskingid= e.currentTarget.dataset.taskingid;
+ getApp().goto("/pages/user/assistance/giftpacklist?help_id=" + this.data.help_id + "&is_libao=" + 1 + "&taskId=" + taskid + "&id="+taskingid);
},
diff --git a/pages/user/assistance/task_assistance.wxml b/pages/user/assistance/task_assistance.wxml
index 7e469f0..8d71254 100644
--- a/pages/user/assistance/task_assistance.wxml
+++ b/pages/user/assistance/task_assistance.wxml
@@ -1,5 +1,5 @@
-
+
@@ -23,7 +23,7 @@
-
+
礼包详情
@@ -52,7 +52,7 @@
好友拆一拆
-
+
立即兑换
@@ -90,7 +90,7 @@
{{item.zlHelpNum}}/{{item.helpNum}}
查看礼包
- 领取礼包
+ 领取礼包
@@ -110,21 +110,20 @@
-
+
-
-
-
+
+
{{item.nickName}}
{{filter.format_time(item.zltime)}}
-
-
+
+
- 点击加载更多
+ 点击加载更多
@@ -141,12 +140,12 @@
-
+
- 点击加载更多
+ 点击加载更多
-
+
已有{{usercount}}人领取了任务
diff --git a/pages/user/assistance/task_assistance.wxss b/pages/user/assistance/task_assistance.wxss
index d9359e0..b84cdcb 100644
--- a/pages/user/assistance/task_assistance.wxss
+++ b/pages/user/assistance/task_assistance.wxss
@@ -226,3 +226,13 @@ page {
filter: alpha(opacity=60);
bottom: 0rpx;
}
+.is_dismantle_frame{
+ align-content: center;
+height: 56rpx;
+line-height: 48rpx;
+
+}
+.bottom{
+ margin-bottom: 50rpx;
+ margin-top: 20rpx;
+}
\ No newline at end of file