diff --git a/pages/activity/pind_list/pind_list.js b/pages/activity/pind_list/pind_list.js index 3ee7661..f6e3289 100644 --- a/pages/activity/pind_list/pind_list.js +++ b/pages/activity/pind_list/pind_list.js @@ -64,7 +64,7 @@ Page({ let min = parseInt(time % (60 * 60 * 24) % 3600 / 60); let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60); obj = { - day: this.timeFormat(day), hou: this.timeFormat(hou), min: this.timeFormat(min), sec: this.timeFormat(sec) + day: this.timeFormat(day), hou: this.timeFormat(hou), min: this.timeFormat(min), sec: this.timeFormat(sec),hide:1 } }else{ //活动已结束,全部设置为'00' @@ -105,7 +105,7 @@ Page({ alllist.push(plist[i]); } e.data.currentPage++; - console.log("拼团列表7777777777777777", alllist); + th.setData({goodlist:alllist,isshow:1}); }, diff --git a/pages/activity/pind_list/pind_list.wxml b/pages/activity/pind_list/pind_list.wxml index 76ebc23..e19716e 100644 --- a/pages/activity/pind_list/pind_list.wxml +++ b/pages/activity/pind_list/pind_list.wxml @@ -6,7 +6,7 @@ - + @@ -41,7 +41,7 @@ {{item.djs.min}}{{item.djs.sec}} - + diff --git a/pages/activity/pind_list/pind_list.wxss b/pages/activity/pind_list/pind_list.wxss index 61f64ba..8fb81f6 100644 --- a/pages/activity/pind_list/pind_list.wxss +++ b/pages/activity/pind_list/pind_list.wxss @@ -69,7 +69,7 @@ page{ } .goods-name { - max-height: 60rpx; + height: 60rpx; margin-bottom: 18rpx; font-size: 27rpx; color: #555; diff --git a/pages/activity/seckill_list/seckill_list.js b/pages/activity/seckill_list/seckill_list.js index d96241a..4e11cc2 100644 --- a/pages/activity/seckill_list/seckill_list.js +++ b/pages/activity/seckill_list/seckill_list.js @@ -58,11 +58,11 @@ Page({ let min = parseInt(time % (60 * 60 * 24) % 3600 / 60); let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60); obj = { - day: this.timeFormat(day), hou: this.timeFormat(hou), min: this.timeFormat(min), sec: this.timeFormat(sec) + day: this.timeFormat(day), hou: this.timeFormat(hou), min: this.timeFormat(min), sec: this.timeFormat(sec), hide: 1 } }else{ //活动已结束,全部设置为'00' - obj = { day: '00', hou: '00', min: '00', sec: '00' } + obj = { day: '00', hou: '00', min: '00', sec: '00' } } var txt ="goodlist["+i+"].djs"; th.setData({ [txt]: obj}); @@ -80,6 +80,7 @@ Page({ {isShowLoading:1,data:{store_id:os.stoid,timetype:th.data.type,is_end:0,is_show:1}} ).then(res=>{ plist=res.data.data.pageData; + console.log("是什么即将开始",plist); }); if(plist.length<=0){ diff --git a/pages/activity/seckill_list/seckill_list.wxml b/pages/activity/seckill_list/seckill_list.wxml index f248cdd..f9f8504 100644 --- a/pages/activity/seckill_list/seckill_list.wxml +++ b/pages/activity/seckill_list/seckill_list.wxml @@ -6,7 +6,7 @@ - + - 已抢{{item.buy_num}}件 + 已抢{{item.buy_num}}件 diff --git a/pages/activity/seckill_list/seckill_list.wxss b/pages/activity/seckill_list/seckill_list.wxss index b11d0fd..196e138 100644 --- a/pages/activity/seckill_list/seckill_list.wxss +++ b/pages/activity/seckill_list/seckill_list.wxss @@ -71,7 +71,7 @@ margin: auto; } .goods-name { - max-height: 60rpx; + height: 60rpx; font-size: 27rpx; color: #555; line-height: 30rpx; diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml index ac3edfe..f194b81 100644 --- a/pages/index/index/index.wxml +++ b/pages/index/index/index.wxml @@ -24,7 +24,7 @@ - + @@ -147,7 +147,7 @@ - {{aitem.title}} + {{aitem.title}} {{aitem.price}} ¥{{aitem.market_price}} diff --git a/pages/index/index/index.wxss b/pages/index/index/index.wxss index bcda882..0b28386 100644 --- a/pages/index/index/index.wxss +++ b/pages/index/index/index.wxss @@ -61,7 +61,7 @@ left: 10%; .swiper_box { width: 100%; - height: 380rpx; + } .s_prom{ width: 100%; @@ -74,7 +74,6 @@ left: 10%; .slide-image{ width: 100%; - height: 100%; display: inline-block; overflow: hidden; border-radius: 14rpx; @@ -257,11 +256,11 @@ left: 10%; .seckill-list view { - height: 45rpx; + height: 62rpx; padding: 0 10rpx; - line-height: 25rpx; + line-height: 33rpx; overflow: hidden; - font-size: 30rpx; + font-size: 28rpx; } .seckill-list view.imgview{