diff --git a/components/coupons/index.wxml b/components/coupons/index.wxml index cde635a..27b2b10 100644 --- a/components/coupons/index.wxml +++ b/components/coupons/index.wxml @@ -21,18 +21,18 @@ {{data.subTitle}} - {{data.salePriceStr}} - 抢购价{{data.salePriceStr}} - 可砍至{{data.salePriceStr}} - 拼团价{{data.salePriceStr}} + ¥{{data.salePriceStr}} + 抢购价¥{{data.salePriceStr}} + 可砍至¥{{data.salePriceStr}} + 拼团价¥{{data.salePriceStr}} - {{data.priceStr}}元 + ¥{{data.priceStr}} {{data.priceStr}}小时 - {{data.priceStr}}元 + ¥{{data.priceStr}} {{data.priceStr}}小时 diff --git a/components/coupons/index.wxss b/components/coupons/index.wxss index 892df9b..2ddd3a0 100644 --- a/components/coupons/index.wxss +++ b/components/coupons/index.wxss @@ -2,9 +2,10 @@ .coupons { position: relative; - width: 335rpx; + width: 346rpx; display: inline-block; overflow: hidden; + border-radius:12rpx; } .coupons-border { @@ -17,15 +18,17 @@ } .coupons-img { - border-radius: 10rpx; + /* border-radius: 10rpx; */ + } .coupons-img image { display: block; - width: 335rpx; - height: 203rpx; - border-top-left-radius: 10rpx; - border-top-right-radius: 10rpx; + width: 300rpx; + height: 176rpx; + margin: 20rpx auto 0; + /* border-top-left-radius: 10rpx; + border-top-right-radius: 10rpx; */ } .coupons-info { @@ -36,8 +39,8 @@ } .coupons-info-name { - font-size: 28rpx; - color: #333; + font-size: 30rpx; + color: #3C3C3C; letter-spacing: 0; line-height: 38rpx; } @@ -55,18 +58,22 @@ display: block; font-size: 50rpx; color: #ff4949; + margin-bottom: 26rpx; } .price { - font-size: 34rpx; + font-size: 40rpx; font-family: PingFang-SC-Bold; font-weight: bold; - color: rgba(255, 50, 50, 1); - line-height: 44rpx; + color: #FD782D; + /* line-height: 44rpx; */ margin-left: 16rpx; - padding-top: 16rpx; + /* padding-top: 16rpx; */ +} +.rmb{ + font-size: 24rpx!important; + margin-right: 4rpx!important; } - .tit { overflow: hidden; white-space: nowrap; @@ -106,12 +113,12 @@ .coupons-btn { position: absolute; - bottom: 0; - right: 0; + bottom: 16rpx; + right: 24rpx; } .coupons-btn-gm { - border-radius: 10px 0px 5px 0px !important; + border-radius: 10px!important; margin: 0 !important; padding: 0 !important; font-size: 26rpx; @@ -120,7 +127,7 @@ height: 51rpx !important; width: 100rpx !important; line-height: 51rpx !important; - background: #af6e34 !important; + background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%)!important; } .coupons-btn-gms { @@ -144,6 +151,7 @@ color: #999; overflow: hidden; height: 24rpx; + width: 65%; padding-left: 10rpx; line-height: 24rpx; white-space: nowrap; @@ -265,6 +273,8 @@ scroll-view { } .navigator { display: inline-block; + background: #fff; + border-radius: 12rpx; } .navigator:nth-of-type(2n+1) { diff --git a/dist/tab/index.wxss b/dist/tab/index.wxss index 29b9b67..ce9e7ca 100644 --- a/dist/tab/index.wxss +++ b/dist/tab/index.wxss @@ -26,16 +26,18 @@ } .i-tabs-tab-title { - font-size: 30rpx; + font-size: 26rpx; line-height: 30rpx; text-align: center; box-sizing: border-box; - color: #3C3C3C; + color: #A6A6A6; } .i-tabs-tab-title-current { - color: #FD782D; + color: #3C3C3C; font-size: 30rpx; + font-weight: 500; + font-family:PingFangSC-Medium; } .i-tabs-tab-scroll { diff --git a/dist/tabs/index.wxss b/dist/tabs/index.wxss index 6e228c2..69fc772 100644 --- a/dist/tabs/index.wxss +++ b/dist/tabs/index.wxss @@ -8,7 +8,7 @@ justify-content: space-around; align-items: center; -webkit-box-align: center; - background: #fff + /* background: #fff */ } .i-tabs::after { diff --git a/pages/main/coupons/index.wxss b/pages/main/coupons/index.wxss index f78bc59..c2e73bc 100644 --- a/pages/main/coupons/index.wxss +++ b/pages/main/coupons/index.wxss @@ -2,7 +2,7 @@ .index-coupons { padding: 0 30rpx; margin-top: 40rpx; - background:linear-gradient(0deg,rgba(235,235,235,1) 0%,rgba(255,255,255,0.8) 100%); + /* background:linear-gradient(0deg,rgba(235,235,235,1) 0%,rgba(255,255,255,0.8) 100%); */ } .loading { text-align: center; @@ -14,7 +14,7 @@ .coupons c-coupons{ width: 335rpx; height: 354rpx; - margin-bottom: 22rpx; + margin-bottom: 34rpx; } .coupons c-coupons:nth-of-type(2n+1){ float: left; diff --git a/pages/main/index.js b/pages/main/index.js index 6027467..75f08ec 100644 --- a/pages/main/index.js +++ b/pages/main/index.js @@ -8,6 +8,12 @@ Page({ data: { newUrl: "", cover: "", + kanjia:imgurl.kanjia.url, + pintuan: imgurl.pintuan.url, + xiaofeika: imgurl.xiaofeika.url, + xingyun: imgurl.xingyun.url, + jfshangcheng: imgurl.jfshangcheng.url, + toutiao: imgurl.toutiao.url, usergift: imgurl.usergift.url, guanbi1: imgurl.guanbi1.url, icon0001: imgurl.icon0001.url, @@ -294,6 +300,32 @@ Page({ url: '/pages/czdetail/czdetail', }) }, + gotoBargain: function () { + wx.navigateTo({ + url: '/pages/bargain/bargain', + }) + }, + gotoSpellGroup: function () { + wx.navigateTo({ + url: '/pages/spellGroup/spellGroup', + }) + }, + gotoCard: function () { + wx.navigateTo({ + url: '/pages/discountCardList/discountCardList', + }) + }, + gotoGame: function () { + wx.navigateTo({ + url: '/pages/game/index', + }) + }, + gotoJfsc: function () { + wx.navigateTo({ + url: '/pages/integralmall/index', + }) + }, + /** * * @param {code,page} diff --git a/pages/main/index.wxml b/pages/main/index.wxml index d988dc5..102a124 100644 --- a/pages/main/index.wxml +++ b/pages/main/index.wxml @@ -5,8 +5,10 @@ - - {{levelName}} + + + {{levelName}} + @@ -25,7 +27,6 @@ - @@ -34,7 +35,36 @@ - + + + + 砍价 + + + + 拼团 + + + + 消费卡 + + + + 幸运卡牌 + + + + 积分商城 + + + + + + + + 今日好货推荐,满1000减200元… + 抢购 + diff --git a/pages/main/index.wxss b/pages/main/index.wxss index 947613a..3dd865c 100644 --- a/pages/main/index.wxss +++ b/pages/main/index.wxss @@ -55,7 +55,7 @@ page { .userinfo{ position:relative; - margin: 0 auto 30rpx; + margin: 0 0 30rpx 40rpx; width: 690rpx; /* padding: 0 0 20rpx; */ height: 96rpx; @@ -112,15 +112,14 @@ page { bottom: 0; z-index: 1000; background: rgba(0, 0, 0, 0.6); + } .qrcode image { - position: absolute; + /* position: absolute; top: 0; - bottom: 0; - right: 20rpx; - margin: auto; - width: 84rpx; + bottom: 0; */ + margin: 15rpx 20rpx 15rpx; z-index:100; } @@ -202,9 +201,9 @@ page { margin: auto; } .user-avatar open-data { -display:block; -width:100%; -height:100%; + display:block; + width:100%; + height:100%; } .user-data { margin-left: 116rpx; @@ -216,10 +215,29 @@ height:100%; margin-top: 16rpx; margin-bottom: 26rpx; } +.user-data open-data{ + float: left; +} +.chengzhangBox{ + width:70rpx; + height:32rpx; + background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); + border-radius:9px 9px 9px 0px; + font-family:PingFangSC-Regular; + font-weight:400; + color:rgba(255,255,255,1); + line-height:30rpx; + text-align: center; + vertical-align: middle; + float: left; + margin-top: 8rpx; + margin-left: 8rpx; +} .chengzhang { - font-size: 29rpx; + font-size: 22rpx; font-weight: 400; - color: #AF6E34; + color: #FFFFFF; + margin-left: 4rpx; } .integral{ margin-left: 70rpx; @@ -242,6 +260,8 @@ height:100%; font-size: 24rpx; color: #999999; line-height: 12rpx; + float: left; + margin-top: 10rpx; } .view>.score{ margin-left:9rpx; @@ -251,11 +271,15 @@ height:100%; font-family:PingFang-SC-Bold; } .qrcode{ - width: 84rpx; - height: 84rpx; + width: 106rpx; + height: 96rpx; + background: #FFF; + margin-left: 20rpx; + border-radius:12rpx; } .qrcodeimg{ - width: 100%; + width: 68rpx!important; + height: 68rpx!important; } .leftimg{ position: absolute; @@ -318,16 +342,79 @@ height:100%; } .remainchengzhangzhi{ display: block; - color: #b2743d; + color: #A6A6A6; font-size: 22rpx; margin-top: 5rpx; line-height: 14rpx; float: left; + margin: 0 10rpx; } progress{ - display:inline-block; - width:222rpx; + width:190rpx; border-radius:60rpx; overflow:hidden; float: left; +} +.channelBox{ + width:688rpx; + height: 220rpx; + margin:0 auto; + display: flex; + justify-content: space-between; +} +.kjBox{ + width: 104rpx; + height: 148rpx; + font-size: 24rpx; + color: #A6A6A6; + margin-top: 50rpx; + text-align: center; +} +.kjBox image{ + width: 104rpx; + height: 104rpx; +} +.toutiao{ + width:688rpx; + height: 82rpx; + line-height: 82rpx; + margin:0 auto; + background: #FAFBFD; + box-shadow:0px 6rpx 16rpx 0px rgba(236,238,243,1); + border-radius:12rpx; +} +.toutiao text{ + font-size:26rpx; + font-family:PingFangSC-Regular; + font-weight:400; + color:rgba(60,60,60,1); + float: left; +} +.toutiao .imgBox{ + width: 64rpx; + height: 64rpx; + float: left; + margin:5rpx 0 5rpx 20rpx; +} +.toutiao image{ + width: 48rpx; + height: 38rpx; + margin: auto; +} +.toutiao .qg{ + width: 80rpx; + height: 44rpx; + line-height: 44rpx; + border-radius:18rpx; + border:2rpx solid #FD782D; + float: right; + text-align: center; + margin: 20rpx 20rpx 20rpx 0; +} +.toutiao .qg>text{ + width: 100%; + font-size:24rpx; + font-family:PingFangSC-Medium; + font-weight:500; + color:#FD782D; } \ No newline at end of file diff --git a/utils/imgurl.js b/utils/imgurl.js index 0e45e1e..229deb2 100644 --- a/utils/imgurl.js +++ b/utils/imgurl.js @@ -612,5 +612,29 @@ module.exports = { 'gray': { 'url': baseUrl + "gray.png", 'name': '积分商城' - } + }, + 'kanjia': { + 'url': baseUrl + "kanjia.png", + 'name': '砍价' + }, + 'pintuan': { + 'url': baseUrl + "pintuan.png", + 'name': '拼团' + }, + 'xiaofeika': { + 'url': baseUrl + "xiaofeika.png", + 'name': '消费卡' + }, + 'xingyun': { + 'url': baseUrl + "xingyunkapai.png", + 'name': '幸运卡牌' + }, + 'jfshangcheng': { + 'url': baseUrl + "jifenshangcheng.png", + 'name': '积分商城' + }, + 'toutiao': { + 'url': baseUrl + "toutiao.png", + 'name': '' + }, } \ No newline at end of file