|
@@ -169,9 +169,11 @@ function bindModalEvent(){
|
|
|
})
|
|
|
$("#sureWord").off("input").on("input",function(){
|
|
|
const text = $(this).val();
|
|
|
+ $(".sureword.warning").hide();
|
|
|
if(text.trim()){
|
|
|
let psdsOk=verifyPsdPart();
|
|
|
- if(psdsOk){
|
|
|
+ const psdOk = verifyPsd(text);
|
|
|
+ if(psdOk&&psdsOk){
|
|
|
$(".modalAction .warning").hide();
|
|
|
//保存按钮启用
|
|
|
$(".alertModal .sureChange").addClass("active");
|
|
@@ -233,22 +235,23 @@ function verifyPsdPart(){ //验证各密码关系规则
|
|
|
const oldP = $("#oldWord").val();
|
|
|
const newP = $("#newWord").val();
|
|
|
const confirmP = $("#sureWord").val();
|
|
|
+ let pass = true;
|
|
|
if(oldP&&newP&&(oldP.trim()===newP.trim())){
|
|
|
$(".newword.warning b").text("原密码和新密码不能相同");
|
|
|
$(".newword.warning").show();
|
|
|
- return false
|
|
|
+ pass = false;
|
|
|
}
|
|
|
if(newP.length>12){
|
|
|
$(".newword.warning b").text("密码最多12位");
|
|
|
$(".newword.warning").show();
|
|
|
- return false;
|
|
|
+ pass = false;
|
|
|
}
|
|
|
if(confirmP.trim()&&(newP.trim()!==confirmP.trim())){
|
|
|
$(".sureword.warning b").text("两次密码输入不一致");
|
|
|
$(".sureword.warning").show();
|
|
|
- return false
|
|
|
+ pass = false;
|
|
|
}
|
|
|
- return true;
|
|
|
+ return pass;
|
|
|
}
|
|
|
|
|
|
//判断有无某一权限
|