diff --git a/components/diy_advertising/diy_advertising.wxss b/components/diy_advertising/diy_advertising.wxss index 31c43fa..5ca3b76 100644 --- a/components/diy_advertising/diy_advertising.wxss +++ b/components/diy_advertising/diy_advertising.wxss @@ -314,8 +314,7 @@ .swiper { height: auto; - width: 98%; - padding:0 7rpx; + width: 100%; padding-bottom: 7rpx; padding-top: 7rpx; /* background-color: palevioletred; */ diff --git a/components/diy_pingd_buy/diy_pingd_buy.js b/components/diy_pingd_buy/diy_pingd_buy.js index 3150a37..4b4ea0f 100644 --- a/components/diy_pingd_buy/diy_pingd_buy.js +++ b/components/diy_pingd_buy/diy_pingd_buy.js @@ -37,6 +37,20 @@ Component({ timer: null, iurl:o.imghost, }, + + pageLifetimes:{ + //要处理一下，游客登录后的界面的变化,主要还该是改变会员 + show: function () { + var th=this; + if(this.data.goods_array.length>0){ + th.data.timer = setInterval(function() { + th.countDown2(th); + }, 1000); + } + } + }, + + ready: function() { console.log("ready"); var g_id = this.data.object.data; @@ -55,50 +69,85 @@ Component({ app = getApp(), all_array = [], index = 0, goodsidlist=""; + + //-- 当是默认的调用的时候 -- + if(!g_id || g_id.length<=0 ){ + th.no_gid_set(); + }else{ + //--先把商品ID串起来-- + g_id.forEach(function(val, ind) { + var item = {}; + goodsidlist+=val.goodsid+","; + }) + goodsidlist= goodsidlist.substr(0,goodsidlist.length-1); - //--先把商品ID串起来-- - g_id.forEach(function(val, ind) { - var item = {}; - goodsidlist+=val.goodsid+","; - }) - goodsidlist= goodsidlist.substr(0,goodsidlist.length-1); + //--调用接口,读取拼单-- + app.request.promiseGet("/api/weshop/teamlist/getGoodsList?store_id=" + +os.stoid+"&goodsidlist="+goodsidlist, {}).then(res => { - //--调用接口,读取拼单-- - 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) return false; - - /*--商品队列按照添加的顺序排列--*/ - g_id.forEach(function(val, ind) { - goodslist.forEach(function (vy,indy) { - if(val.goodsid==vy.goods_id){ - all_array.push(vy); - } - }) - }) - if(all_array.length==0){ - all_array=goodslist; - } - - var arr = new Array(); - //--三个三个一组--- - for(var i=0;i< all_array.length;i+=3){ - arr.push(all_array.slice(i,i+3)); - } - /*--熏染到前台--*/ - th.setData({goods_array:arr}); - var newTime = ut.gettimestamp(); - th.setData({ newTime: newTime }); - - th.data.timer = setInterval(function() { - th.countDown2(th); - }, 1000); - }); + //如果拼单的数组为空的时候 + var goodslist=res.data.data; + if(!goodslist || goodslist.length==0){ + th.no_gid_set(); + }else{ + th.set_goods_list(g_id,goodslist); + } + + }); + } }, - //---小于10的格式化函数---- + + no_gid_set(){ + 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; + th.set_goods_list(null,goodslist); + } + }) + }, + + //设置商品列表 + set_goods_list:function(g_id,goodslist){ + var th=this,all_array=[]; + if(g_id){ + /*--商品队列按照添加的顺序排列--*/ + g_id.forEach(function(val, ind) { + goodslist.forEach(function (vy,indy) { + if(val.goodsid==vy.goods_id){ + all_array.push(vy); + //th.setData({goods_array:arr}); + } + }) + }) + }else{ + all_array=goodslist; + } + + if(all_array.length==0){ + all_array=goodslist; + } + + var arr = new Array(); + //--三个三个一组--- + for(var i=0;i< all_array.length;i+=3){ + arr.push(all_array.slice(i,i+3)); + } + /*--熏染到前台--*/ + th.setData({goods_array:arr}); + var newTime = ut.gettimestamp(); + th.setData({ newTime: newTime }); + + th.data.timer = setInterval(function() { + th.countDown2(th); + }, 1000); + }, + + //---小于10的格式化函数---- timeFormat: function(param) { return param < 10 ? '0' + param : param; }, diff --git a/components/diy_pingd_buy/diy_pingd_buy.wxml b/components/diy_pingd_buy/diy_pingd_buy.wxml index 5564c64..8bf21ee 100644 --- a/components/diy_pingd_buy/diy_pingd_buy.wxml +++ b/components/diy_pingd_buy/diy_pingd_buy.wxml @@ -1,5 +1,5 @@ - + diff --git a/components/diy_seckill/diy_seckill.js b/components/diy_seckill/diy_seckill.js index 069c855..fa354bb 100644 --- a/components/diy_seckill/diy_seckill.js +++ b/components/diy_seckill/diy_seckill.js @@ -36,6 +36,19 @@ Component({ imghost: os.imghost, timer: null, }, + + pageLifetimes:{ + //要处理一下，游客登录后的界面的变化,主要还该是改变会员 + show: function () { + var th=this; + if(this.data.goods_array.length>0){ + th.data.timer = setInterval(function() { + th.countDown2(th); + }, 1000); + } + } + }, + ready: function() { console.log("ready"); var g_id = this.data.object.data; @@ -50,66 +63,84 @@ Component({ // 这里是一个自定义方法 customMethod: function() {}, init: function(g_id) { - var th = this, app = getApp(),all_array = [], goodsidlist=""; - - //--先把商品ID串起来-- - g_id.forEach(function(val, ind) { - var item = {}; - goodsidlist+=val.goodsid+","; - }) - goodsidlist=ut.sub_last(goodsidlist); - - //--调用接口,读取秒杀-- - app.request.promiseGet("/api/ms/flash_sale/getGoodsList?store_id=" - +os.stoid+"&goodsidlist="+goodsidlist, {}).then(res => { - //如果秒杀的数组为空的时候 - - var goodslist=res.data.data; - if(!goodslist || goodslist.length==0) return false; - - // 判断火热，预热 - var newTime = ut.gettimestamp(); - th.setData({newTime:newTime}); - // for(var a=0;a< goodslist.length;a++){ - // var starTime=goodslist[a].start_time; - // var msStr=[]; - // console.log(2222222222) - // console.log(starTime+":"+newTime) - // if (starTime>newTime){ - // msStr.push() - // //th.setData({msText:'即将开始'}); - // } - // if (starTime0){ + //--先把商品ID串起来-- + g_id.forEach(function(val, ind) { + var item = {}; + goodsidlist+=val.goodsid+","; + }) + goodsidlist=ut.sub_last(goodsidlist); + + //--调用接口,读取秒杀-- + app.request.promiseGet("/api/ms/flash_sale/getGoodsList?store_id=" + +os.stoid+"&goodsidlist="+goodsidlist, {}).then(res => { + //如果秒杀的数组为空的时候 + var goodslist=res.data.data; + //就算是添加的活动已经过期，就要用最新的进行中活动 + if(!goodslist || goodslist.length==0) { + th.no_gid_set(); + }else{ + th.set_goods_list(g_id,goodslist); + } + }); + }else{ + th.no_gid_set(); + } }, + + //当是默认的情况 + no_gid_set(){ + getApp().request.promiseGet("/api/ms/flash_sale/spikepage?page=1&pageSize=9", + {isShowLoading:1,data:{store_id:os.stoid,is_end:0,is_show:1}} + ).then(res=>{ + if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0) { + goodsidlist=res.data.data.pageData; + th.set_goods_list(null,goodslist); + } + }); + }, + + //就算是添加的活动已经过期，就要用最新的活动 + set_goods_list(g_id,goodslist){ + // 判断火热，预热 + var newTime = ut.gettimestamp(),all_array = [],th=this; + th.setData({newTime:newTime}); + if(g_id){ + /*--商品队列按照添加的顺序排列--*/ + g_id.forEach(function(val, ind) { + goodslist.forEach(function (vy,indy) { + if(val.goodsid==vy.goods_id){ + all_array.push(vy); + //th.setData({goods_array:arr}); + } + }) + }) + }else{ + all_array=goodslist; + } + + + if(all_array.length==0){ + all_array=goodslist; + } + + var arr = new Array(); + //--三个三个一组--- + for(var i=0;i< all_array.length;i+=3){ + arr.push(all_array.slice(i,i+3)); + } + /*--熏染到前台--*/ + + th.setData({goods_array:arr}); + + th.data.timer = setInterval(function() { + th.countDown2(th); + }, 1000); + }, + + + //---小于10的格式化函数---- timeFormat: function(param) { return param < 10 ? '0' + param : param; diff --git a/components/diy_seckill/diy_seckill.wxml b/components/diy_seckill/diy_seckill.wxml index f5cee6e..55fb885 100644 --- a/components/diy_seckill/diy_seckill.wxml +++ b/components/diy_seckill/diy_seckill.wxml @@ -1,4 +1,4 @@ - + diff --git a/components/full_screen/full_screen.js b/components/full_screen/full_screen.js index 6a39979..fedc5c2 100644 --- a/components/full_screen/full_screen.js +++ b/components/full_screen/full_screen.js @@ -11,6 +11,7 @@ Component({ full_ad:null, //全屏广告 url:o.imghost, full_screen:0, + is_full_screen_men:1, }, pageLifetimes:{ @@ -46,14 +47,14 @@ Component({ }, methods: { close_full_screen(){ - this.setData({is_full_screen_show:0,sec_show:0}); + this.setData({is_full_screen_show:0,sec_show:0,is_full_screen_men:0}); }, //-- 跳转到满屏广告的链接 -- go_full_ad(){ if(!this.data.full_ad) return false; if(!this.data.full_ad.ad_weapplink) return false; getApp().goto(this.data.full_ad.ad_weapplink); - this.setData({is_full_screen_show:0}); + this.setData({is_full_screen_show:0,is_full_screen_men:0}); }, get_the_full_screen(){ var th=this; @@ -65,7 +66,7 @@ Component({ if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0){ th.setData({ is_full_screen_show:1, - full_ad:res.data.data.pageData[0] + full_ad:res.data.data.pageData[0], }) //--定时关闭-- @@ -78,7 +79,16 @@ Component({ th.data.sec_show--; th.setData({sec_show:th.data.sec_show}); },1000) - } + + + setTimeout(function(){ + th.setData({is_full_screen_men:0}); + },1000) + }else{ + th.setData({ + is_full_screen_men:0 + }) + } }) } }, diff --git a/components/full_screen/full_screen.wxml b/components/full_screen/full_screen.wxml index ce01065..8feebdd 100644 --- a/components/full_screen/full_screen.wxml +++ b/components/full_screen/full_screen.wxml @@ -1,4 +1,5 @@ + 跳过 {{sec_show}} diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml index 15b276a..6d5db66 100644 --- a/pages/index/index/index.wxml +++ b/pages/index/index/index.wxml @@ -399,8 +399,7 @@ - - +