From 09905b43ec2a249ef0e6057d148b8620cfaa1506 Mon Sep 17 00:00:00 2001
From: yiming <m13691596795@163.com>
Date: 星期二, 26 三月 2024 10:47:38 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
pages/personalCenter/components/user-center-card/index.wxml | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/pages/personalCenter/components/user-center-card/index.wxml b/pages/personalCenter/components/user-center-card/index.wxml
index 60cff21..19e9ae9 100644
--- a/pages/personalCenter/components/user-center-card/index.wxml
+++ b/pages/personalCenter/components/user-center-card/index.wxml
@@ -17,10 +17,11 @@
<view class="user-center-card__header">
<t-avatar image="{{userInfo.icon || defaultAvatarUrl}}" class="user-center-card__header__avatar" />
<view>
- <view class="user-center-card__header__name">{{userInfo.fullName || '寰俊鐢ㄦ埛'}}</view>
+ <view class="user-center-card__header__name">{{userInfo.nickName || '寰俊鐢ㄦ埛'}}</view>
<view class="userTypeBox">
<text>{{userInfo.userType}}</text>
- <text class="edit" bindtap="editUserType">淇敼</text>
+ <text bindtap="editUserType" wx:if="{{userInfo.userType}}" class="edit">淇敼</text>
+ <text bindtap="editUserType" wx:else class="edit">璁剧疆鐢ㄦ埛绫诲瀷</text>
</view>
</view>
@@ -36,10 +37,11 @@
<view class="user-center-card__header">
<t-avatar t-class="avatar" mode="aspectFill" class="user-center-card__header__avatar" image="{{userInfo.icon || defaultAvatarUrl}}" />
<view>
- <view class="user-center-card__header__name">{{userInfo.fullName || '寰俊鐢ㄦ埛'}}</view>
+ <view class="user-center-card__header__name">{{userInfo.nickName || '寰俊鐢ㄦ埛'}}</view>
<view class="userTypeBox">
<text>{{userInfo.userType}}</text>
- <text bindtap="editUserType">淇敼</text>
+ <text bindtap="editUserType" wx:if="{{userInfo.userType}}" class="edit">淇敼</text>
+ <text bindtap="editUserType" wx:else class="edit">璁剧疆鐢ㄦ埛绫诲瀷</text>
</view>
</view>
<view class="setting" bind:tap="gotoUserEditPage">
--
Gitblit v1.9.1