zhouna 4 年之前
父节点
当前提交
acd5a79387
共有 5 个文件被更改,包括 94 次插入46 次删除
  1. 90 45
      src/css/index.less
  2. 2 0
      src/css/reset.less
  3. 二进制
      src/images/icon-Warning.png
  4. 1 0
      src/js/index.js
  5. 1 1
      src/js/utils.js

+ 90 - 45
src/css/index.less

@@ -8,7 +8,7 @@
   height: 24px;
   position: relative;
   background: #EDEEEF;
-  top: -27px;
+  top: -19px;
   text-align: left;
   & img{
     margin-left: 16px;
@@ -138,8 +138,6 @@
   }
   .main-body {
     background: @activeBg;
-    margin: 0;
-    padding: 0;
   }
 }
   .main-body{
@@ -454,47 +452,6 @@
       text-align: right;
       color: #777;
     }
-    .oldWaring {
-      color: #FF4D4F;
-      display: inline-block;
-      position: absolute;
-
-      top: 37px;
-      left: 107px;
-      text-align: left;
-      & img{
-        margin-right: 5px;
-      }
-      & b{
-        font-weight: 400;
-      }
-    }
-    .newword {
-      color: #FF4D4F;
-      display: inline-block;
-      top: -26px;
-      left: -36px;
-      text-align: left;
-      & img{
-        margin-right: 5px;
-      }
-      & b{
-        font-weight: 400;
-      }
-    }
-    .sureword{
-      color: #FF4D4F;
-      display: inline-block;
-      top: -26px;
-      left: -36px;
-      text-align: left;
-      & img{
-        margin-right: 5px;
-      }
-      & b{
-        font-weight: 400;
-      }
-    }
     .waring {
       text-align: left;
       s {
@@ -1174,4 +1131,92 @@
   .midifyMsgContentDel {
     height: 220px !important;
     width: 300px !important;
-  }
+  }
+  /**********修改密码框*********/
+.modalAction{
+  position: relative;
+  // padding: 20px;
+  input {
+    border: 1px solid #E2E5EF;
+    width: 300px;
+    height: 34px;
+    line-height: 34px;
+    border-radius: 3px;
+    margin: 5px 0;
+    padding: 0 10px;
+    box-sizing: border-box;
+  }
+  p {position: relative;}
+  p span {
+    width: 90px;
+    display: inline-block;
+    text-align: right;
+    color: #777;
+  }
+  & img{
+    margin-right: 5px;
+  }
+  & b{
+    font-weight: 400;
+  }
+  .eye{
+    margin-left: 5px;
+    cursor: pointer;
+  }
+  .warning{
+    display: none;
+    color: #FF4D4F;
+    text-align: left;
+    margin:0 0 0 90px;
+    font-size: 12px;
+    img{
+      width: 16px;
+      vertical-align: text-bottom;
+    }
+  }
+
+}
+.alertModal{
+  .btns{
+    margin-top:30px;
+    .sure{
+      background: #E4E3E3;
+      border-color: #E4E3E3;
+      cursor: not-allowed;
+      &.active{
+        background: #00A1FF;
+        border-color: #1E9FFF;
+        cursor: pointer;
+      }
+    }
+  }
+  .psd-checkbox{
+    position: absolute;
+    left: 50%;
+    top:50%;
+    margin-left: 255px;
+    margin-top: -47px;
+    padding: 22px 19px;
+    background: #fff;
+    border-radius:4px;
+    width: 149px;
+    height: 154px;
+    color: #333;
+    .label{
+      color: #999;
+    }
+    p{
+      margin-bottom: 4px;
+      i{
+        margin:0 5px 0 30px;
+        display: inline-block;
+        width: 14px;
+        height: 14px;
+        background: url("../images/unok.png") no-repeat;
+      }
+      &.active i{
+        background: url("../images/ok.png") no-repeat;
+      }
+    }
+  }
+}

+ 2 - 0
src/css/reset.less

@@ -304,6 +304,8 @@ textarea {
 .divModal {
   position: fixed;
   z-index: 9999;
+  width: 100%;
+  height: 100%;
 }
 .modaltip {
   position: fixed;

二进制
src/images/icon-Warning.png


+ 1 - 0
src/js/index.js

@@ -410,6 +410,7 @@ $("#changeWord").click(function(e){
   e.stopPropagation()
   const status = $(".modalAction").css("display")
   $.alerModal({
+    quiteBtn: true,
     title:"修改密码",
     type:"modal",
     width:'450',

+ 1 - 1
src/js/utils.js

@@ -4,7 +4,7 @@ const axios = require('axios');
 var Utils = require('./rePromise');
 const {ywCheckApi} = require('./api.js')
 require('./scrollBar.js');
-const baseUrl = 'http://192.168.2.241:5858';
+const baseUrl = 'http://192.168.2.236:5858';
 //页面映射
 const pageMap = {
   'YH-KZT': 'console.html',