点击加载更多
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 5d6217f..6d51dec 100644
--- a/pages/user/assistance/friend_assistance.js
+++ b/pages/user/assistance/friend_assistance.js
@@ -32,54 +32,53 @@ Page({
if (options.userId) this.data.userId = options.userId;
//任务是不是为空
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.tasking,
- storeId: os.stoid
- }
- }).then(res => {
- if (res.data.code == 0) {
- 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: {
- helpId: res.data.data.helpFormId,
- storeId: os.stoid
- }
- })
- }
- return ut.null_promise();
- }).then(res => {
- if (res.data.code == 0) {
- th.setData({
- zl_act: res.data.data
- })
- //获取活动的参与的人数
- return getApp().request.promiseGet("/api/weshop/marketing/help/involve/help/act/people/count", {
- data: {
- helpId: res.data.data.id,
- storeId: os.stoid
- }
- })
- }
- return ut.null_promise();
- }).then(res => {
- if (res.data.code == 0) {
- th.setData({
- s_num: res.data.data.countAll
- });
- }
- })
-
- }
+ this.data.tasking = decodeURIComponent(options.scene);
}
- },
+ 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.tasking,
+ storeId: os.stoid
+ }
+ }).then(res => {
+ if (res.data.code == 0) {
+ 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: {
+ helpId: res.data.data.helpFormId,
+ storeId: os.stoid
+ }
+ })
+ }
+ return ut.null_promise();
+ }).then(res => {
+ if (res.data.code == 0) {
+ th.setData({
+ zl_act: res.data.data
+ })
+ //获取活动的参与的人数
+ return getApp().request.promiseGet("/api/weshop/marketing/help/involve/help/act/people/count", {
+ data: {
+ helpId: res.data.data.id,
+ storeId: os.stoid
+ }
+ })
+ }
+ return ut.null_promise();
+ }).then(res => {
+ if (res.data.code == 0) {
+ th.setData({
+ s_num: res.data.data.countAll
+ });
+ }
+ })
+
+ }
+ },
// 跳转到助力成功页
participate_activity: function() {
@@ -132,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/giftpacklist.js b/pages/user/assistance/giftpacklist.js
index dc7ffbb..a4c09b9 100644
--- a/pages/user/assistance/giftpacklist.js
+++ b/pages/user/assistance/giftpacklist.js
@@ -28,144 +28,120 @@ Page({
code: "", //核销码
c_state: "0", //判断是否已经使用, 0正常 1已使用 2已过期
is_lb: 0, //是否有礼包
+ receiveState: 0, //0未领取 1已领取
+ completeid: "",
+ is_sub: 0, //判断是否重复提交
+ is_libao: 0, //0轮播查看活动 1领取礼包 2.查看礼包详情
+ held_id: "", //活动id
+ taskId: "", //任务id
+ orderSn: "", //订单号
},
- onLoad: function (options) {
+ onLoad: function(options) {
var th = this;
- th.setData({
- isBuy: options.isBuy,
- getStorageID: a.stoid,
- getUserID: d.user_id,
- getGiftID: options.lbId,
- orderSn: options.orderSn
- })
- if (options.isBuy == 0) {
- th.GetMyGiftList();
- } else {
+ if (options.is_libao == 0) {
+ th.setData({
+ held_id: options.help_id, //options.help_id
+ taskId: options.taskId, //options.libao_id
+ })
+ th.help();
+ }
+ if (options.is_libao == 1) {
+ th.setData({
+ taskId: options.libao_id,
+ held_id: options.held_id
+ })
th.GetBuyGiftList();
}
- th.setData({
- giftRemark: th.data.giftRemark.replace(/![]()
{
+ if (res.data.code == 0) {
+ th.setData({
+ giftImage: th.data.iurl + res.data.data.lbUrl,
+ giftTitle: res.data.data.giftTitle
+ })
+ if (res.data.data.giftRemark == '') {
+ th.setData({
+ giftRemark: '暂无详情......'
+ })
+ } else {
+ th.setData({
+ giftRemark: res.data.data.giftRemark.replace(/\![]()
{{giftTitle}}
-