Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zmr

This commit is contained in:
zmr900709
2020-07-09 16:35:37 +08:00
615 changed files with 1730 additions and 6548 deletions

View File

@@ -2,7 +2,7 @@
<view class="mine">
<view class="mine-top">
<view class="top">
<image src="/static/image/mine/23.png" class="avatar" @click="toOtherPage('/mine/MineInfo')" />
<u-avatar :src="userInfo.member_avatar" :size="110"></u-avatar>
<view class="user-info">
<view class="info-left">
<view class="user-nickname" @click="toOtherPage('/mine/MineInfo')">{{ userInfo.member_nickname }}</view>
@@ -13,14 +13,14 @@
</view>
<view class="info-right">
<view class="info-phone">{{ userInfo.member_mobile | phoneFormat }}</view>
<view class="user-rank">等级:{{ userInfo.level }}</view>
<view class="user-rank">等级:{{ userInfo.member_level }}</view>
</view>
</view>
<view class="member-service" @click="toOtherPage('/mine/MemberServe')">会员服务</view>
</view>
<view class="bottom">
<view @click="toOtherPage('/mine/GoodsCollection')">
<view>{{ userInfo.member_fav_goods_num }}</view>
<view>{{ userInfo.member_fav_goods_num || 0 }}</view>
<view>商品收藏</view>
</view>
<view @click="toOtherPage('/mine/StoreCollection')">
@@ -32,7 +32,7 @@
<view>图文收藏</view>
</view>
<view @click="toOtherPage('/mine/Integral')">
<view>{{ userInfo.member_points }}</view>
<view>{{ userInfo ? userInfo.member_points : 0 }}</view>
<view>积分数</view>
</view>
<view @click="toOtherPage('/mine/MineConcerns')">
@@ -92,6 +92,10 @@
<img src="/static/image/mine/18.png" />
<view>足迹</view>
</view>
<view @click="toOtherPage('/tool/MineCoupon')">
<img src="/static/image/mine/25.png" />
<view>优惠券</view>
</view>
</view>
</view>
<view class="more-tool">
@@ -131,7 +135,7 @@ export default {
return value ? value.replace(/^(\d{3})\d*(\d{4})$/, '$1****$2') : '';
}
},
onLoad() {
onShow() {
this.getUserInfo();
},
onNavigationBarButtonTap() {
@@ -166,15 +170,8 @@ export default {
display: flex;
align-items: center;
margin-bottom: 40rpx;
.avatar {
width: 110rpx;
height: 110rpx;
border-radius: 50%;
border: 2rpx solid rgba(251,251,251,1);
margin-right: 30rpx;
flex-shrink: 0;
}
.user-info {
margin-left: 30rpx;
display: flex;
.info-left {
margin-right: 15rpx;