Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into gyh
This commit is contained in:
		
						commit
						3da4dad3cb
					
				@ -4,7 +4,7 @@
 | 
			
		||||
            <view class="top">
 | 
			
		||||
				<u-avatar  @click="toOtherPage('/mine/MineInfo')" :src="userInfo.member_avatar + '?' + new Date().getTime()" :size="110"></u-avatar>
 | 
			
		||||
				<view class="user-info">
 | 
			
		||||
					<view class="info-left">
 | 
			
		||||
					<!-- <view class="info-left">
 | 
			
		||||
						<view class="user-nickname u-line-1">{{ userInfo.member_nickname }}</view>
 | 
			
		||||
						<view class="user-medal" @click="toOtherPage('/mine/MedalIntroduction')">
 | 
			
		||||
							<image src="/static/image/mine/13.png"></image>
 | 
			
		||||
@ -14,6 +14,17 @@
 | 
			
		||||
					<view class="info-right">
 | 
			
		||||
						<view class="info-phone">{{ userInfo.member_mobile | phoneFormat }}</view>
 | 
			
		||||
						<view class="user-rank">等级:{{ userInfo.member_level || 0 }}级</view>
 | 
			
		||||
					</view> -->
 | 
			
		||||
					<view class="info-top">
 | 
			
		||||
						<view class="user-nickname u-line-1">{{ userInfo.member_nickname }}</view>
 | 
			
		||||
						<view class="info-phone">{{ userInfo.member_mobile | phoneFormat }}</view>
 | 
			
		||||
					</view>
 | 
			
		||||
					<view class="info-bottom">
 | 
			
		||||
						<view class="user-medal" @click="toOtherPage('/mine/MedalIntroduction')">
 | 
			
		||||
							<image src="/static/image/mine/13.png"></image>
 | 
			
		||||
							<view class="rank-title">{{ userInfo.member_grade_name }}</view>
 | 
			
		||||
						</view>
 | 
			
		||||
						<view class="user-rank">等级:{{ userInfo.member_level || 0 }}级</view>
 | 
			
		||||
					</view>
 | 
			
		||||
				</view>
 | 
			
		||||
				<view class="member-service" @click="toOtherPage('/mine/MemberServe')">会员服务</view>
 | 
			
		||||
@ -188,7 +199,7 @@ export default {
 | 
			
		||||
			margin-bottom: 40rpx;
 | 
			
		||||
			.user-info {
 | 
			
		||||
				margin-left: 30rpx;
 | 
			
		||||
				display: flex;
 | 
			
		||||
				// display: flex;
 | 
			
		||||
				.info-left {
 | 
			
		||||
					margin-right: 15rpx;
 | 
			
		||||
					.user-nickname {
 | 
			
		||||
@ -228,6 +239,53 @@ export default {
 | 
			
		||||
						color: rgba(51,51,51,1);
 | 
			
		||||
					}
 | 
			
		||||
				}
 | 
			
		||||
				.info-top {
 | 
			
		||||
					height: 30rpx;
 | 
			
		||||
					display: flex;
 | 
			
		||||
					align-items: center;
 | 
			
		||||
					margin-bottom: 19rpx;
 | 
			
		||||
					.user-nickname {
 | 
			
		||||
						min-width: 110rpx;
 | 
			
		||||
						max-width: 200rpx;
 | 
			
		||||
						font-size: 30rpx;
 | 
			
		||||
						color: rgba(51,51,51,1);
 | 
			
		||||
						margin-right: 19rpx;
 | 
			
		||||
					}
 | 
			
		||||
					.info-phone {
 | 
			
		||||
						font-size: 24rpx;
 | 
			
		||||
						color: rgba(51,51,51,1);
 | 
			
		||||
						// margin-bottom: 26rpx;
 | 
			
		||||
					}
 | 
			
		||||
				}
 | 
			
		||||
				.info-bottom {
 | 
			
		||||
					height: 25rpx;
 | 
			
		||||
					display: flex;
 | 
			
		||||
					align-items: center;
 | 
			
		||||
					.user-medal {
 | 
			
		||||
						display: flex;
 | 
			
		||||
						width: 110rpx;
 | 
			
		||||
						height: 25rpx;
 | 
			
		||||
						background: linear-gradient(269deg,rgba(175,175,175,1) 0%,rgba(224,224,224,1) 100%);
 | 
			
		||||
						border-radius: 13rpx;
 | 
			
		||||
						align-items: center;
 | 
			
		||||
						padding: 0 17rpx 0 10rpx;
 | 
			
		||||
						margin-right: 20rpx;
 | 
			
		||||
						> image {
 | 
			
		||||
							margin-right: 9rpx;
 | 
			
		||||
							width: 20rpx;
 | 
			
		||||
							height: 22rpx;
 | 
			
		||||
							flex-shrink: 0;
 | 
			
		||||
						}
 | 
			
		||||
						.rank-title {
 | 
			
		||||
							font-size: 16rpx;
 | 
			
		||||
							color: rgba(51,51,51,1);
 | 
			
		||||
						}
 | 
			
		||||
					}
 | 
			
		||||
					.user-rank {
 | 
			
		||||
						font-size: 24rpx;
 | 
			
		||||
						color: rgba(51,51,51,1);
 | 
			
		||||
					}
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
			.member-service {
 | 
			
		||||
				height: 52rpx;
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user