From e57abadd00149d97a95f0c1d7c71174591354cbe Mon Sep 17 00:00:00 2001 From: hurui Date: Thu, 1 Aug 2019 17:39:27 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A0=8D=E4=BB=B7=E8=AF=A6=E6=83=85][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=A0=B7=E5=BC=8F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bargain/bargainDatail/bargainDatail.wxml | 4 +- .../bargain/bargainDatail/bargainDatail.wxss | 47 ++++++++++--------- pages/main/index.wxml | 2 +- pages/main/index.wxss | 21 +++++---- pages/user/index.wxml | 4 +- pages/user/index.wxss | 2 +- 6 files changed, 44 insertions(+), 36 deletions(-) diff --git a/pages/bargain/bargainDatail/bargainDatail.wxml b/pages/bargain/bargainDatail/bargainDatail.wxml index ebd0995..9921f7c 100644 --- a/pages/bargain/bargainDatail/bargainDatail.wxml +++ b/pages/bargain/bargainDatail/bargainDatail.wxml @@ -1,4 +1,4 @@ - + @@ -14,7 +14,7 @@ 已砍 {{already}}元 还剩 {{remain}}元 - + 还剩 {{day}}天:{{hour}}:{{min}}:{{sec}} 结束 diff --git a/pages/bargain/bargainDatail/bargainDatail.wxss b/pages/bargain/bargainDatail/bargainDatail.wxss index c073a9a..e2533e0 100644 --- a/pages/bargain/bargainDatail/bargainDatail.wxss +++ b/pages/bargain/bargainDatail/bargainDatail.wxss @@ -1,8 +1,8 @@ page{ height: auto; overflow: auto; - background: #FF6F03; - background-image: url('https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/bargindetailbg.jpg'); + background: #F4F5F9; + /* background-image: url('https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/bargindetailbg.jpg'); */ background-size: cover; background-repeat: no-repeat; } @@ -26,7 +26,7 @@ page{ .title{ display: block; font-size: 30rpx; - color: #333; + color: #3C3C3C; height: 40rpx; line-height: 40rpx; padding-top: 20rpx; @@ -38,9 +38,10 @@ page{ height: 40rpx; line-height: 40rpx; margin-top: 47rpx; + color:#3C3C3C; } .help text{ - color: red; + color: #FD782D; } .listitem .ri { margin-left: 26rpx; @@ -80,7 +81,7 @@ page{ .ri .txt04 { width: 100%; font-size: 24rpx; - color: rgba(255, 50, 50, 1); + color: #FD782D; line-height: 44rpx; } @@ -88,7 +89,7 @@ page{ display: inline-block !important; font-size: 50rpx; font-weight: 500; - color: rgba(255, 50, 50, 1); + color: #FD782D; } .listitem { @@ -115,11 +116,11 @@ page{ .progesstext>text { font-size: 24rpx; - color: rgba(51, 51, 51, 1); + color: #3C3C3C; } .progesstext text text { - color: #FF3535; + color: #FD782D; } .time { @@ -137,8 +138,8 @@ page{ text-align: center; height: 40rpx; line-height: 40rpx; - background: rgba(51, 51, 51, 1); - border-radius: 10rpx; + background: #FD782D; + border-radius: 14rpx; margin: 0 4px; } .head{ @@ -148,19 +149,20 @@ page{ } .head image{ width: 70rpx; - border-radius:10rpx; + border-radius:50rpx; } .head text{ width: 70rpx; position: absolute; - bottom: 0; - left: 0; + /* bottom: 0; */ + top: -15rpx; + left: 60rpx; right: 0; font-size: 20rpx; - background: #ED3F2E; + background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); color: #fff; text-align: center; - border-radius: 20rpx; + border-radius:9px 9px 9px 0px; } .text{ width: 87%; @@ -169,6 +171,7 @@ page{ height: 90rpx; line-height: 90rpx; font-size: 26rpx; + color: #3C3C3C; } .text01{ width: 100rpx; @@ -199,17 +202,17 @@ page{ overflow: hidden; } .person{ - border-bottom: 1px solid #F0CDB3; + /* border-bottom: 1px solid #F0CDB3; */ padding-bottom: 31rpx; padding-top: 31rpx; } .text02 text:nth-of-type(2){ - color: #FF3535; + color: #FD782D; text-align: left; } .people{ border-radius:16rpx; - background: #FFEADA; + background: #FFF; margin-top: 30rpx; padding:0 20rpx; margin-bottom: 165rpx; @@ -232,8 +235,8 @@ page{ font-size: 30rpx; color: #fff; line-height: 95rpx; - background:linear-gradient(90deg,rgba(229,54,40,1) 0%,rgba(243,75,30,1) 99%); - box-shadow:0px 8px 8px 1px rgba(204,26,13,0.32); + background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); + /* box-shadow:0px 8px 8px 1px rgba(204,26,13,0.32); */ } .goback{ position: fixed; @@ -301,8 +304,8 @@ page{ width:650rpx; height:85rpx; line-height: 85rpx; - background:linear-gradient(90deg,rgba(236,59,45,1) 0%,rgba(248,98,52,1) 100%); - box-shadow:0px 8px 8px 1px rgba(246,93,51,0.32); + background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); + /* box-shadow:0px 8px 8px 1px rgba(246,93,51,0.32); */ border-radius:43rpx; } .fail{ diff --git a/pages/main/index.wxml b/pages/main/index.wxml index 6f0b15e..accabb5 100644 --- a/pages/main/index.wxml +++ b/pages/main/index.wxml @@ -12,7 +12,7 @@ - 还需{{upgradeScore}}成长值可升级 + 还需{{upgradeScore}}成长值可升级 diff --git a/pages/main/index.wxss b/pages/main/index.wxss index e1ca487..46784f6 100644 --- a/pages/main/index.wxss +++ b/pages/main/index.wxss @@ -55,12 +55,12 @@ page { .userinfo{ position:relative; - margin: 0 0 30rpx 40rpx; - width: 690rpx; - /* padding: 0 0 20rpx; */ + width:710rpx; + /* padding: 0 4%; */ height: 96rpx; border-radius:16rpx; display: flex; + margin: 0 auto 20rpx; } .infoLeft{ height: 100%; @@ -191,7 +191,7 @@ page { } .user-avatar { position: absolute; - left: 24rpx; + left: 14rpx; top:0; bottom: 0; width: 80rpx; @@ -206,7 +206,7 @@ page { height:100%; } .user-data { - margin-left: 116rpx; + margin-left: 104rpx; letter-spacing: 0.64rpx; line-height: 46rpx; font-size: 30rpx; @@ -258,9 +258,8 @@ page { .view { font-size: 24rpx; color: #999999; - line-height: 12rpx; float: left; - margin-top: 10rpx; + /* margin-top: 10rpx; */ } .view>.score{ margin-left:9rpx; @@ -385,15 +384,21 @@ page { color: #A6A6A6; font-size: 22rpx; margin-top: 5rpx; - line-height: 14rpx; + height: 30rpx; + line-height: 30rpx; float: left; margin: 0 10rpx; + width: 260rpx; + overflow: hidden; + text-overflow:ellipsis; + white-space: nowrap; } progress{ width:190rpx; border-radius:60rpx; overflow:hidden; float: left; + margin-top: 10rpx; } .channelBox{ width:688rpx; diff --git a/pages/user/index.wxml b/pages/user/index.wxml index 5227fae..9489731 100644 --- a/pages/user/index.wxml +++ b/pages/user/index.wxml @@ -14,8 +14,8 @@ 我的 成长值{{score}} | - 更多成长值 - 一键领取 + + 更多成长值 diff --git a/pages/user/index.wxss b/pages/user/index.wxss index 5a5a122..2933d09 100644 --- a/pages/user/index.wxss +++ b/pages/user/index.wxss @@ -61,7 +61,7 @@ page{ line-height: 44rpx; font-size: 36rpx; color: #000; - margin:20rpx 0 50rpx 149rpx; + margin:20rpx 0 50rpx 180rpx; } .user-avatar { position: absolute;