diff --git a/app.json b/app.json index 0c617c1..01f58d2 100644 --- a/app.json +++ b/app.json @@ -1,6 +1,7 @@ { "pages": [ "pages/index/index", + "pages/main/index", "index/index", "index/searchbar", "index/passCar", diff --git a/index/index.js b/index/index.js index 29f0198..8b35654 100644 --- a/index/index.js +++ b/index/index.js @@ -48,6 +48,7 @@ Page({ product: imgurl.product.url, barginicon: imgurl.barginicon.url, pintuan: imgurl.pintuan.url, + live: imgurl.live.url, duihuan: imgurl.duihuan.url, market: app.globalData.market, list: [], diff --git a/index/index.wxml b/index/index.wxml index d6bb342..87f0fae 100644 --- a/index/index.wxml +++ b/index/index.wxml @@ -39,18 +39,18 @@ 拼团 + + + 直播 + 消费卡 - - - 直播 - - + 积分商城 @@ -103,6 +103,9 @@ + + + diff --git a/index/index.wxss b/index/index.wxss index 76ccbca..ceceed2 100644 --- a/index/index.wxss +++ b/index/index.wxss @@ -42,7 +42,7 @@ page { .game-entry { position: fixed; right: 27rpx; - bottom:323rpx; + bottom:443rpx; width: 120rpx; margin: 37rpx auto 0; z-index: 10; diff --git a/index/user.wxml b/index/user.wxml index 789cb1f..92824ba 100644 --- a/index/user.wxml +++ b/index/user.wxml @@ -55,15 +55,6 @@ - - - - 直播 - - - - - diff --git a/utils/imgurl.js b/utils/imgurl.js index 7c17ea3..be7f628 100644 --- a/utils/imgurl.js +++ b/utils/imgurl.js @@ -732,5 +732,9 @@ module.exports = { 'down':{ 'url' : baseUrl + 'down.png', 'name':'' + }, + 'live': { + 'url': baseUrl + 'live.png', + 'name': '' } } \ No newline at end of file