From f903eb5b1b7317f49b9e07f3e284567df42344c9 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Tue, 19 Mar 2019 19:35:57 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=A6=96=E9=A1=B5ui=E7=9A=84=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ext.json | 2 +- pages/main/bargain/index.wxml | 3 +-- pages/main/bargain/index.wxss | 24 ++++++++++++++++-------- pages/main/index.js | 12 ++++++++++++ pages/main/index.wxml | 5 ++++- pages/main/index.wxss | 9 ++++++++- pages/main/spellGroup/index.js | 4 ++-- pages/main/spellGroup/index.wxml | 4 ++-- pages/main/spellGroup/index.wxss | 17 ++++++++++------- pages/rushToBuy/index.json | 2 +- utils/imgurl.js | 8 ++++++++ 11 files changed, 65 insertions(+), 25 deletions(-) diff --git a/ext.json b/ext.json index 3e6d3cc..e9f7740 100644 --- a/ext.json +++ b/ext.json @@ -4,7 +4,7 @@ "ext": { "weappId": "wxea71200db93d756b", "name": "富茂客官开发", - "appVersion": "C.3.5.8", + "appVersion": "C.3.5.9", "attr": { "ifHaveCarModular": "1", "etcpversion": "release", diff --git a/pages/main/bargain/index.wxml b/pages/main/bargain/index.wxml index e5cd313..cf6d428 100644 --- a/pages/main/bargain/index.wxml +++ b/pages/main/bargain/index.wxml @@ -6,8 +6,7 @@ {{item.title}} - - 可砍至{{item.salePriceStr}}元 + 可砍至{{item.salePriceStr}}元 diff --git a/pages/main/bargain/index.wxss b/pages/main/bargain/index.wxss index c18f3a5..566ad1b 100644 --- a/pages/main/bargain/index.wxss +++ b/pages/main/bargain/index.wxss @@ -1,14 +1,16 @@ .index-rushToBuy { width: 100%; font-family: PingFangSC-Semibold; + height:356rpx; + background:linear-gradient(94deg,rgba(255,143,0,1) 0%,rgba(255,87,0,1) 100%); } .index-rushToBuy-title { position: relative; font-size: 34rpx; - color: #000000; + color: #fff; letter-spacing: 1.16rpx; - padding-top: 34rpx; + padding-top: 20rpx; padding-left: 30rpx; } .useprice{ @@ -17,19 +19,20 @@ .index-rushToBuy-title text{ float: right; margin-right: 53rpx; - color: #a8adb4; - font-size: 28rpx; + color: #fff; + font-size: 24rpx; margin-top: 8rpx; } .index-rushToBuy-title image{ position: absolute; right: 18rpx; width: 20px; - top: 44rpx; + top: 28rpx; } .index-scroll-view { width: 100%; white-space: nowrap; + background:linear-gradient(94deg,rgba(255,143,0,1) 0%,rgba(255,87,0,1) 100%); } .index-scroll-view .commodity { @@ -38,8 +41,9 @@ margin-right: 0; position: relative; background: #fff; + padding: 12rpx 12rpx 0; /* border: 1rpx solid #dddee1; */ - width: 263rpx; + width: 205rpx; box-shadow: 0 0 10px 0 rgba(211,211,211,0.30); border-radius: 10rpx; overflow: hidden; @@ -49,8 +53,10 @@ } .commodity-img{ display: block; - width: 100%; - height:200rpx; + width: 205rpx; + height: 160rpx; + background:rgba(255,255,255,1); + border-radius:10rpx; } .index-scroll-view .commodity-info { @@ -59,6 +65,8 @@ } .index-scroll-view .commodity-info-name { + white-space: nowrap; + text-overflow: ellipsis; font-size: 30rpx; color: #000000; letter-spacing: 0.7rpx; diff --git a/pages/main/index.js b/pages/main/index.js index 94405d2..e864042 100644 --- a/pages/main/index.js +++ b/pages/main/index.js @@ -14,6 +14,8 @@ Page({ icon0006: imgurl.icon0006.url, icon0007: imgurl.icon0007.url, icon0008: imgurl.icon0008.url, + rushtobuy: imgurl.rushtobuy.url, + wmcard: imgurl.wmcard.url, market: app.globalData.market, list: [], loading: true, @@ -125,6 +127,16 @@ Page({ swiperCurrent: e.detail.current }); }, + rushtobuy:function(){ + wx.navigateTo({ + url: '/pages/rushToBuy/index', + }) + }, + gotodiscountcard:function(){ + wx.navigateTo({ + url: '/pages/discountCardList/discountCardList', + }) + }, gotogame: function() { let that = this; Http.post({ diff --git a/pages/main/index.wxml b/pages/main/index.wxml index 6fed809..09bee75 100644 --- a/pages/main/index.wxml +++ b/pages/main/index.wxml @@ -47,7 +47,10 @@ - + + + + diff --git a/pages/main/index.wxss b/pages/main/index.wxss index d3ecec2..10718a6 100644 --- a/pages/main/index.wxss +++ b/pages/main/index.wxss @@ -47,12 +47,19 @@ page { display: block; width: 100%; } - +.rushtobuyimgs{ + padding: 0 30rpx; +} +.rushtobuyimgs image{ + width: 335rpx; + height: 161rpx; +} .section { padding: 0 20rpx; justify-content: space-around; text-align: center; margin-top: 25rpx; + margin-bottom: 30rpx; } .section >view{ width: 25%; diff --git a/pages/main/spellGroup/index.js b/pages/main/spellGroup/index.js index a759e79..b7faf27 100644 --- a/pages/main/spellGroup/index.js +++ b/pages/main/spellGroup/index.js @@ -47,8 +47,8 @@ Component({ url: config.api.couponChannelList, data: { pageNum: 1, - pageSize: 5, - targetAd: 2 + pageSize: 2, + targetAd: 7 } }).then(res => { this.setData({ diff --git a/pages/main/spellGroup/index.wxml b/pages/main/spellGroup/index.wxml index 2896723..9a59266 100644 --- a/pages/main/spellGroup/index.wxml +++ b/pages/main/spellGroup/index.wxml @@ -8,8 +8,8 @@ {{item.title}} - ¥{{item.salePriceStr}} - ¥{{item.priceStr}} + {{item.salePriceStr}}元 + {{item.priceStr}}元 diff --git a/pages/main/spellGroup/index.wxss b/pages/main/spellGroup/index.wxss index 2051832..e2d372e 100644 --- a/pages/main/spellGroup/index.wxss +++ b/pages/main/spellGroup/index.wxss @@ -1,6 +1,7 @@ .index-rushToBuy { width: 100%; font-family: PingFangSC-Semibold; + margin-top: 26rpx; } .index-rushToBuy-title { @@ -16,14 +17,14 @@ float: right; margin-right: 53rpx; color: #a8adb4; - font-size: 28rpx; + font-size: 24rpx; margin-top: 8rpx; } .index-rushToBuy-title image{ position: absolute; right: 18rpx; width: 20px; - top: 44rpx; + top: 40rpx; } .index-scroll-view { width: 100%; @@ -37,8 +38,8 @@ position: relative; background: #fff; /* border: 1rpx solid #dddee1; */ - width: 355rpx; - box-shadow: 0 0 10px 0 rgba(211,211,211,0.30); + width: 334rpx; + /* box-shadow: 0 0 10px 0 rgba(211,211,211,0.30); */ border-radius: 10rpx; overflow: hidden; } @@ -46,9 +47,11 @@ margin-right: 30rpx; } .commodity-img{ -display: block; - width: 355rpx; - height: 213rpx; + display: block; + width: 329rpx; + height: 200rpx; + border-radius: 10rpx; + border: 1px solid #ebeced; } .index-scroll-view .commodity-info { diff --git a/pages/rushToBuy/index.json b/pages/rushToBuy/index.json index fc70d1c..823c0f3 100644 --- a/pages/rushToBuy/index.json +++ b/pages/rushToBuy/index.json @@ -1,5 +1,5 @@ { "usingComponents": { }, - "navigationBarTitleText": "限时抢购" + "navigationBarTitleText": "限时秒杀" } \ No newline at end of file diff --git a/utils/imgurl.js b/utils/imgurl.js index ec4a212..66abe21 100644 --- a/utils/imgurl.js +++ b/utils/imgurl.js @@ -412,4 +412,12 @@ module.exports = { 'url': baseUrl + 'orderGroupFail.png', 'name': '拼团失败' }, + 'wmcard': { + 'url': baseUrl + 'wmcard.png', + 'name': '首页优惠卡' + }, + 'rushtobuy': { + 'url': baseUrl + 'rushtobuy.png', + 'name': '首页立即抢购' + } } \ No newline at end of file