From 88d80c9f40935c6ce7ea51683c6cdc1a80d1997b Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期五, 22 三月 2024 11:17:45 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
packagePersonal/pages/userSetting/index.wxml | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/packagePersonal/pages/userSetting/index.wxml b/packagePersonal/pages/userSetting/index.wxml
index 51c6a17..aaf6525 100644
--- a/packagePersonal/pages/userSetting/index.wxml
+++ b/packagePersonal/pages/userSetting/index.wxml
@@ -2,13 +2,15 @@
<view class="itemList">
<view class="label">澶村儚</view>
<view class="contentImg">
- <t-avatar image="{{defaultAvatarUrl}}" class="user-center-card__header__avatar" />
+ <t-avatar image="{{userInfo.icon}}" class="user-center-card__header__avatar" />
</view>
- <t-icon name="chevron-right" size="40rpx" color="#C2C2C2" />
+ <view class="iconEdit" data-info="{{'icon'}}" bindtap="editIconInfo">
+ <t-icon name="chevron-right" size="40rpx" color="#C2C2C2" />
+ </view>
</view>
<view class="itemList">
<view class="label">鐢ㄦ埛鍚�</view>
- <view class="content">{{userInfo.fullName || '寰俊鐢ㄦ埛'}}</view>
+ <view class="content" data-info="{{'nickName'}}" bindtap="editUserInfo">{{userInfo.nickName || '寰俊鐢ㄦ埛'}}</view>
<t-icon name="chevron-right" size="40rpx" color="#C2C2C2" />
</view>
<view class="itemList">
@@ -24,6 +26,14 @@
<t-popup visible="{{userInfoBox}}" bind:visible-change="onVisibleChange" placement="bottom">
<view class="block">
<view class="body">
+ <view class="from-item" wx:if="{{editType == 'nickName'}}">
+ <view class="label"> 鏄电О锛� </view>
+ <view class="item-content">
+ <view class="inputBox1">
+ <t-input placeholder="杈撳叆鐢ㄦ埛鍚�" borderless value="{{userInfoForm.nickName}}" bindchange="onNameInput" />
+ </view>
+ </view>
+ </view>
<view class="from-item" wx:if="{{editType == 'phone'}}">
<view class="label"> 鎵嬫満鍙凤細 </view>
<view class="item-content">
@@ -40,7 +50,7 @@
</view>
</view>
</view>
- <view class="from-item">
+ <view class="from-item" wx:if="{{editType !== 'nickName'}}">
<view class="label"> 鍥惧舰楠岃瘉鐮侊細 </view>
<view class="item-content">
<view class="inputBox">
--
Gitblit v1.9.1