|
@@ -133,41 +133,37 @@ function bindModalEvent(){
|
|
|
})
|
|
|
$("#oldWord").off("input").on("input",function(){
|
|
|
const text = $(this).val();
|
|
|
- if($(".oldWaring.warning:visible").length){//有修改则隐藏报错
|
|
|
+ $(".oldWaring.warning,.newword.warning").hide();
|
|
|
+ /*if($(".oldWaring.warning:visible").length){//有修改则隐藏报错
|
|
|
$(".oldWaring.warning").hide();
|
|
|
if(!$(".waring:visible").length){ //无报错则激活保存按钮
|
|
|
$(".alertModal .sureChange").addClass("active");
|
|
|
}
|
|
|
+ }*/
|
|
|
+ verifyPsdPart();
|
|
|
+ if(text.trim()){
|
|
|
+ $("#newWord").attr("disabled",false);
|
|
|
}
|
|
|
- if(text.trim()===$("#newWord").val().trim()){
|
|
|
- $(".newword b").text("原密码和新密码不能相同");
|
|
|
- $(".newword").show();
|
|
|
- return false
|
|
|
- }else{
|
|
|
- $(".newword.warning").hide();
|
|
|
- }
|
|
|
- if(text.trim()){
|
|
|
- $("#newWord").attr("disabled",false);
|
|
|
- }
|
|
|
- })
|
|
|
+ });
|
|
|
$("#newWord").off("input").on("input",function(){
|
|
|
const text = $(this).val();
|
|
|
const checker = $(".alertModal .psd-checkbox");
|
|
|
+ $(".oldWaring.warning,.newword.warning").hide();
|
|
|
if(text.trim()){ //显示密码验证标签
|
|
|
if(checker.length){
|
|
|
checker.show()
|
|
|
}else{
|
|
|
$(psdChecker).appendTo($(".alertModal"));
|
|
|
}
|
|
|
+ let psdsOk = verifyPsdPart();
|
|
|
const psdOk = verifyPsd(text);
|
|
|
- let psdsOk=false;
|
|
|
if(psdOk){
|
|
|
$("#sureWord").attr("disabled",false);
|
|
|
}else{
|
|
|
return false;
|
|
|
}
|
|
|
- psdsOk = verifyPsdPart();
|
|
|
- if(psdsOk&&psdOk&$("#sureWord").val().trim()){
|
|
|
+ if(psdsOk&&psdOk&&$("#sureWord").val().trim()){
|
|
|
+ $(".modalAction .warning").hide();
|
|
|
//保存按钮启用
|
|
|
$(".alertModal .sureChange").addClass("active");
|
|
|
}else{
|
|
@@ -182,6 +178,7 @@ function bindModalEvent(){
|
|
|
if(text.trim()){
|
|
|
let psdsOk=verifyPsdPart();
|
|
|
if(psdsOk){
|
|
|
+ $(".modalAction .warning").hide();
|
|
|
//保存按钮启用
|
|
|
$(".alertModal .sureChange").addClass("active");
|
|
|
}else{
|
|
@@ -192,7 +189,7 @@ function bindModalEvent(){
|
|
|
}
|
|
|
|
|
|
//验证新密码规则
|
|
|
-function verifyPsd(text){console.log(text)
|
|
|
+function verifyPsd(text){
|
|
|
if(/(?=.*?[A-Z])/.test(text)){ //至少一个大写字母
|
|
|
$(".big-letter").addClass("active");
|
|
|
}else{
|
|
@@ -218,14 +215,14 @@ function verifyPsd(text){console.log(text)
|
|
|
}else{
|
|
|
$(".eight-str").removeClass("active");
|
|
|
}
|
|
|
- if(text.length>12){
|
|
|
+ /*if(text.length>12){
|
|
|
$(".newword.warning b").text("密码最多12位");
|
|
|
$(".newword.warning").show();
|
|
|
return false;
|
|
|
}else{
|
|
|
$(".newword.warning").hide();
|
|
|
- }
|
|
|
- const regex = new RegExp('^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)(?=.*[$@~·$、,,\.!#%*?&])[A-Za-z\\d$@#$\.~、,,·!%*?&]{8,12}');
|
|
|
+ }*/
|
|
|
+ const regex = new RegExp('^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)(?=.*[$@~^·$、,,\.!#%*?&])[A-Za-z\\d$@#$\.~、,,·!%*?&]{8,12}');
|
|
|
if(regex.test(text)){
|
|
|
return true
|
|
|
}
|
|
@@ -235,13 +232,18 @@ function verifyPsd(text){console.log(text)
|
|
|
function verifyPsdPart(){ //验证各密码关系规则
|
|
|
const oldP = $("#oldWord").val();
|
|
|
const newP = $("#newWord").val();
|
|
|
- const confirmP = $("#sureWord").val()
|
|
|
- if(oldP.trim()===newP.trim()){
|
|
|
+ const confirmP = $("#sureWord").val();
|
|
|
+ if(oldP&&newP&&(oldP.trim()===newP.trim())){
|
|
|
$(".newword.warning b").text("原密码和新密码不能相同");
|
|
|
- $(".newword.warning").show();
|
|
|
+ $(".newword.warning").show();
|
|
|
return false
|
|
|
}
|
|
|
- if(confirmP.trim()&&newP.trim()!==confirmP.trim()){
|
|
|
+ if(newP.length>12){
|
|
|
+ $(".newword.warning b").text("密码最多12位");
|
|
|
+ $(".newword.warning").show();
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ if(confirmP.trim()&&(newP.trim()!==confirmP.trim())){
|
|
|
$(".sureword.warning b").text("两次密码输入不一致");
|
|
|
$(".sureword.warning").show();
|
|
|
return false
|