From de1617b78e6b8a1b198c16c9dc4ffac31f461459 Mon Sep 17 00:00:00 2001
From: linju <8432241+linjuDcloud@user.noreply.gitee.com>
Date: Sat, 10 Apr 2021 01:19:18 +0800
Subject: [PATCH] 123

---
 pages/ucenter/settings/settings.vue            |  2 +-
 .../uni-login-page/pages/index/phone-code.vue  | 17 +++++++++--------
 .../uni-login-page/pages/index/pwd-login.vue   |  4 +++-
 .../pages/index/pwd-retrieve.vue               | 18 +++++++++---------
 4 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/pages/ucenter/settings/settings.vue b/pages/ucenter/settings/settings.vue
index f11a7c74..3e1aa49b 100644
--- a/pages/ucenter/settings/settings.vue
+++ b/pages/ucenter/settings/settings.vue
@@ -75,7 +75,7 @@
 			changePwd(){
 				if(this.userInfo){
 					uni.navigateTo({
-						url:'/uni_modules/uni-login-page/pages/index/pwd-retrieve?phoneNumber='+ this.userInfo.phone +'&phoneArea=+86'
+						url:'/uni_modules/uni-login-page/pages/index/pwd-retrieve?phoneNumber='+ (this.userInfo.phone||'') +'&phoneArea=+86'
 					});
 				} else {
 					uni.showToast({
diff --git a/uni_modules/uni-login-page/pages/index/phone-code.vue b/uni_modules/uni-login-page/pages/index/phone-code.vue
index 3da8f46a..9985cf58 100644
--- a/uni_modules/uni-login-page/pages/index/phone-code.vue
+++ b/uni_modules/uni-login-page/pages/index/phone-code.vue
@@ -91,15 +91,16 @@
 					},
 					success: (e) => {
 						console.log(e);
-						// uni.showToast({
-						// 	title: JSON.stringify(e.result),
-						// 	icon: 'none'
-						// });
-						uni.showModal({
-							content: JSON.stringify(e.result),
-							showCancel: false,
-							confirmText: '知道了'
+						uni.showToast({
+							title: JSON.stringify(e.result),
+							icon: 'none'
 						});
+						
+						// uni.showModal({
+						// 	content: JSON.stringify(e.result),
+						// 	showCancel: false,
+						// 	confirmText: '知道了'
+						// });
 						// 发送成功后开启倒计时
 						done();
 					},
diff --git a/uni_modules/uni-login-page/pages/index/pwd-login.vue b/uni_modules/uni-login-page/pages/index/pwd-login.vue
index 08740bdc..2c694802 100644
--- a/uni_modules/uni-login-page/pages/index/pwd-login.vue
+++ b/uni_modules/uni-login-page/pages/index/pwd-login.vue
@@ -135,7 +135,9 @@
 								title: '登陆成功',
 								icon: 'none'
 							});
-							uni.navigateBack()
+							uni.switchTab({
+								url:"/pages/list/list"
+							})
 						}else{
 							uni.showModal({
 								title: '错误',
diff --git a/uni_modules/uni-login-page/pages/index/pwd-retrieve.vue b/uni_modules/uni-login-page/pages/index/pwd-retrieve.vue
index 4a615495..e83a7a24 100644
--- a/uni_modules/uni-login-page/pages/index/pwd-retrieve.vue
+++ b/uni_modules/uni-login-page/pages/index/pwd-retrieve.vue
@@ -4,7 +4,7 @@
 			<view class="content">
 				<!-- 顶部文字 -->
 				<text class="content-top-title">重置密码</text>
-				<login-ikonw class="login-iknow" :text="tipText"></login-ikonw>
+				<login-ikonw v-show="formData.phone" class="login-iknow" :text="tipText"></login-ikonw>
 				<!-- 登录框 (选择手机号所属国家和地区需要另行实现) -->
 				<uni-forms ref="form" :value="formData" :rules="rules">
 					<uni-forms-item name="phone">
@@ -124,15 +124,15 @@ import mixin from '../../common/loginPage.mixin.js';
 					},
 					success: (e) => {
 						console.log(e);
-						// uni.showToast({
-						// 	title: JSON.stringify(e.result),
-						// 	icon: 'none'
-						// });
-						uni.showModal({
-							content: JSON.stringify(e.result),
-							showCancel: false,
-							confirmText: '知道了'
+						uni.showToast({
+							title: JSON.stringify(e.result),
+							icon: 'none'
 						});
+						// uni.showModal({
+						// 	content: JSON.stringify(e.result),
+						// 	showCancel: false,
+						// 	confirmText: '知道了'
+						// });
 						// 发送成功后开启倒计时
 						done();
 					},
-- 
GitLab