From b31628243915636644cf5b3ca29cfca16ff42f24 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Mon, 13 Jan 2020 16:30:34 +0800
Subject: [PATCH] 助力活动的显示
---
pages/user/assistance/assistance_success.js | 17 ++++++++++-------
pages/user/assistance/assistance_success.wxml | 2 +-
pages/user/assistance/friend_assistance.js | 30 ++++++++++++++++--------------
pages/user/assistance/friend_assistance.wxml | 4 ++--
4 files changed, 29 insertions(+), 24 deletions(-)
diff --git a/pages/user/assistance/assistance_success.js b/pages/user/assistance/assistance_success.js
index bec86b9..f09db9a 100644
--- a/pages/user/assistance/assistance_success.js
+++ b/pages/user/assistance/assistance_success.js
@@ -18,14 +18,15 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
-
+ //var helpid=options.helpid;
+ var helpid=23;
+ this.init(helpid);
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function (e) {
- var helpid=e.helpid;
- this.init(helpid);
+
},
// ----初始化----
@@ -35,10 +36,9 @@ Page({
var th=this;
//链式调用接口,先获取活动,在获取参与活动的人数
- getApp().request.promiseGet("/api/weshop/marketing/help/help/user/page", {
+ getApp().request.promiseGet("/api/weshop/marketing/help/help/act/get", {
data: {
- userId: app_d.user_id,
- storeId: os.store_id,
+ storeId: store_id,
helpId: helpid
}
}).then(res => {
@@ -46,7 +46,7 @@ Page({
th.setData({zl_act:res.data.data});
return getApp().request.promiseGet("/api/weshop/marketing/help/involve/help/act/people/count", {
data: {
- storeId: os.store_id,
+ storeId: store_id,
helpId: helpid
}
})
@@ -69,4 +69,7 @@ Page({
},
+ cklie_button:function(){
+ getApp().goto("/pages/user/assistance/assistance")
+ }
})
\ No newline at end of file
diff --git a/pages/user/assistance/assistance_success.wxml b/pages/user/assistance/assistance_success.wxml
index 678c94e..06afae6 100644
--- a/pages/user/assistance/assistance_success.wxml
+++ b/pages/user/assistance/assistance_success.wxml
@@ -1,4 +1,4 @@
-
+
diff --git a/pages/user/assistance/friend_assistance.js b/pages/user/assistance/friend_assistance.js
index 7588929..5d6217f 100644
--- a/pages/user/assistance/friend_assistance.js
+++ b/pages/user/assistance/friend_assistance.js
@@ -17,9 +17,10 @@ Page({
is_show: 0, //显示弹框
user: app_d.userInfo,
zl_act: null, //助力活动
- task_id: 0, //助力任务ID
+ tasking: 0, //助力任务ID
userId: 0, //任务用户的ID
s_num: 0, //分享的人数
+ taskId:0, //活动从表ID
},
/**
@@ -27,25 +28,27 @@ Page({
*/
onLoad: function(options) {
var th = this;
- if (options.task_id) this.data.task_id = options.task_id;
+ if (options.tasking) this.data.tasking = options.tasking;
if (options.userId) this.data.userId = options.userId;
//任务是不是为空
- if (this.data.task_id == 0 || this.data.task_id == undefined) {
- this.data.task_id = decodeURIComponent(options.scene);
- if (this.data.task_id != null && this.data.task_id != 'undefined' && this.data.task_id != "" && this.data.task_id !=
+ if (this.data.tasking == 0 || this.data.tasking == undefined) {
+ //this.data.task_id = decodeURIComponent(options.scene);
+ this.data.tasking =1;
+ if (this.data.tasking != null && this.data.tasking != 'undefined' && this.data.tasking != "" && this.data.tasking !=
0) {
getApp().request.promiseGet("/api/weshop/marketing/help/help/tasking/get", {
data: {
- id: th.data.task_id,
+ id: th.data.tasking,
storeId: os.stoid
}
}).then(res => {
if (res.data.code == 0) {
- th.data.userId = res.data.data.user_id;
+ th.data.userId = res.data.data.userId;
+ th.data.taskId = res.data.data.taskId;
//获取活动的时间
return getApp().request.promiseGet("/api/weshop/marketing/help/help/act/get", {
data: {
- id: th.data.task_id,
+ helpId: res.data.data.helpFormId,
storeId: os.stoid
}
})
@@ -96,9 +99,9 @@ Page({
var th = this;
var t_user_id = app_d.user_id;
var data = {
- id: this.data.task_id,
+ id: this.data.tasking,
storeId: os.stoid,
- userId: this.data.user_id,
+ userId: this.data.userId,
zlUserId: t_user_id
};
console.log(data);
@@ -106,7 +109,7 @@ Page({
data, //入参
function(res) { //成功
if (res.data.code == 0)
- this.setData({
+ th.setData({
is_show: 1
});
else {
@@ -121,9 +124,8 @@ Page({
},
//点击关闭礼盒
clike_none: function() {
- this.setData({
- is_show: 0
- });
+ this.setData({is_show: 0});
+ getApp().goto("/pages/user/assistance/assistance_success");
},
//导航球
close: function() {
diff --git a/pages/user/assistance/friend_assistance.wxml b/pages/user/assistance/friend_assistance.wxml
index 3a1d9fc..e96ff62 100644
--- a/pages/user/assistance/friend_assistance.wxml
+++ b/pages/user/assistance/friend_assistance.wxml
@@ -14,12 +14,12 @@
- 活动时间：{{filter.fm_time(zl_act.begindate)}}-{{filter.fm_time(zl_act.begindate)}}
+ 活动时间：{{filter.fm_time(zl_act.beginDate)}}-{{filter.fm_time(zl_act.beginDate)}}
帮他拆礼盒
-已有{{zl_act.qiang_num}}人领取礼盒
+已有{{s_num}}人领取礼盒
--
libgit2 0.21.4