diff --git a/pages/main/bargain/index.wxml b/pages/main/bargain/index.wxml index cf6d428..f050ac0 100644 --- a/pages/main/bargain/index.wxml +++ b/pages/main/bargain/index.wxml @@ -1,5 +1,5 @@ - 砍价专场更多砍价 + 砍价专场更多砍价>> diff --git a/pages/main/bargain/index.wxss b/pages/main/bargain/index.wxss index 566ad1b..d2a4154 100644 --- a/pages/main/bargain/index.wxss +++ b/pages/main/bargain/index.wxss @@ -60,14 +60,14 @@ } .index-scroll-view .commodity-info { - padding:10rpx 20rpx; + padding:10rpx 0; overflow: hidden; } .index-scroll-view .commodity-info-name { - white-space: nowrap; - text-overflow: ellipsis; - font-size: 30rpx; + white-space: nowrap; + text-overflow: ellipsis; + font-size: 24rpx; color: #000000; letter-spacing: 0.7rpx; overflow: hidden; @@ -81,7 +81,7 @@ } .index-scroll-view .commodity-info-price-p { - font-size: 30rpx; + font-size: 24rpx; color: #f96563; line-height: 36rpx; } diff --git a/pages/main/index.js b/pages/main/index.js index e864042..ad6aad2 100644 --- a/pages/main/index.js +++ b/pages/main/index.js @@ -6,6 +6,8 @@ let app = getApp(); Page({ data: { newUrl: "", + usergift: imgurl.usergift.url, + guanbi1: imgurl.guanbi1.url, icon0001: imgurl.icon0001.url, icon0002: imgurl.icon0002.url, icon0003: imgurl.icon0003.url, @@ -35,6 +37,11 @@ Page({ display1:'none', page: 1 // 刷新进入页面时已经加载了第一页数据,onReachBottom时 page++,从第2页开始加载 }, + close:function(){ + this.setData({ + showIf:false + }) + }, // 我的卡包 mycard:function(){ wx.navigateTo({ diff --git a/pages/main/index.wxml b/pages/main/index.wxml index 09bee75..63e167f 100644 --- a/pages/main/index.wxml +++ b/pages/main/index.wxml @@ -2,22 +2,6 @@ - - - - 门店 @@ -42,9 +26,10 @@ - + - + + diff --git a/pages/main/index.wxss b/pages/main/index.wxss index 10718a6..3b0364a 100644 --- a/pages/main/index.wxss +++ b/pages/main/index.wxss @@ -37,8 +37,8 @@ page { .game-entry { position: fixed; right: 0; - top:300rpx; - width: 170rpx; + bottom:200rpx; + width: 160rpx; margin: 37rpx auto 0; z-index: 10; } diff --git a/pages/main/spellGroup/index.js b/pages/main/spellGroup/index.js index b7faf27..0ea1dde 100644 --- a/pages/main/spellGroup/index.js +++ b/pages/main/spellGroup/index.js @@ -47,7 +47,7 @@ Component({ url: config.api.couponChannelList, data: { pageNum: 1, - pageSize: 2, + pageSize: 4, targetAd: 7 } }).then(res => { diff --git a/pages/main/spellGroup/index.wxml b/pages/main/spellGroup/index.wxml index 9a59266..b5065bf 100644 --- a/pages/main/spellGroup/index.wxml +++ b/pages/main/spellGroup/index.wxml @@ -1,5 +1,5 @@ - 拼团专场更多拼团 + 拼团专场更多拼团> diff --git a/pages/main/spellGroup/index.wxss b/pages/main/spellGroup/index.wxss index e2d372e..ba29f14 100644 --- a/pages/main/spellGroup/index.wxss +++ b/pages/main/spellGroup/index.wxss @@ -55,12 +55,12 @@ } .index-scroll-view .commodity-info { - padding:10rpx 20rpx; + padding:10rpx 0; overflow: hidden; } .index-scroll-view .commodity-info-name { - font-size: 30rpx; + font-size: 24rpx; color: #000000; letter-spacing: 0.7rpx; overflow: hidden; @@ -74,7 +74,7 @@ } .index-scroll-view .commodity-info-price-p { - font-size: 30rpx; + font-size: 24rpx; color: #f96563; line-height: 36rpx; } diff --git a/utils/imgurl.js b/utils/imgurl.js index 66abe21..54f2b7a 100644 --- a/utils/imgurl.js +++ b/utils/imgurl.js @@ -16,6 +16,14 @@ module.exports = { 'url': baseUrl + 'addr-white.png', 'name': '' }, + 'guanbi1': { + 'url': baseUrl + 'guanbi1.png', + 'name': '首页游戏的关闭按钮' + }, + 'usergift': { + 'url': baseUrl + 'usergift.gif', + 'name': '首页悬浮游戏入口' + }, 'addr': { 'url': baseUrl + 'addr.png', 'name': ''