diff --git a/pages/user/assistance/assistance_success.json b/pages/user/assistance/assistance_success.json
index 5467480..d494c4d 100644
--- a/pages/user/assistance/assistance_success.json
+++ b/pages/user/assistance/assistance_success.json
@@ -1,4 +1,6 @@
{
+ "navigationBarTitleText": "好友助力,得好礼",
+ "navigationStyle": "custom",
"usingComponents": {
"warn": "/components/long_warn/long_warn",
"my_confirm": "/components/my_confirm/my_confirm",
diff --git a/pages/user/assistance/friend_assistance.js b/pages/user/assistance/friend_assistance.js
index bdc5d76..6d51dec 100644
--- a/pages/user/assistance/friend_assistance.js
+++ b/pages/user/assistance/friend_assistance.js
@@ -131,7 +131,7 @@ Page({
var th = this;
var nav_b = th.selectComponent("#nav_b"); //组件的id
nav_b.close_box();
- nav_b.set_name("助力", "");
+ nav_b.set_name("助力", "/pages/user/assistance/assistance");
},
/**
diff --git a/pages/user/assistance/friend_assistance.json b/pages/user/assistance/friend_assistance.json
index 2ee27f1..63f5fe9 100644
--- a/pages/user/assistance/friend_assistance.json
+++ b/pages/user/assistance/friend_assistance.json
@@ -1,4 +1,6 @@
{
+ "navigationBarTitleText": "好友助力,得好礼",
+ "navigationStyle": "custom",
"usingComponents": {
"warn": "/components/long_warn/long_warn",
"my_confirm": "/components/my_confirm/my_confirm",
diff --git a/pages/user/assistance/task_assistance.js b/pages/user/assistance/task_assistance.js
index 29990ac..fd72b3c 100644
--- a/pages/user/assistance/task_assistance.js
+++ b/pages/user/assistance/task_assistance.js
@@ -32,6 +32,10 @@ Page({
dismantle: null, //帮拆记录数据集
is_user_task: null, //判断是不是领取的任务
zzjx_id: "", //真正进行的任务id
+ is_show:0,//任务的加载更多
+ is_bc_show:0,//帮拆的加载更多
+ bc_page:1,//帮拆的页码
+ rw_page:1,//任务的页码
//*********************************************start钱
canvasHidden: 0, //分享图片是否已经生成
is_share: 0, //是否显示画布
@@ -77,7 +81,6 @@ Page({
add_onlicke: function(e) {
var th = this;
var taskid = e.target.dataset.taskid;
- console.log("任务id5555555", taskid);
var help_id = th.data.help_id;
var user_id = getApp().globalData.user_id;
var stoid = os.stoid
@@ -88,10 +91,12 @@ Page({
taskId: taskid
},
function(res) {
-
if (res.data.code == 0) {
- console.log(res.data.data);
getApp().my_warnning(res.data.data, 1, th);
+ //判断是不是领取的任务
+ th.get_user_task();
+ //会员任务列表
+ th.user_task_list();
} else {
getApp().my_warnning(res.data.msg, 0, th);
}
@@ -127,17 +132,18 @@ Page({
},
success: function(res) {
if (res.data.code == 0) {
-
var help_data = res.data.data;
- console.log('助力活动（判断）', res.data.data);
th.setData({
endDate: help_data.endDate,
});
//任务时间 设置全局定时器
- th.data.timer = setInterval(function() {
- th.countDown();
- }, 1000);
+ th.setData({
+ timer:setInterval(function () {
+ th.countDown();
+ }, 1000)
+ })
+
}
}
@@ -194,7 +200,7 @@ Page({
//会员任务列表
this.user_task_list();
- // 获取会员的参与的任务列表 我的任务
+ //获取助力活动参与的人数
this.get_user_task_num();
},
@@ -210,7 +216,6 @@ Page({
var sw_index = this.data.sw_index; //轮播的下标
//任务id
var taskid = aitem[sw_index].id;
- console.log("任务id", taskid);
var th = this;
var index = 1; //获取当前选择的是任务还是活动说明
var is_task = this.data.is_task; //0任务，1帮拆
@@ -221,24 +226,31 @@ Page({
if (switch_head == undefined || switch_head == null) {
switch_head = 1;
}
-
- console.log("0任务，1帮拆", is_task, );
this.setData({
is_task: 1,
switch_head: 1
});
+ var bc_page = th.data.bc_page;
rq.get("/api/weshop/marketing/help/help/task/involve/page", {
data: {
+ page: bc_page,
+ pageSize: 5,
taskId: taskid,
userId: getApp().globalData.user_id,
storeId: os.stoid
},
success: function(res) {
-
if (res.data.code == 0) {
var dismantle = res.data.data.pageData[0].zlHelpUser;
- console.log(dismantle.toString, "帮拆记录", dismantle[0].nickName);
-
+ if(res.data.data.total>5){
+ var bc_page = th.data.bc_page + 1;
+ th.data({ bc_page: bc_page,
+ is_bc_show:1
+ })
+ }else{
+ getApp().showWarning("暂无更多内容", 0);
+ }
+
th.setData({
dismantle: dismantle
});
@@ -292,13 +304,11 @@ Page({
var th = this;
var nav_b = th.selectComponent("#nav_b"); //组件的id
nav_b.close_box();
- nav_b.set_name("助力", "");
+ nav_b.set_name("助力", "/pages/user/assistance/assistance");
},
// 获取会员的参与的任务列表 我的任务
user_task_list: function(e) {
-
var th = this;
-
var index = 0;
var is_task = this.data.is_task; //0任务，1帮拆
if (is_task == undefined || is_task == null) {
@@ -314,24 +324,34 @@ Page({
});
var help_id = th.data.help_id;
var user_id = getApp().globalData.user_id;
+ var rw_page=th.data.rw_page;
rq.get("/api/weshop/marketing/help/help/user/page", {
data: {
+ page:rw_page,
+ pageSize:5,
helpId: help_id,
storeId: os.stoid,
userId: user_id
},
success: function(su) {
-
if (su.data.code == 0) {
+ if (su.data.data.total > 5){
+ th.setData({
+ rw_page: rw_page,
+ is_show: 1
+ })
+ getApp().showWarning("暂无更多内容", 0);
+ }else{
+ var rw_page = th.data.rw_page + 1;
+ th.setData({
+ rw_page: rw_page,
+
+ })
+ }
var user_list = su.data.data.pageData;
- console.log("会员列表", user_list);
th.setData({
user_task_list: user_list
});
- } else {
- th.setData({
- user_task_list: null
- });
}
}
})
@@ -342,9 +362,7 @@ Page({
var th = this;
var aitem = th.data.aitem;
var sw_index = th.data.sw_index;
- console.log(sw_index, "判断是否有领取任务", aitem);
var taskid = aitem[sw_index].id
- console.log("判断是否有领取任务 任务的id", taskid);
rq.get("/api/weshop/marketing/help/help/task/get", {
data: {
storeId: os.stoid,
@@ -354,7 +372,6 @@ Page({
success: function(res) {
if (res.data.code == 0) {
var is_usertask = res.data.data;
- console.log('判断是不是领取的任务', is_usertask);
th.setData({
is_user_task: is_usertask
});
@@ -424,7 +441,6 @@ Page({
var aitem = this.data.aitem;
var task_number = aitem[index].giftQty - aitem[index].useGiftQty;
var task_id = aitem[index].id;
- console.log("轮播图点击左边");
this.setData({
sw_index: index,
task_number: task_number,
@@ -446,7 +462,6 @@ Page({
var aitem = this.data.aitem;
var task_number = aitem[index].giftQty - aitem[index].useGiftQty;
var task_id = aitem[index].id;
- console.log("轮播图点击右边");
this.setData({
sw_index: index,
task_number: task_number,
@@ -462,8 +477,7 @@ Page({
*/
onHide: function() {
//--清理定时器--
- console.log("清理定时器");
- clearInterval(this.timer);
+ clearInterval(this.data.timer);
},
/**
@@ -489,14 +503,13 @@ Page({
// 对结束时间进行处理渲染到页面
// var o = endTimeList[i];
- var endTime = th.data.endDate
-
+ var endTime = th.data.endDate;
+ console.log("结束时间5555555", endTime);
// if (o.status == 0) endTime = o.start_time
var obj = null;
// 如果活动未结束，对时间进行处理
if (endTime - newTime > 0) {
-
var time = (endTime - newTime);
// 获取天、时、分、秒
var day = parseInt(time / (60 * 60 * 24));
@@ -518,15 +531,10 @@ Page({
sec: '00'
}
}
-
+ var txt = "aitem[" +0+ "].djs";
th.setData({
- djs: obj
+ [txt]: obj
});
-
-
-
-
-
},
//---小于10的格式化函数----
timeFormat(param) {
@@ -1032,7 +1040,8 @@ Page({
//礼包的详情 轮播图
libao_details: function(e) {
var giftbagid = e.currentTarget.dataset.giftbagid;
- getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + giftbagid + "&is_libao=" + 0);
+ var help_id = this.data.help_id;
+ getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + giftbagid + "&is_libao=" + 0+"help_id");
},
//正在进行任务
test: function(e) {
diff --git a/pages/user/assistance/task_assistance.json b/pages/user/assistance/task_assistance.json
index d1cfde4..63f5fe9 100644
--- a/pages/user/assistance/task_assistance.json
+++ b/pages/user/assistance/task_assistance.json
@@ -1,5 +1,5 @@
{
- "navigationBarTitleText": "好友助力",
+ "navigationBarTitleText": "好友助力,得好礼",
"navigationStyle": "custom",
"usingComponents": {
"warn": "/components/long_warn/long_warn",
diff --git a/pages/user/assistance/task_assistance.wxml b/pages/user/assistance/task_assistance.wxml
index fb7a752..04bac0e 100644
--- a/pages/user/assistance/task_assistance.wxml
+++ b/pages/user/assistance/task_assistance.wxml
@@ -1,4 +1,4 @@
-
+
@@ -44,9 +44,9 @@
好友拆一拆
-
+
@@ -108,8 +108,13 @@
{{filter.format_time(item.zltime)}}
-
+
+
+
+ 点击加载更多
+
+
@@ -124,9 +129,9 @@
-
+
- 点击加载更多
+ 点击加载更多