zhouna 4 年 前
コミット
9cb5c5d0bf
3 ファイル変更26 行追加18 行削除
  1. 1 1
      src/html/index.html
  2. 24 16
      src/js/index.js
  3. 1 1
      src/js/modal.js

+ 1 - 1
src/html/index.html

@@ -101,7 +101,7 @@
                   <div class="login fr">
                       <a class="setting" id="userName" href="javascript:void(0);">***</a>
                       <ul class="userAction">
-                          <li id="changeWord" onclick="audit()">修改密码</li>
+                          <li id="changeWord">修改密码</li>
                           <li><a class="login-out" href="./login.html">退出</a></li>
                       </ul>
                   </div>

+ 24 - 16
src/js/index.js

@@ -35,7 +35,7 @@ $(function () {
   }, 1000);
   //菜单展开收起
   sureChangeWord()
-  if (passwordComplexity) {
+  if (passwordComplexity!=='null') {
     $.alerModal({
       quiteBtn: true,
       title: "修改密码",
@@ -100,6 +100,11 @@ function switchPwd(el) {
       el.prev().attr("type",'password');
   }
 }
+
+function toast(msg){
+    $.alerModal({"message":msg,type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+}
+
 //绑定输入框事件
 function bindModalEvent(){
   $(".modalAction .eye").off("click").on("click",function(){
@@ -132,7 +137,7 @@ function bindModalEvent(){
         }
       }
   })
-    $("#sureWord").off("blur").on("blur",function(){
+    $("#sureWord").off("input").on("input",function(){
         const text = $(this).val();
         if(text.trim()){    //显示密码验证标签
             let psdsOk=verifyPsdPart($("#oldWord").val(),$("#newWord").val(),$("#sureWord").val());
@@ -147,7 +152,7 @@ function bindModalEvent(){
 }
 
 //验证新密码规则
-function verifyPsd(text){
+function verifyPsd(text){console.log(text)
   if(/(?=.*?[A-Z])/.test(text)){  //至少一个大写字母
     $(".big-letter").addClass("active");
   }else{
@@ -174,7 +179,8 @@ function verifyPsd(text){
       $(".eight-str").removeClass("active");
   }
   if(text.length>12){
-    $(".newword.warning").text("密码最多12位").show();
+    $(".newword b").text("密码最多12位");
+    $(".newword").show();
     return false;
   }
   const regex = new RegExp('^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)(?=.*[$@~·$、,,\.!#%*?&])[A-Za-z\\d$@#$\.~、,,·!%*?&]{8,12}');
@@ -186,11 +192,13 @@ function verifyPsd(text){
 
 function verifyPsdPart(oldP,newP,confirmP){   //验证各密码关系规则
   if(oldP.trim()===newP.trim()){
-    $(".newword.warning").text("原密码和新密码不能相同").show();
+    $(".newword b").text("原密码和新密码不能相同");
+      $(".newword").show();
     return false
   }
   if(confirmP.trim()&&newP.trim()!==confirmP.trim()){
-      $(".sureword.warning").text("两次密码输入不一致").show();
+      $(".sureword b").text("两次密码输入不一致");
+      $(".sureword").show();
       return false
   }
   $(".warning").hide();
@@ -383,9 +391,13 @@ function changeWord(oldword, newword) {
     if (data.code === '0') {
       setCookie('behosDateStart', '')
       setCookie('behosDateEnd', '')
-      window.location.href = './login.html'
+      toast("密码修改成功,请重新登录");
+      setTimeout(()=>{
+          window.location.href = './login.html'
+      },1500);
     } else {
-      $(".oldWaring").html(data.msg).show();
+      $(".oldWaring b").text(data.msg);
+      $(".oldWaring").show();
       return
     }
   });
@@ -403,19 +415,15 @@ $("#changeWord").click(function (e) {
   e.stopPropagation()
   const status = $(".modalAction").css("display")
   $.alerModal({
+    quiteBtn: true,
     title: "修改密码",
     type: "modal",
     width: '450',
     time: '1000',
     sureText: '保存',
-    message: `
-    <div class="modalAction">
-      <p><span>原密码:</span><input type="text" placeholder="请输入原密码" class="oldword" autocomplete="off"><i class="oldWaring"></i></p>
-      <p><span>新密码:</span><input type="text" placeholder="请输入新密码" class="newword" autocomplete="off"></p>
-      <p><span>确认新密码:</span><input type="text" placeholder="请输入新密码" class="sureword" autocomplete="off"></p>
-      <p class="waring"><span></span><i></i></p>
-    </div>
-  `});
+    message: modalDom});
+    $(".alertModal .tips").hide();
+    bindModalEvent();
   $(".userAction").hide();
 })
 //推出登录

+ 1 - 1
src/js/modal.js

@@ -90,7 +90,7 @@ const jQuery = require('jquery');
                 box.remove();
             }, ops.time);
         }
-        $(document).on('click',".alertModal .title img",function(){
+        $(document).on('click',".alertModal .title img,.alertModal .quite",function(){
             box.remove();
         })
     }