From 3d73fb33c46aada16a6060adcd4ea14bb33b6b2a Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期二, 09 四月 2024 10:39:11 +0800
Subject: [PATCH] 详情页tabs样式优化，答题添加页面退出拦截，合并代码
---
packagePersonal/pages/userSetting/index.wxml | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/packagePersonal/pages/userSetting/index.wxml b/packagePersonal/pages/userSetting/index.wxml
index 51c6a17..9a4fe31 100644
--- a/packagePersonal/pages/userSetting/index.wxml
+++ b/packagePersonal/pages/userSetting/index.wxml
@@ -2,28 +2,38 @@
<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">
<view class="label">鎵嬫満鍙风爜</view>
<view class="content" data-info="{{'phone'}}" bindtap="editUserInfo">{{userInfo.phoneNumber || '鏈粦瀹氭墜鏈哄彿'}}</view>
- <t-icon name="chevron-right" size="40rpx" color="#C2C2C2" />
+ <t-icon name="chevron-right" size="40rpx" color="#C2C2C2" data-info="{{'phone'}}" bindtap="editUserInfo" />
</view>
<view class="itemList">
<view class="label">閭</view>
<view class="content" data-info="{{'email'}}" bindtap="editUserInfo">{{userInfo.Email}}</view>
- <t-icon name="chevron-right" size="40rpx" color="#C2C2C2" />
+ <t-icon name="chevron-right" size="40rpx" color="#C2C2C2" data-info="{{'email'}}" bindtap="editUserInfo" />
</view>
- <t-popup visible="{{userInfoBox}}" bind:visible-change="onVisibleChange" placement="bottom">
+ <t-popup visible="{{userInfoBox}}" bind:visible-change="onVisibleChange" placement="center">
<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">
@@ -36,11 +46,11 @@
<view class=" label"> 閭锛� </view>
<view class="item-content">
<view class="inputBox1">
- <t-input placeholder="杈撳叆閭" borderless value="{{userInfoForm.email}}" type="number" tips="{{emailError ? '閭杈撳叆涓嶆纭�' : ''}}" bindchange="onEmailInput" />
+ <t-input placeholder="杈撳叆閭" borderless value="{{userInfoForm.email}}" tips="{{emailError ? '閭杈撳叆涓嶆纭�' : ''}}" bindchange="onEmailInput" />
</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">
@@ -59,7 +69,7 @@
<t-input placeholder="杈撳叆鐭俊楠岃瘉鐮�" borderless value="{{userInfoForm.code}}" type="number" bindchange="onCodeInput" />
</view>
<view class="code">
- <button class="btn" bindtap="getPhoneCode">{{countDown > 0 ? countDown : '鑾峰彇鐭俊楠岃瘉鐮�'}}</button>
+ <button class="btn" bindtap="getPhoneCode">{{countDown > 0 ? '楠岃瘉鐮�(' + countDown + 's)' : '鑾峰彇鐭俊楠岃瘉鐮�'}}</button>
</view>
</view>
</view>
@@ -75,9 +85,10 @@
</view>
</view>
</view>
- </view>
- <view class="footer">
- <button class="submit" bindtap="confirmInfo">纭畾</button>
+ <view class="footer">
+ <button class="submit" bindtap="confirmInfo">纭畾</button>
+ </view>
+ <t-icon t-class="close-btn" name="close-circle" size="32" color="#fff" bind:tap="onCloseProtocol" />
</view>
</t-popup>
</view>
\ No newline at end of file
--
Gitblit v1.9.1