diff --git a/app.json b/app.json
index fb04943..d60da06 100644
--- a/app.json
+++ b/app.json
@@ -16,7 +16,6 @@
"pages/user/visit_log/visit_log",
"pages/user/address_list/address_list",
"pages/user/userinfo/userinfo",
- "pages/user/account/account",
"pages/user/return_goods_list/return_goods_list",
"pages/user/userinfo_edit/userinfo_edit",
"pages/user/collect_list/collect_list",
diff --git a/pages/activity/seckill_list/seckill_list.wxml b/pages/activity/seckill_list/seckill_list.wxml
index 5328d34..c10ebd1 100644
--- a/pages/activity/seckill_list/seckill_list.wxml
+++ b/pages/activity/seckill_list/seckill_list.wxml
@@ -19,7 +19,7 @@
-
+
剩余{{type==1?filters.toFix(100-(item.buy_num+item.virtual)/(item.goods_num+item.virtual)*100,0):'100'}}%
diff --git a/pages/user/account/account.js b/pages/user/account/account.js
deleted file mode 100644
index f85ae05..0000000
--- a/pages/user/account/account.js
+++ /dev/null
@@ -1,18 +0,0 @@
-var e = getApp();
-
-Page({
- data: {
- url: e.globalData.setting.url,
- resourceUrl: e.globalData.setting.resourceUrl,
- iurl: e.globalData.setting.imghost,
- userMoney: 0
- },
- onShow: function() {
- var t = this;
- e.getUserInfo(function(e) {
- t.setData({
- userMoney: e.user_money
- });
- });
- }
-});
\ No newline at end of file
diff --git a/pages/user/account/account.json b/pages/user/account/account.json
deleted file mode 100644
index d845e50..0000000
--- a/pages/user/account/account.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "navigationBarTitleText": "我的账号",
- "navigationBarBackgroundColor": "#E73741",
- "navigationBarTextStyle": "white",
- "enablePullDownRefresh": false
-}
\ No newline at end of file
diff --git a/pages/user/account/account.wxml b/pages/user/account/account.wxml
deleted file mode 100644
index 0349e48..0000000
--- a/pages/user/account/account.wxml
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
- 可用余额
- {{userMoney}}
-
-
-
- 账户充值
-
-
- 申请提现
-
-
-
-
-
- 余额明细
-
-
-
-
- 积分明细
-
-
-
-
- 充值记录
-
-
-
-
- 提现记录
-
-
-
-
-
diff --git a/pages/user/account/account.wxss b/pages/user/account/account.wxss
deleted file mode 100644
index 91ee4cf..0000000
--- a/pages/user/account/account.wxss
+++ /dev/null
@@ -1,48 +0,0 @@
-.cover {
- background-color: red;
- color: white;
- height: 540rpx;
- text-align: center;
- position: relative;
-}
-
-.detail {
- font-size: 36rpx;
- margin-top: 150rpx;
- line-height: 60rpx;
-}
-
-.price-text {
- font-size: 30rpx;
-}
-
-.operate {
- position: absolute;
- bottom: 0;
- width: 100%;
-}
-
-.op-item {
- width: 50%;
- float: left;
- padding-bottom: 25rpx;
- font-size: 28rpx;
-}
-
-.list {
- margin-top: 20rpx;
-}
-
-.item {
- font-size: 32rpx;
- background-color: white;
- padding: 25rpx 35rpx;
- border-bottom: 1rpx;
-}
-
-.arrow {
- margin-top: 5rpx;
- width: 25rpx;
- height: 28rpx;
- float: right;
-}
\ No newline at end of file
diff --git a/pages/user/assistance/assistance.wxml b/pages/user/assistance/assistance.wxml
index 6a6c89b..996b6e0 100644
--- a/pages/user/assistance/assistance.wxml
+++ b/pages/user/assistance/assistance.wxml
@@ -79,7 +79,7 @@
- 已有{{s_num}}人领取了任务
+ 该活动已被领取了{{s_num}}次
diff --git a/pages/user/assistance/assistance_success.js b/pages/user/assistance/assistance_success.js
index 8ffd0dd..23c0eb2 100644
--- a/pages/user/assistance/assistance_success.js
+++ b/pages/user/assistance/assistance_success.js
@@ -12,6 +12,7 @@ Page({
user:app_d.userInfo,
zl_act:null, //助力活动
s_num:0, //分享的人数
+ taskId:0,
},
/**
@@ -19,6 +20,8 @@ Page({
*/
onLoad: function (options) {
var helpid=options.helpid;
+ var taskId = options.taskId;
+ this.data.taskId = taskId;
this.init(helpid);
var nav_b = this.selectComponent("#nav_b"); //组件的id
nav_b.set_name("助力", "/pages/user/assistance/assistance");
@@ -48,8 +51,9 @@ Page({
th.setData({zl_act:res.data.data});
return getApp().request.promiseGet("/api/weshop/marketing/help/involve/help/act/people/count", {
data: {
- storeId: store_id,
- helpId: helpid
+ storeId: store_id,
+ helpId: helpid,
+ taskId:th.data.taskId
}
})
}
diff --git a/pages/user/assistance/friend_assistance.js b/pages/user/assistance/friend_assistance.js
index 438925c..92484ed 100644
--- a/pages/user/assistance/friend_assistance.js
+++ b/pages/user/assistance/friend_assistance.js
@@ -66,7 +66,7 @@ Page({
}).then(res => {
if (res.data.code == 0) {
th.data.userId = res.data.data.userId;
- th.data.taskId = res.data.data.taskId;
+ th.data.taskId = res.data.data.helpTaskId;
th.data.helpId=res.data.data.helpFormId;
//获取活动的时间
return getApp().request.promiseGet("/api/weshop/marketing/help/help/act/get", {
@@ -86,7 +86,8 @@ Page({
return getApp().request.promiseGet("/api/weshop/marketing/help/involve/help/act/people/count", {
data: {
helpId: res.data.data.id,
- storeId: os.stoid
+ storeId: os.stoid,
+ taskId:th.data.taskId,
}
})
}
@@ -140,7 +141,7 @@ Page({
//点击关闭礼盒
clike_none: function() {
this.setData({is_show: 0});
- getApp().goto("/pages/user/assistance/assistance_success?helpid="+this.data.helpId);
+ getApp().goto("/pages/user/assistance/assistance_success?helpid="+this.data.helpId+"&taskId="+this.data.taskId);
},
//导航球
close: function() {
diff --git a/pages/user/assistance/friend_assistance.wxml b/pages/user/assistance/friend_assistance.wxml
index 1f3ec67..0b7a6b7 100644
--- a/pages/user/assistance/friend_assistance.wxml
+++ b/pages/user/assistance/friend_assistance.wxml
@@ -19,7 +19,7 @@
帮他拆礼盒
-已有{{s_num}}人领取礼盒
+ 该任务已被领取了{{s_num}}次
diff --git a/pages/user/assistance/task_assistance.js b/pages/user/assistance/task_assistance.js
index f0413b5..b36df77 100644
--- a/pages/user/assistance/task_assistance.js
+++ b/pages/user/assistance/task_assistance.js
@@ -209,6 +209,7 @@ Page({
});
//判断是不是领取的任务
th.get_user_task();
+ th.get_user_task_num();
}
}
@@ -223,7 +224,7 @@ Page({
//会员任务列表
this.user_task_list();
//获取助力活动参与的人数
- this.get_user_task_num();
+
},
//记录加载更多
@@ -350,6 +351,7 @@ Page({
}
//判断是不是领取的任务
th.get_user_task();
+ th.get_user_task_num();
},
//导航球
@@ -456,10 +458,17 @@ Page({
get_user_task_num: function () {
var th = this;
var help_id = th.data.help_id;
+
+ var aitem = this.data.aitem; //任务的数据集
+ var sw_index = this.data.sw_index; //轮播的下标
+ //任务id
+ var taskid = aitem[sw_index].id;
+
rq.get("/api/weshop/marketing/help/involve/help/act/people/count", {
data: {
helpId: help_id,
storeId: os.stoid,
+ taskId: taskid
},
success: function (su) {
if (su.data.code == 0) {
@@ -1043,7 +1052,7 @@ Page({
is_dismantle: 0,
bc_page: 1,
})
-
+ this.get_user_task_num();
},
diff --git a/pages/user/assistance/task_assistance.wxml b/pages/user/assistance/task_assistance.wxml
index f44df8b..cf48ab8 100644
--- a/pages/user/assistance/task_assistance.wxml
+++ b/pages/user/assistance/task_assistance.wxml
@@ -9,7 +9,7 @@
活动剩余时间:
- {{aitem[0].djs.day}}:
+ {{aitem[0].djs.day}}天
{{aitem[0].djs.hou}}:
{{aitem[0].djs.min}}:
{{aitem[0].djs.sec}}
@@ -24,7 +24,7 @@
- 礼包详情
+ 礼包详情
@@ -146,7 +146,10 @@
- 已有{{usercount}}人领取了任务
+ 该任务已被领取了{{usercount}}次
+
+
+ 暂无领取记录
diff --git a/pages/user/index/index.js b/pages/user/index/index.js
index c1f16ce..29acc8d 100644
--- a/pages/user/index/index.js
+++ b/pages/user/index/index.js
@@ -599,11 +599,12 @@ Page({
},
// 判断助力活动是不是存在
is_assistance: function() {
- var th = this;
+ var th = this,r=Math.random()*100;
rq.get("/api/weshop/marketing/help/act/judge", {
data: {
storeId: os.stoid,
- userId: app_d.user_id
+ userId: app_d.user_id,
+ r:r,
},
success: function(res) {
var code = res.data.code;
@@ -611,7 +612,11 @@ Page({
th.setData({
is_assistance: 1
});
- }
+ }else{
+ th.setData({
+ is_assistance: 0
+ });
+ }
}
})