Browse Source

bug708,705

zhouna 3 years ago
parent
commit
068468616b
2 changed files with 8 additions and 4 deletions
  1. 7 3
      src/js/modal.js
  2. 1 1
      src/js/userManager.js

+ 7 - 3
src/js/modal.js

@@ -26,12 +26,16 @@ const jQuery = require('jquery');
         var ops = $.extend(dft, options || {});
         var popDom = $('.alertModal:visible');
         if(ops.isFather){
-		  ops.fatherWrapper.find('.alertModal:visible');
+		  popDom =ops.fatherWrapper.find('.alertModal:visible');
 		}
-		if(popDom.length){  //如果该弹窗已存在,则不再显示多个
-
+		const ptitle = popDom.find(".titlemodal").text().trim();
+		if(popDom.length&&ptitle!=="修改密码"){
+		  //如果该弹窗已存在,则不再显示多个
 		  return;
 		}
+		if(ptitle==="修改密码"){
+		  popDom.remove();
+		}
         var html = `
             <div class="alertModal">
                 <div class="modalBg"></div>

+ 1 - 1
src/js/userManager.js

@@ -177,7 +177,7 @@ function bindEdit(data,activePage){
 }
 //启用禁用
 function toggleOnOff(url,id,that,status){
-    $.alerModal({type:"loading"});
+    //$.alerModal({type:"loading"});
     post(url,{userId:id}).then(res =>{
         if(res.data.code == '0'){
             // const data = res.data.data