新增 注册账号页面支持返回登录页面

uni_modules/uni-id-pages/pages/userinfo/change_pwd/change_pwd.vue

@@ -31,7 +31,8 @@
 
 <script>
 	import mixin from '@/uni_modules/uni-id-pages/common/login-page.mixin.js';
-	const uniIdCo = uniCloud.importObject("uni-id-co", {
+  import passwordMod from '@/uni_modules/uni-id-pages/common/password.js'
+  const uniIdCo = uniCloud.importObject("uni-id-co", {
 		customUI:true
 	})
 	export default {
@@ -58,37 +59,8 @@
 							}
 						]
 					},
-					newPassword: {
-						rules: [{
-								required: true,
-								errorMessage: '请输入新密码',
-							},
-							{
-								pattern: /^.{6,20}$/,
-								errorMessage: '密码为6 - 20位',
-							}
-						]
-					},
-					newPassword2: {
-						rules: [{
-								required: true,
-								errorMessage: '请确认密码',
-							},
-							{
-								pattern: /^.{6,20}$/,
-								errorMessage: '密码为6 - 20位',
-							},
-							{
-								validateFunction: function(rule, value, data, callback) {
-									if (value != data.newPassword) {
-										callback('两次输入密码不一致')
-									};
-									return true
-								}
-							}
-						]
-					}
-				},
+          ...passwordMod.getPwdRules('newPassword', 'newPassword2')
+        },
 				logo: "/static/logo.png"
 			}
 		},
@@ -122,16 +94,16 @@
 								oldPassword,
 								newPassword
 							}).then(e => {
-								console.log(e);
-								uni.removeStorageSync('uni_id_token');
+								console.log(e);
+								uni.removeStorageSync('uni_id_token');
 								uni.setStorageSync('uni_id_token_expired', 0)
-								uni.redirectTo({
-									url:'/uni_modules/uni-id-pages/pages/login/login-withpwd'
+								uni.redirectTo({
+									url:'/uni_modules/uni-id-pages/pages/login/login-withpwd'
 								})
-							}).catch(e => {
-								uni.showModal({
-									content: e.message,
-									showCancel: false
+							}).catch(e => {
+								uni.showModal({
+									content: e.message,
+									showCancel: false
 								});
 							})
 					}).catch(errors => {
@@ -153,10 +125,10 @@
 			margin-top: 15px;
 		}
 	}
-	
+
 	@media screen and (min-width: 690px) {
 		.uni-content{
 			padding: 30px 40px 40px;
 		}
 	}
-</style>
+</style>