diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
index 9e8bc3e..8a96fbd 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
@@ -276,6 +276,9 @@ Page({
luckGoInfo: {},
showDetails: false,
num_success: 0, //成团已中商品数量
+ isTimeUp: false,
+
+ surplus: 0,
},
@@ -1005,6 +1008,24 @@ Page({
});
this.data.enterAddressPage && (this.data.enterAddressPage = !1);
+ // 检查幸运购活动商品库存
+ getApp().request.get("/api/weshop/activitylist/getActLen/" + o.stoid + "/9/" + this.data.group_id, {
+ success: function(res) {
+ //console.log('当前幸运购活动的剩余库存', res.data.data);
+ if(res.data.code == 0) {
+ th.setData({
+ // 剩余库存量
+ surplus: res.data.data,
+ });
+ };
+ // else {
+ // th.setData({
+ // surplus: 0,
+ // });
+ // }
+ }
+ });
+
// 检查是否已经参团购买
getApp().request.get("/api/weshop/prom/luckyOrder/getUserOrderInfo/" + o.stoid + "/" + oo.user_id + "/" + this.data.group_id, {
@@ -1077,18 +1098,37 @@ Page({
}
}).then(res => {
if (res.data.code == 0) {
- // console.log('成团信息=======》', res.data.data);
+ console.log('成团信息=======》', res.data.data);
+ if(res.data.data.pageData && res.data.data.pageData.length == 0) {
+ let obj = {
+ day: '00',
+ hou: '00',
+ min: '00',
+ sec: '00'
+ };
+
+ th.setData({
+ djs: obj,
+ isTimeUp: true,
+ });
+ } else {
+ th.setData({
+ luckGoInfo: res.data.data.pageData[0],
+ team_id: res.data.data.pageData[0].team_id,
+ luckGoMembers: [],
+ });
+ wx.setStorage({
+ key: 'team_id',
+ data: th.data.team_id,
+ });
+ th.countDown(th.data.luckGoInfo.end_time, 0);
+ };
+
+ } else {
th.setData({
- luckGoInfo: res.data.data.pageData[0],
- team_id: res.data.data.pageData[0].team_id,
- luckGoMembers: [],
- });
- wx.setStorage({
- key: 'team_id',
- data: th.data.team_id,
+ isTimeUp: true,
});
- th.countDown(th.data.luckGoInfo.end_time, 0);
- };
+ };
});
@@ -3682,41 +3722,63 @@ Page({
min: this.timeFormat(min),
sec: this.timeFormat(sec)
}
+ // console.log('cd');
} else {
- if (th.data.prom_st == 0) {
- //var endTime2 = new Date(th.data.prom_end_time).getTime();
- var endTime2 = th.data.prom_act.end_time;
- th.setData({
- prom_time_text: '距结束还剩:',
- prom_st: 1
- })
- setTimeout(function () {
- th.countDown(endTime2)
- }, 1000);
- return false;
+ // if (th.data.prom_st == 0) {
+ // //var endTime2 = new Date(th.data.prom_end_time).getTime();
+ // var endTime2 = th.data.prom_act.end_time;
+ // th.setData({
+ // prom_time_text: '距结束还剩:',
+ // prom_st: 1
+ // })
+ // setTimeout(function () {
+ // th.countDown(endTime2)
+ // }, 1000);
+ // return false;
- } else {
- //活动已结束，全部设置为'00'
- obj = {
- day: '00',
- hou: '00',
- min: '00',
- sec: '00'
- }
- th.setData({
- prom_time_text: '活动已经结束:',
- prom_st: 3
- })
- th.setData({
- djs: obj
- });
- return false;
- }
+ // } else {
+ // //活动已结束，全部设置为'00'
+ // obj = {
+ // day: '00',
+ // hou: '00',
+ // min: '00',
+ // sec: '00'
+ // }
+ // th.setData({
+ // prom_time_text: '活动已经结束:',
+ // prom_st: 3
+ // })
+ // th.setData({
+ // djs: obj
+ // });
+ // return false;
+ // }
+
+
+ obj = {
+ day: '00',
+ hou: '00',
+ min: '00',
+ sec: '00'
+ }
+
+ th.setData({
+ djs: obj,
+ isTimeUp: true,
+ });
+ console.log('i am here');
+ return false;
}
-
- th.setData({
- djs: obj
- });
+
+ // ----
+
+
+
+
+ th.setData({
+ djs: obj
+ });
+ // ----
setTimeout(function () {
th.countDown(endTime)
}, 1000);
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
index 7578045..cf82181 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
@@ -920,9 +920,14 @@
- 查看详情
- 立即参团
- 已经抢光
+ 活动已经结束
+
+ 查看详情
+ 立即参团
+ 已经抢光了
+
+
+