From 59a724f57b2771bd2e084f406925c5295ffc2f48 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期五, 12 四月 2024 15:48:09 +0800
Subject: [PATCH] css
---
packagePersonal/pages/userSetting/index.js | 57 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 48 insertions(+), 9 deletions(-)
diff --git a/packagePersonal/pages/userSetting/index.js b/packagePersonal/pages/userSetting/index.js
index 6e9de7b..97ccde3 100644
--- a/packagePersonal/pages/userSetting/index.js
+++ b/packagePersonal/pages/userSetting/index.js
@@ -75,8 +75,8 @@
} else if (WeChatInfo) {
defaultUser = {
...WeChatInfo,
- nickName: nickNameData ? JSON.parse(nickNameData.data).nickName : WeChatInfo.name,
- icon: JSON.parse(nickNameData.data).icon ? JSON.parse(nickNameData.data).icon : WeChatInfo.icon,
+ nickName: nickNameData && JSON.parse(nickNameData.data).nickName ? JSON.parse(nickNameData.data).nickName : WeChatInfo.name,
+ icon: nickNameData && JSON.parse(nickNameData.data).icon ? JSON.parse(nickNameData.data).icon : WeChatInfo.icon,
userId: res.userId,
phoneNumber: phoneInfo?.credential,
Email: emailInfo?.credential
@@ -90,7 +90,6 @@
Email: emailInfo?.credential
}
}
-
this.setData({
userInfo: defaultUser
})
@@ -232,9 +231,11 @@
if (emailError === isPhoneNumber) {
this.setData({
emailError: !isPhoneNumber,
- "userInfoForm.email": e.detail.value,
});
}
+ this.setData({
+ "userInfoForm.email": e.detail.value,
+ });
} else {
this.setData({
emailError: false,
@@ -300,14 +301,14 @@
getSecond(time) {
let timer = null
if (!timer) {
- let countDown = time;
this.setData({
countDown: time,
});
+ let conut = this.data.countDown;
timer = setInterval(() => {
- countDown--
+ conut--
this.setData({
- countDown: countDown,
+ countDown: conut,
});
if (this.data.countDow == 0) {
clearInterval(timer)
@@ -332,8 +333,6 @@
icon: 'none',
duration: 1000
})
- // 寮�鍚煭淇￠獙璇佸�掕鏃�
- this.getSecond(60)
} else {
wx.showToast({
title: '閭楠岃瘉鐮佸彂閫佸け璐�',
@@ -354,6 +353,14 @@
confirmInfo() {
if (this.data.editType == 'nickName') {
+ if (!this.data.userInfoForm.nickName) {
+ wx.showToast({
+ title: '璇疯緭鍏ユ樀绉�',
+ icon: 'none',
+ duration: 1000
+ })
+ return false;
+ }
let userTypeInfo = {
"requests": [{
data: JSON.stringify({
@@ -379,6 +386,22 @@
})
} else if (this.data.editType == 'phone') {
+ if (!this.data.userInfoForm.phone) {
+ wx.showToast({
+ title: '璇疯緭鍏ユ墜鏈哄彿',
+ icon: 'none',
+ duration: 1000
+ })
+ return false;
+ }
+ if (!this.data.userInfoForm.code) {
+ wx.showToast({
+ title: '璇疯緭鍏ラ獙璇佺爜',
+ icon: 'none',
+ duration: 1000
+ })
+ return false;
+ }
let query = {
phoneNumber: this.data.userInfoForm.phone,
phoneCaptcha: this.data.userInfoForm.code
@@ -410,6 +433,22 @@
}
})
} else if (this.data.editType == 'email') {
+ if (!this.data.userInfoForm.email) {
+ wx.showToast({
+ title: '璇疯緭鍏ラ偖绠�',
+ icon: 'none',
+ duration: 1000
+ })
+ return false;
+ }
+ if (!this.data.userInfoForm.code) {
+ wx.showToast({
+ title: '璇疯緭鍏ラ獙璇佺爜',
+ icon: 'none',
+ duration: 1000
+ })
+ return false;
+ }
let query = {
eMail: this.data.userInfoForm.email,
captcha: this.data.userInfoForm.code
--
Gitblit v1.9.1