@@ -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; | |||
@@ -61,7 +61,7 @@ | |||
<view class='merchant-shop shopHr' wx:if="{{data.actionDesc}}" > | |||
<view class='notes'> | |||
<view> | |||
<text>商户活动</text> | |||
<text>商户活动:</text> | |||
</view> | |||
<view> | |||
<text>{{data.actionDesc}}</text> | |||
@@ -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; | |||
} |
@@ -1,14 +1,19 @@ | |||
<navbar text="首页"></navbar> | |||
<view class="container" style="padding-top:{{navigationBarHeight}};"> | |||
<!-- 会员信息 --> | |||
<view class='userinfo clearfix' > | |||
<view class='userinfo' > | |||
<!-- 头像 --> | |||
<view class='infoLeft'> | |||
<view class="user-avatar"> | |||
<open-data class="open" type="userAvatarUrl"></open-data> | |||
</view> | |||
<!-- 成长值 --> | |||
<view class="user-data fl" bindtap='gotoChengzhangzhi'> | |||
<open-data type="userNickName"></open-data> | |||
<view class='chengzhangBox' style='background:{{chengzhangBox}}'> | |||
<text class='chengzhang'>{{levelName}}</text> | |||
<view class='nameBox'> | |||
<open-data type="userNickName"></open-data> | |||
<view class='chengzhangBox' style='background:{{chengzhangBox}}'> | |||
<text class='chengzhang'>{{levelName}}</text> | |||
</view> | |||
</view> | |||
<view class="view"> | |||
<!-- 成长值<text class="score">{{score}}</text> --> | |||
@@ -25,9 +30,7 @@ | |||
<image src="{{duihuan}}" class='duihuanimg' mode='widthFix'></image> | |||
</view> --> | |||
</view> | |||
<view class="user-avatar"> | |||
<open-data class="open" type="userAvatarUrl"></open-data> | |||
</view> | |||
<!-- 二维码 --> | |||
<view class='qrcode fr' bindtap='qrcode'> | |||
<image src="{{barcode}}" class='qrcodeimg' mode='widthFix'></image> | |||
@@ -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; | |||