From 3cf5e58dba2a289b57c82057f35d31c459ac661d Mon Sep 17 00:00:00 2001 From: hurui Date: Mon, 5 Aug 2019 16:42:24 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=A6=96=E9=A1=B5=E4=B8=AA=E4=BA=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF][=E4=BF=AE=E6=94=B9][=E5=B1=85=E4=B8=AD]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/addPark/addPark.wxss | 6 ++--- pages/index/searchbar/detail/index.wxml | 2 +- pages/index/searchbar/detail/index.wxss | 5 +--- pages/main/index.wxml | 17 +++++++------ pages/main/index.wxss | 32 +++++++++++-------------- 5 files changed, 28 insertions(+), 34 deletions(-) diff --git a/pages/addPark/addPark.wxss b/pages/addPark/addPark.wxss index 7c77cb5..d7e65dd 100644 --- a/pages/addPark/addPark.wxss +++ b/pages/addPark/addPark.wxss @@ -68,14 +68,12 @@ page{ } .newsource { font-size: 16rpx; - position: absolute; - top: 100rpx; - left: 670rpx; + position: fixed; + right: 10rpx; height: 30rpx; width: 60rpx; background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); color: #fff; - /* border: 1px solid #11c67b; */ border-radius: 14rpx; text-align: center; line-height: 30rpx; diff --git a/pages/index/searchbar/detail/index.wxml b/pages/index/searchbar/detail/index.wxml index 8883236..35fe42a 100644 --- a/pages/index/searchbar/detail/index.wxml +++ b/pages/index/searchbar/detail/index.wxml @@ -61,7 +61,7 @@ - 商户活动 + 商户活动: {{data.actionDesc}} diff --git a/pages/index/searchbar/detail/index.wxss b/pages/index/searchbar/detail/index.wxss index eeb4594..a449ddc 100644 --- a/pages/index/searchbar/detail/index.wxss +++ b/pages/index/searchbar/detail/index.wxss @@ -123,7 +123,6 @@ page{ font-size: 30rpx; color: #A6A6A6; line-height: 26rpx; - /* padding: 0 10rpx 0 30rpx; */ } .merchant-activity view:nth-child(1) { font-size:30rpx; @@ -454,8 +453,6 @@ button::after{ border: none; } } .frHr{ float: left; - color: #FD832D; - font-size: 24rpx; margin-left: 12rpx; - margin-top: 10rpx; + margin-top: 22rpx; } \ No newline at end of file diff --git a/pages/main/index.wxml b/pages/main/index.wxml index 2c30996..2a5eca2 100644 --- a/pages/main/index.wxml +++ b/pages/main/index.wxml @@ -1,14 +1,19 @@ - + + + + - - - {{levelName}} + + + + {{levelName}} + @@ -25,9 +30,7 @@ --> - - - + diff --git a/pages/main/index.wxss b/pages/main/index.wxss index f9a8de5..70884cd 100644 --- a/pages/main/index.wxss +++ b/pages/main/index.wxss @@ -54,13 +54,12 @@ page { } .userinfo{ - position:relative; - width:710rpx; - /* padding: 0 4%; */ + width:690rpx; height: 96rpx; border-radius:16rpx; display: flex; - margin: 0 auto 20rpx; + justify-content: space-between; + margin: 0 auto 30rpx; } .infoLeft{ height: 100%; @@ -190,15 +189,12 @@ page { display: inline-block; } .user-avatar { - position: absolute; - left: 14rpx; - top:0; - bottom: 0; width: 80rpx; height: 80rpx; border-radius: 50%; overflow: hidden; - margin: auto; + float: left; + margin: 10rpx 10rpx; } .user-avatar open-data { display:block; @@ -206,7 +202,6 @@ page { height:100%; } .user-data { - margin-left: 104rpx; letter-spacing: 0.64rpx; line-height: 46rpx; font-size: 30rpx; @@ -214,8 +209,12 @@ page { background: #FFF; margin-top: 10rpx; margin-bottom: 26rpx; + float: right; + display: flex; + flex-direction: column; } -.user-data open-data{ + +.nameBox open-data{ float: left; } .chengzhangBox{ @@ -227,7 +226,6 @@ page { color:rgba(255,255,255,1); float: left; margin-top: 8rpx; - } .chengzhang { font-size: 22rpx; @@ -255,10 +253,9 @@ page { font-weight: bold; } .view { + display: flex; font-size: 24rpx; color: #999999; - float: left; - /* margin-top: 10rpx; */ } .view>.score{ margin-left:9rpx; @@ -271,7 +268,6 @@ page { width: 106rpx; height: 96rpx; background: #FFF; - margin-left: 20rpx; border-radius:12rpx; } .qrcodeimg{ @@ -387,14 +383,14 @@ page { height: 30rpx; line-height: 30rpx; float: left; - margin: 0 10rpx; - width: 260rpx; + margin-left:10rpx; + width: 255rpx; overflow: hidden; text-overflow:ellipsis; white-space: nowrap; } progress{ - width:190rpx; + width:200rpx; border-radius:60rpx; overflow:hidden; float: left;