diff --git a/components/diy_pingd_buy/diy_pingd_buy.js b/components/diy_pingd_buy/diy_pingd_buy.js
index 4b4ea0f..72ad1e6 100644
--- a/components/diy_pingd_buy/diy_pingd_buy.js
+++ b/components/diy_pingd_buy/diy_pingd_buy.js
@@ -84,12 +84,9 @@ Component({
//--调用接口,读取拼单--
app.request.promiseGet("/api/weshop/teamlist/getGoodsList?store_id="
+os.stoid+"&goodsidlist="+goodsidlist, {}).then(res => {
-
//如果拼单的数组为空的时候
var goodslist=res.data.data;
- if(!goodslist || goodslist.length==0){
- th.no_gid_set();
- }else{
+ if(goodslist && goodslist.length>0){
th.set_goods_list(g_id,goodslist);
}
@@ -98,14 +95,15 @@ Component({
},
no_gid_set(){
+ var th=this;
var url= "/api/weshop/teamlist/pageteam/2?page=1&pageSize=9";
getApp().request.promiseGet(url, {
data: {
store_id: os.stoid,is_end: 0,is_show: 1,
}
}).then(res => {
- if(res.data.code==0 && res.data.data.pageData && e.data.data.pageData.length>0){
- goodsidlist=res.data.data.pageData;
+ if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0){
+ var goodslist=res.data.data.pageData;
th.set_goods_list(null,goodslist);
}
})
@@ -157,6 +155,8 @@ Component({
var ee = ob;
// 获取当前时间，同时得到活动结束时间数组
var newTime = ut.gettimestamp();
+ this.setData({newTime:newTime});
+
var List = ee.data.goods_array;
if (List.length == 0) return false;
for (var j = 0; j < List.length; j++) {
diff --git a/components/diy_pingd_buy/diy_pingd_buy.wxml b/components/diy_pingd_buy/diy_pingd_buy.wxml
index 8bf21ee..fb31a7c 100644
--- a/components/diy_pingd_buy/diy_pingd_buy.wxml
+++ b/components/diy_pingd_buy/diy_pingd_buy.wxml
@@ -21,11 +21,10 @@
即将开始
-
-
+
+
火热进行
-
@@ -50,12 +49,17 @@
- {{aitem.ct_num}}人团
-
- 去参团
- 去开团
- 去开团
- 已抢光
+ {{aitem.ct_num}}人团
+
+
+ 已结束
+
+
+ 去参团
+ 去开团
+ 去开团
+ 已抢光
+
@@ -89,16 +93,21 @@
￥{{aitem.price}}
￥{{aitem.market_price}}
-
+
- {{aitem.djs.day}}天{{aitem.djs.hou}}时{{aitem.djs.min}}分{{aitem.djs.sec}}秒
+ {{aitem.djs.day}}天{{aitem.djs.hou}}时{{aitem.djs.min}}分{{aitem.djs.sec}}秒
-
- 去参团
- 去开团
- 去参团
- 已抢光
-
+
+
+
+ 已结束
+
+
+ 去参团
+ 去开团
+ 去参团
+ 已抢光
+
diff --git a/components/diy_pingd_buy/diy_pingd_buy.wxss b/components/diy_pingd_buy/diy_pingd_buy.wxss
index 2ca2b78..14e0da8 100644
--- a/components/diy_pingd_buy/diy_pingd_buy.wxss
+++ b/components/diy_pingd_buy/diy_pingd_buy.wxss
@@ -362,4 +362,5 @@ swiper {
display: flex;
align-items: center;
margin:5rpx 0rpx;
-}
\ No newline at end of file
+}
+.o1_right_p .wo_p.huise{ background-color: #eee;}
\ No newline at end of file
diff --git a/components/diy_seckill/diy_seckill.js b/components/diy_seckill/diy_seckill.js
index fa354bb..1cc16a8 100644
--- a/components/diy_seckill/diy_seckill.js
+++ b/components/diy_seckill/diy_seckill.js
@@ -78,9 +78,7 @@ Component({
//如果秒杀的数组为空的时候
var goodslist=res.data.data;
//就算是添加的活动已经过期，就要用最新的进行中活动
- if(!goodslist || goodslist.length==0) {
- th.no_gid_set();
- }else{
+ if(goodslist && goodslist.length>0) {
th.set_goods_list(g_id,goodslist);
}
});
@@ -151,6 +149,8 @@ Component({
var ee = ob;
// 获取当前时间，同时得到活动结束时间数组
var newTime = ut.gettimestamp();
+ this.setData({newTime:newTime});
+
var List = ee.data.goods_array;
if (List.length == 0) return false;
for (var j = 0; j < List.length; j++) {
diff --git a/components/diy_seckill/diy_seckill.wxml b/components/diy_seckill/diy_seckill.wxml
index 55fb885..789e7af 100644
--- a/components/diy_seckill/diy_seckill.wxml
+++ b/components/diy_seckill/diy_seckill.wxml
@@ -24,16 +24,26 @@
即将开始
-
-
- 火热进行
-
-
-
-
- 已抢光
-
-
+
+
+
+ 活动已结束
+
+
+
+
+
+ 火热进行
+
+
+
+
+ 已抢光
+
+
+
+
+
@@ -92,17 +102,25 @@
正在预热
-
-
- 我要抢
-
-
-
-
-
- 已抢光
-
-
+
+
+
+ 已结束
+
+
+
+
+
+ 我要抢
+
+
+
+
+
+ 已抢光
+
+
+
diff --git a/components/full_screen/full_screen.js b/components/full_screen/full_screen.js
index fedc5c2..7206499 100644
--- a/components/full_screen/full_screen.js
+++ b/components/full_screen/full_screen.js
@@ -15,36 +15,13 @@ Component({
},
pageLifetimes:{
- //要处理一下，游客登录后的界面的变化,主要还该是改变会员
- show: function () {
- var th=this;
- th.setData({sec_show:3});
- //--如果有全屏广告的时候--
- if(this.data.is_full_screen_show){
- //--定时关闭--
- th.data.full_screen=setInterval(function(){
- if(!th.data.sec_show) {
- clearInterval(th.data.full_screen);
- th.close_full_screen();
- return false;
- }
- th.data.sec_show--;
- th.setData({sec_show:th.data.sec_show});
- },1000)
- }
- },
hide: function() {
// 页面被隐藏
clearInterval(this.data.full_screen);
},
},
- properties: {
-
- },
- ready: function () {
- this.get_the_full_screen();
- },
+ properties: {},
methods: {
close_full_screen(){
this.setData({is_full_screen_show:0,sec_show:0,is_full_screen_men:0});
@@ -57,6 +34,7 @@ Component({
this.setData({is_full_screen_show:0,is_full_screen_men:0});
},
get_the_full_screen(){
+ if(this.data.full_ad) return false;
var th=this;
//获取全屏的广告
getApp().request.promiseGet("/api/weshop/ad/page?pid=1001&store_id=" + o.stoid,{
diff --git a/pages/index/index/index.js b/pages/index/index/index.js
index 81f8afa..417d268 100644
--- a/pages/index/index/index.js
+++ b/pages/index/index/index.js
@@ -206,10 +206,7 @@ Page({
}
})
-
-
-
-
+
},
//关闭新用户领取广告
close_disgraceful: function() {
@@ -229,7 +226,15 @@ Page({
getApp().requestCardNum(this);
}
- var th = this
+ var th = this
+ var show=getApp().globalData.isLoad_ad;
+ if(show){
+ var full_screen = this.selectComponent("#full_screen"); //组件的id
+ full_screen.get_the_full_screen();
+ }else{
+ getApp().globalData.isLoad_ad=1;
+ }
+
},
//当隐藏的时候就关闭计时器
onHide: function() {