Merge branch 'feature-lq-04' into release_preview

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+$/.test(newpassword)) {
+       } else if (/d+[a-zA-Z]+/.test(newpassword)) {
            console.log(1);
            $("#newpassworderr").text("新密码需8位以上数字+英文，请重新设置");
            $("#newpassworderr").show();