From ec6e4ac23b47b25a20b7c4bb6d8be492064cbe4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=8A=E9=87=8C?= <1227971437@qq.com>
Date: Sat, 10 Apr 2021 00:59:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E4=BD=93=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/ucenter/settings/settings.vue           |  9 +++--
 .../uni-login-page/pages/index/index.vue      |  2 +-
 .../uni-login-page/pages/index/phone-code.vue |  2 +-
 .../uni-login-page/pages/index/pwd-login.vue  |  8 ++---
 .../pages/index/pwd-retrieve.vue              | 36 +++++++++++++------
 5 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/pages/ucenter/settings/settings.vue b/pages/ucenter/settings/settings.vue
index 54a2718..f11a7c7 100644
--- a/pages/ucenter/settings/settings.vue
+++ b/pages/ucenter/settings/settings.vue
@@ -25,7 +25,7 @@
 			return {
 				agreeList: [{
 						title: '个人资料',
-						to: '../edit/edit'
+						event:'toEdit'
 					},
 					{
 						title: '修改密码',
@@ -67,8 +67,13 @@
 			...mapMutations({
 				logout: 'user/logout'
 			}),
+			toEdit(){
+				uni.navigateTo({
+					url: '../edit/edit'
+				});
+			},
 			changePwd(){
-				if(this.userInfo && this.userInfo.phone){
+				if(this.userInfo){
 					uni.navigateTo({
 						url:'/uni_modules/uni-login-page/pages/index/pwd-retrieve?phoneNumber='+ this.userInfo.phone +'&phoneArea=+86'
 					});
diff --git a/uni_modules/uni-login-page/pages/index/index.vue b/uni_modules/uni-login-page/pages/index/index.vue
index a78ee0c..847586d 100644
--- a/uni_modules/uni-login-page/pages/index/index.vue
+++ b/uni_modules/uni-login-page/pages/index/index.vue
@@ -56,7 +56,7 @@
 				currenPhoneArea: '+86',
 
 				formData: {
-					phone: '17769516081'
+					phone: ''
 				},
 				rules: {
 					// 对phone字段进行必填验证
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 bf69542..3da8f46 100644
--- a/uni_modules/uni-login-page/pages/index/phone-code.vue
+++ b/uni_modules/uni-login-page/pages/index/phone-code.vue
@@ -43,7 +43,7 @@
 								errorMessage: '请输入验证码',
 							},
 							{
-								legn: /^.{6}$/,
+								pattern: /^.{6}$/,
 								errorMessage: '请输入6位验证码',
 							}
 						]
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 c05b5fd..08740bd 100644
--- a/uni_modules/uni-login-page/pages/index/pwd-login.vue
+++ b/uni_modules/uni-login-page/pages/index/pwd-login.vue
@@ -51,8 +51,8 @@
 				currenPhoneArea: '+86',
 				
 				formData: {
-					phone: '17769516081',
-					pwd:'123456'
+					phone: '',
+					pwd:''
 				},
 				rules: {
 					phone: {
@@ -135,9 +135,7 @@
 								title: '登陆成功',
 								icon: 'none'
 							});
-							uni.switchTab({
-								url:"/pages/list/list"
-							})
+							uni.navigateBack()
 						}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 69dc5e2..4a61549 100644
--- a/uni_modules/uni-login-page/pages/index/pwd-retrieve.vue
+++ b/uni_modules/uni-login-page/pages/index/pwd-retrieve.vue
@@ -8,13 +8,15 @@
 				<!-- 登录框 (选择手机号所属国家和地区需要另行实现) -->
 				<uni-forms ref="form" :value="formData" :rules="rules">
 					<uni-forms-item name="phone">
+						<uni-easyinput type="number" class="phone-input-box" :inputBorder="false"
+							v-model="formData.phone" placeholder="请输入手机号"></uni-easyinput>
 						<uni-easyinput type="number" class="phone-input-box" :inputBorder="false"
 							v-model="formData.code" maxlength="6" placeholder="请输入验证码">
 							<template slot="right">
 								<login-short-code ref="shortCode" @getCode="getCode"></login-short-code>
 							</template>
 						</uni-easyinput>
-						<uni-easyinput type="number" class="phone-input-box" :inputBorder="false"
+						<uni-easyinput type="text" class="phone-input-box" :inputBorder="false"
 							v-model="formData.pwd" placeholder="请输入新密码"></uni-easyinput>
 					</uni-forms-item>
 					<button class="send-btn-box" :disabled="!canSubmit" :type="canSubmit?'primary':'default'"
@@ -31,23 +33,33 @@ import mixin from '../../common/loginPage.mixin.js';
 		mixins:[mixin],
 		data() {
 			return {
-				phoneNumber: '',
-				phoneCode: '',
 				password: '',
 				currenPhoneArea: '',
 				
 				formData:{
+					phone:'',
 					code:'',
 					pwd:''
 				},
 				rules: {
+					phone:{
+						rules:[{
+								required: true,
+								errorMessage: '请输入手机号',
+							},
+							{
+								pattern: /^1\d{10}$/,
+								errorMessage: '手机号格式不正确',
+							}
+						]
+					},
 					code: {
 						rules: [{
 								required: true,
 								errorMessage: '请输入验证码',
 							},
 							{
-								legn: /^.{6}$/,
+								pattern: /^.{6}$/,
 								errorMessage: '请输入6位验证码',
 							}
 						]
@@ -68,13 +80,13 @@ import mixin from '../../common/loginPage.mixin.js';
 		},
 		computed: {
 			tipText() {
-				return `验证码已通过短信发送至${this.currenPhoneArea} ${this.phoneNumber}。密码为6 - 20位`
+				return `验证码已通过短信发送至${this.currenPhoneArea} ${this.formData.phone}。密码为6 - 20位`
 			},
 			canSubmit() {
 				let reg_phone = /^1\d{10}$/;
 				let reg_pwd = /^.{6,20}$/;
 				let reg_code = /^\d{6}$/;
-				let isPhone = reg_phone.test(this.phoneNumber);
+				let isPhone = reg_phone.test(this.formData.phone);
 				let isPwd = reg_pwd.test(this.formData.pwd);
 				let isCode = reg_code.test(this.formData.code);
 				return isPhone && isPwd && isCode;
@@ -82,12 +94,14 @@ import mixin from '../../common/loginPage.mixin.js';
 		},
 		onLoad(event) {
 			if (event && event.phoneNumber) {
-				this.phoneNumber = event.phoneNumber;
+				this.formData.phone = event.phoneNumber;
 				this.currenPhoneArea = '+' + Number(event.phoneArea);
 			}
 		},
 		onReady() {
-			this.$refs.shortCode.start();
+			if(this.formData.phone){
+				this.$refs.shortCode.start();
+			}
 		},
 		methods: {
 			/**
@@ -95,7 +109,7 @@ import mixin from '../../common/loginPage.mixin.js';
 			 * 倒计时期间不会触发该方法
 			 */
 			getCode(done) {
-				if (this.phoneNumber == '') return uni.showToast({
+				if (this.formData.phone == '') return uni.showToast({
 					title: '请填写手机号',
 					icon: 'none'
 				});
@@ -104,7 +118,7 @@ import mixin from '../../common/loginPage.mixin.js';
 					"data": {
 						"action": "sendSmsCode",
 						"params": {
-							"mobile": this.phoneNumber,
+							"mobile": this.formData.phone,
 							"type": "login"
 						}
 					},
@@ -136,7 +150,7 @@ import mixin from '../../common/loginPage.mixin.js';
 					"data": {
 						"action": "loginBySms",
 						"params":{
-							"mobile":this.phoneNumber,
+							"mobile":this.formData.phone,
 							"code":this.formData.code
 						}
 					},
-- 
GitLab