Merge branch 'feature-lq-04' into release_preview

b519a934 · liuqiao · 286a2dce · c0f37da4 · b519a934
Commit b519a934 authored Apr 09, 2021 by liuqiao
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

js2.js new_admincp/source/zsb/js/v1.0/js2.js +1 -1

No files found.
--- a/new_admincp/source/zsb/js/v1.0/js2.js
+++ b/new_admincp/source/zsb/js/v1.0/js2.js
@@ -439,7 +439,7 @@ $("#jsAlterTel").bind("click",function(){
           $("#newpassworderr").text("新密码需8位以上数字+英文，请重新设置");
           $("#newpassworderr").show();
           return false;
-       } else if (/\d+[a-zA-Z]+/.test(newpassword)) {
+       } else if (!/\d+/.test(newpassword) || !/[a-zA-Z]+/.test(newpassword)) {
           console.log(1);
           $("#newpassworderr").text("新密码需8位以上数字+英文，请重新设置");
           $("#newpassworderr").show();