From 525b710b14ce66c81144c4ff1dca126beaaf8f98 Mon Sep 17 00:00:00 2001
From: linju-json <linju@dcloud.io>
Date: Sun, 25 Apr 2021 22:08:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dmixin=E5=BC=95=E7=94=A8?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../login-page/pwd-retrieve/pwd-retrieve.vue  | 197 ++++++++++++------
 1 file changed, 129 insertions(+), 68 deletions(-)

diff --git a/pages/ucenter/login-page/pwd-retrieve/pwd-retrieve.vue b/pages/ucenter/login-page/pwd-retrieve/pwd-retrieve.vue
index eb7d713c..b20e09d2 100644
--- a/pages/ucenter/login-page/pwd-retrieve/pwd-retrieve.vue
+++ b/pages/ucenter/login-page/pwd-retrieve/pwd-retrieve.vue
@@ -1,43 +1,103 @@
 <template>
-	<view class="content">
-		<!-- 顶部文字 -->
-		<text class="title">重置密码</text>
-		<login-ikonw v-show="isPhone" class="login-iknow" :text="tipText"></login-ikonw>
-		<!-- 登录框 (选择手机号所属国家和地区需要另行实现) -->
-		<uni-forms ref="form" :value="formData" :rules="rules">
-			<uni-forms-item name="phone">
-				<!-- focus规则如果上一页携带来“手机号码”数据就focus验证码输入框，否则focus手机号码输入框 -->
-				<uni-easyinput :focus="!formData.phone.length" type="number" class="easyinput" :inputBorder="false"
-					v-model="formData.phone" maxlength="11" placeholder="请输入手机号"></uni-easyinput>
-			</uni-forms-item>
-			<uni-forms-item name="code">
-				<uni-easyinput :focus="formData.phone.length!=0" type="number" class="easyinput" :inputBorder="false"
-					v-model="formData.code" maxlength="6" placeholder="请输入验证码">
-					<template slot="right">
-						<send-sms-code ref="shortCode" :phone="formData.phone"></send-sms-code>
-					</template>
-				</uni-easyinput>
-			</uni-forms-item>
-			<uni-forms-item name="pwd">
-				<uni-easyinput type="password" class="easyinput" :inputBorder="false"
-					v-model="formData.pwd" placeholder="请输入新密码"></uni-easyinput>
-			</uni-forms-item>
-			<uni-forms-item name="pwd2">
-				<uni-easyinput type="password" class="easyinput" :inputBorder="false"
-					v-model="formData.pwd2" placeholder="请确认新密码"></uni-easyinput>
-			</uni-forms-item>
-			<button class="send-btn-box" :disabled="!canSubmit" :type="canSubmit?'primary':'default'"
-				@click="submit">完成</button>
-		</uni-forms>
+	<view class="content">
+		<!-- 顶部文字 -->
+		<text class="title">重置密码</text>
+		<login-ikonw v-show="isPhone" class="login-iknow" :text="tipText"></login-ikonw>
+		<!-- 登录框 (选择手机号所属国家和地区需要另行实现) -->
+		<uni-forms ref="form" :value="formData" :rules="rules">
+			<uni-forms-item name="phone">
+				<!-- focus规则如果上一页携带来“手机号码”数据就focus验证码输入框，否则focus手机号码输入框 -->
+				<uni-easyinput :focus="!formData.phone.length" type="number" class="easyinput" :inputBorder="false"
+					v-model="formData.phone" maxlength="11" placeholder="请输入手机号"></uni-easyinput>
+			</uni-forms-item>
+			<uni-forms-item name="code">
+				<uni-easyinput :focus="formData.phone.length!=0" type="number" class="easyinput" :inputBorder="false"
+					v-model="formData.code" maxlength="6" placeholder="请输入验证码">
+					<template slot="right">
+						<send-sms-code ref="shortCode" :phone="formData.phone"></send-sms-code>
+					</template>
+				</uni-easyinput>
+			</uni-forms-item>
+			<uni-forms-item name="pwd">
+				<uni-easyinput type="password" class="easyinput" :inputBorder="false" v-model="formData.pwd"
+					placeholder="请输入新密码"></uni-easyinput>
+			</uni-forms-item>
+			<uni-forms-item name="pwd2">
+				<uni-easyinput type="password" class="easyinput" :inputBorder="false" v-model="formData.pwd2"
+					placeholder="请确认新密码"></uni-easyinput>
+			</uni-forms-item>
+			<button class="send-btn-box" :disabled="!canSubmit" :type="canSubmit?'primary':'default'"
+				@click="submit">完成</button>
+		</uni-forms>
 	</view>
 </template>
 
 <script>
-import mixin from '../common/loginPage.mixin.js';
+	import mixin from '../common/login-page.mixin.js';
 	export default {
-		mixins:[mixin],
+		mixins: [mixin],
 		data() {
 			return {
+				formData: {
+					"phone": "",
+					'pwd': '',
+					'pwd2': ''
+				},
+				rules: {
+					phone: {
+						rules: [{
+								required: true,
+								errorMessage: '请输入手机号',
+							},
+							{
+								pattern: /^1\d{10}$/,
+								errorMessage: '手机号格式不正确',
+							}
+						]
+					},
+					code: {
+						rules: [{
+								required: true,
+								errorMessage: '请输入验证码',
+							},
+							{
+								pattern: /^.{6}$/,
+								errorMessage: '请输入6位验证码',
+							}
+						]
+					},
+					pwd: {
+						rules: [{
+								required: true,
+								errorMessage: '请输入密码',
+							},
+							{
+								pattern: /^.{6,20}$/,
+								errorMessage: '密码应为6到20位',
+							}
+						]
+					},
+					pwd2: {
+						rules: [{
+								required: true,
+								errorMessage: '请确认密码',
+							},
+							{
+								pattern: /^.{6,20}$/,
+								errorMessage: '密码应为6到20位',
+							},
+							{
+								validateFunction: function(rule, value, data, callback) {
+									console.log(value);
+									if (value != data.pwd) {
+										callback('两次输入密码不一致')
+									};
+									return true
+								}
+							}
+						]
+					}
+				}
 			}
 		},
 		computed: {
@@ -46,21 +106,21 @@ import mixin from '../common/loginPage.mixin.js';
 			},
 			canSubmit() {
 				return this.isPhone && this.isPwd && this.isCode;
-			},
-			isPhone(){
-				let reg_phone = /^1\d{10}$/;
-				let isPhone = reg_phone.test(this.formData.phone);
-				return isPhone;
-			},
-			isPwd(){
-				let reg_pwd = /^.{6,20}$/;
-				let isPwd = reg_pwd.test(this.formData.pwd);
-				return isPwd;
-			},
-			isCode(){
-				let reg_code = /^\d{6}$/;
-				let isCode = reg_code.test(this.formData.code);
-				return isCode;
+			},
+			isPhone() {
+				let reg_phone = /^1\d{10}$/;
+				let isPhone = reg_phone.test(this.formData.phone);
+				return isPhone;
+			},
+			isPwd() {
+				let reg_pwd = /^.{6,20}$/;
+				let isPwd = reg_pwd.test(this.formData.pwd);
+				return isPwd;
+			},
+			isCode() {
+				let reg_code = /^\d{6}$/;
+				let isCode = reg_code.test(this.formData.code);
+				return isCode;
 			}
 		},
 		onLoad(event) {
@@ -69,7 +129,7 @@ import mixin from '../common/loginPage.mixin.js';
 			}
 		},
 		onReady() {
-			if(this.formData.phone){
+			if (this.formData.phone) {
 				this.$refs.shortCode.start();
 			}
 		},
@@ -77,32 +137,33 @@ import mixin from '../common/loginPage.mixin.js';
 			/**
 			 * 完成并提交
 			 */
-			submit(){
+			submit() {
 				this.$refs.form.submit()
-				.then(res=>{
-					this.request('user-center/resetPwdBySmsCode',{
-						"mobile":this.formData.phone,
-						"code":this.formData.code,
-						"password":this.formData.pwd
-					},result=>{
-						console.log(result);
-						uni.showToast({
-							title: result.msg,
-							icon: 'none'
-						});
-						if(result.code === 0){
-							uni.navigateBack()
-						}
+					.then(res => {
+						this.request('user-center/resetPwdBySmsCode', {
+							"mobile": this.formData.phone,
+							"code": this.formData.code,
+							"password": this.formData.pwd
+						}, result => {
+							console.log(result);
+							uni.showToast({
+								title: result.msg,
+								icon: 'none'
+							});
+							if (result.code === 0) {
+								uni.navigateBack()
+							}
+						})
 					})
-				})
 			}
 		}
 	}
 </script>
 
 <style>
-	@import url("../common/login-page.css");
-	.content-top-title{
-		margin-bottom: 6px;
+	@import url("../common/login-page.css");
+
+	.content-top-title {
+		margin-bottom: 6px;
 	}
-</style>
+</style>
-- 
GitLab