|
@@ -1,5 +1,6 @@
|
|
|
// pages/register/register.js
|
|
|
import Toast from '../../vant/toast/toast';
|
|
|
+import random from '../../utils/random.js'
|
|
|
Page({
|
|
|
|
|
|
/**
|
|
@@ -114,12 +115,16 @@ Page({
|
|
|
//console.log(e.detail.userInfo)
|
|
|
console.info(this.userInfo)
|
|
|
let that = this;
|
|
|
+ const randomPassword = random.generateRandomCode()
|
|
|
if (userInfo) {
|
|
|
let {
|
|
|
nickName: userName,
|
|
|
gender: sex,
|
|
|
avatarUrl: avatar
|
|
|
} = userInfo;
|
|
|
+ this.setData({
|
|
|
+ password:randomPassword
|
|
|
+ })
|
|
|
let {
|
|
|
userName: loginName,
|
|
|
password,
|
|
@@ -493,28 +498,28 @@ Page({
|
|
|
// errorMsg: ''
|
|
|
// });
|
|
|
// }
|
|
|
- if (this.data.password && (this.data.password.length < 5 || this.data.password.length > 20)) {
|
|
|
- this.setData({
|
|
|
- errorMsg: '密码长度应为5-20'
|
|
|
- });
|
|
|
- this.setData({
|
|
|
- checkPass: false
|
|
|
- });
|
|
|
- return;
|
|
|
- }
|
|
|
- if (!this.checkPassword()) {
|
|
|
- this.setData({
|
|
|
- errorMsg: '两次密码输入不一致,请重新输入'
|
|
|
- });
|
|
|
- this.setData({
|
|
|
- checkPass: false
|
|
|
- });
|
|
|
- return;
|
|
|
- } else {
|
|
|
- this.setData({
|
|
|
- errorMsg: ''
|
|
|
- });
|
|
|
- }
|
|
|
+ // if (this.data.password && (this.data.password.length < 5 || this.data.password.length > 20)) {
|
|
|
+ // this.setData({
|
|
|
+ // errorMsg: '密码长度应为5-20'
|
|
|
+ // });
|
|
|
+ // this.setData({
|
|
|
+ // checkPass: false
|
|
|
+ // });
|
|
|
+ // return;
|
|
|
+ // }
|
|
|
+ // if (!this.checkPassword()) {
|
|
|
+ // this.setData({
|
|
|
+ // errorMsg: '两次密码输入不一致,请重新输入'
|
|
|
+ // });
|
|
|
+ // this.setData({
|
|
|
+ // checkPass: false
|
|
|
+ // });
|
|
|
+ // return;
|
|
|
+ // } else {
|
|
|
+ // this.setData({
|
|
|
+ // errorMsg: ''
|
|
|
+ // });
|
|
|
+ // }
|
|
|
this.setData({
|
|
|
checkPass: true
|
|
|
});
|