From 558845242a07b68f42fa1802c45ab2769395d8b8 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期一, 29 四月 2024 14:31:30 +0800
Subject: [PATCH] 合并代码
---
packagePersonal/pages/userSetting/index.wxml | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/packagePersonal/pages/userSetting/index.wxml b/packagePersonal/pages/userSetting/index.wxml
index 4971506..8147931 100644
--- a/packagePersonal/pages/userSetting/index.wxml
+++ b/packagePersonal/pages/userSetting/index.wxml
@@ -109,17 +109,29 @@
<view class="from-item" wx:if="{{editType == 'phone'}}">
<view class="label"> 鎵嬫満鍙凤細 </view>
<view class="item-content">
- <view class="inputBox1">
- <t-input placeholder="杈撳叆鎵嬫満鍙风爜" borderless value="{{userInfoForm.phone}}" type="number" tips="{{phoneError ? '鎵嬫満鍙疯緭鍏ヤ笉姝ｇ‘' : ''}}" bindchange="onPhoneInput" />
+ <view class="outsideInputBox1">
+
+ <view class="inputBox1">
+ <t-input placeholder="杈撳叆鎵嬫満鍙风爜" borderless value="{{userInfoForm.phone}}" type="number" bindchange="onPhoneInput" />
+ </view>
+ <view wx:if="{{phoneError}}" style="font-size: 24rpx; color: red;">鎵嬫満鍙疯緭鍏ヤ笉姝ｇ‘</view>
+
+
</view>
+
</view>
</view>
<view class="from-item" wx:if="{{editType == 'email'}}">
<view class=" label"> 閭锛� </view>
<view class="item-content">
- <view class="inputBox1">
- <t-input placeholder="杈撳叆閭" borderless value="{{userInfoForm.email}}" tips="{{emailError ? '閭杈撳叆涓嶆纭�' : ''}}" bindchange="onEmailInput" />
+ <view class="outsideInputBox1">
+ <view class="inputBox1">
+ <t-input placeholder="杈撳叆閭" borderless value="{{userInfoForm.email}}" bindchange="onEmailInput" />
+
+ </view>
+ <view wx:if="{{emailError}}" style="font-size: 24rpx; color: red;">閭杈撳叆涓嶆纭�</view>
</view>
+
</view>
</view>
<view class="from-item" wx:if="{{editType !== 'nickName'}}">
@@ -141,7 +153,7 @@
<t-input placeholder="杈撳叆鐭俊楠岃瘉鐮�" borderless value="{{userInfoForm.code}}" type="number" bindchange="onCodeInput" />
</view>
<view class="code">
- <button class="btn" bindtap="getPhoneCode">{{countDown > 0 ? '楠岃瘉鐮�(' + countDown + 's)' : '鑾峰彇鐭俊楠岃瘉鐮�'}}</button>
+ <button class="{{countDown > 0 ? ' disabled' : 'btn'}}" bindtap="getPhoneCode">{{countDown > 0 ? '楠岃瘉鐮�(' + countDown + 's)' : '鑾峰彇鐭俊楠岃瘉鐮�'}}</button>
</view>
</view>
</view>
@@ -152,7 +164,7 @@
<t-input placeholder="杈撳叆閭楠岃瘉鐮�" borderless value="{{userInfoForm.code}}" type="number" bindchange="onCodeInput" />
</view>
<view class="code">
- <button class="btn" bindtap="getEmailCode">鑾峰彇閭楠岃瘉鐮�</button>
+ <button class="{{mailCountDown > 0 ? ' disabled' : 'btn'}}" bindtap="getEmailCode"> {{mailCountDown > 0 ? '楠岃瘉鐮�(' + mailCountDown + 's)' : '鑾峰彇閭楠岃瘉鐮�'}}</button>
</view>
</view>
</view>
--
Gitblit v1.9.1