From 85fc392860c128c204fc2a2c3731bcc352914d99 Mon Sep 17 00:00:00 2001
From: liangjin <liangjin@finlean.com>
Date: Wed, 17 Mar 2021 14:11:40 +0800
Subject: [PATCH] Merge branch 'dev' into xcx-rebuild
---
pages/forgetPassword/forgetPassword.js | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/pages/forgetPassword/forgetPassword.js b/pages/forgetPassword/forgetPassword.js
index 17c41b4..dfadcb7 100644
--- a/pages/forgetPassword/forgetPassword.js
+++ b/pages/forgetPassword/forgetPassword.js
@@ -1,5 +1,6 @@
let $api = require('../../utils/ajaxFn.js')
let md5 = require('../../utils/md5.js')
+let validator = require('../../utils/validator')
Page({
data: {
userStyle:{},//用户样式
@@ -20,7 +21,7 @@
return
}
$api.ajax(
- '/sib/user/sendMsg',
+ '/zic/user/sendMsg',
'POST',
(res)=>{
@@ -49,11 +50,11 @@
})
}else if(code == 2){
this.setData({
- 'info.newPwd':md5.hex_md5(e.detail.value)
+ 'info.newPwd':e.detail.value
})
}else{
this.setData({
- newPwdTwo: md5.hex_md5(e.detail.value)
+ newPwdTwo:e.detail.value
})
}
},
@@ -61,6 +62,13 @@
if(!this.data.info.mblNo){
my.showToast({
content: '请输入电话号码',
+ duration: 2000
+ })
+ return
+ }
+ if(!validator.checkPhone(this.data.info.mblNo)){
+ my.showToast({
+ content: '请输入正确的电话号码',
duration: 2000
})
return
@@ -79,6 +87,20 @@
})
return
}
+ if(!validator.checkPassword(this.data.info.newPwd)){
+ my.showToast({
+ content: '新密码为8-16数字字母组合',
+ duration: 2000
+ })
+ return
+ }
+ if(!this.data.newPwdTwo){
+ my.showToast({
+ content: '请再次输入新密码',
+ duration: 2000
+ })
+ return
+ }
if(this.data.info.newPwd != this.data.newPwdTwo){
my.showToast({
content: '两次密码不一致请确认',
@@ -87,7 +109,7 @@
return
}
$api.ajax(
- '/sib/user/forgetPwd',
+ '/zic/user/forgetPwd',
'POST',
res=>{
my.showToast({
@@ -103,7 +125,9 @@
err=>{},
false,
{
- ...this.data.info
+ mblNo:this.data.info.mblNo,
+ verCode:this.data.info.verCode,
+ newPwd: md5.hex_md5(this.data.info.mblNo+this.data.info.newPwd)
}
)
}
--
Gitblit v1.8.0