소스 검색

Merge branch 'feature/Feature-supply' into develop

莫绍宝 3 년 전
부모
커밋
fce7c57cfb
2개의 변경된 파일11개의 추가작업 그리고 14개의 파일을 삭제
  1. 10 13
      src/views/login/index.vue
  2. 1 1
      src/views/setting/role.vue

+ 10 - 13
src/views/login/index.vue

@@ -424,7 +424,7 @@ $back: #333;
       color: $back;
       height: 47px;
       caret-color: $back;
-      // border-bottom: 1px solid #eaeaea;
+      border-bottom: none !important;
       &:-webkit-autofill {
         box-shadow: 0 0 0px 1000px $cursor inset !important;
         -webkit-text-fill-color: $back !important;
@@ -479,6 +479,9 @@ $back: #333;
       top: 50%;
       transform: translate(-50%, -50%);
     }
+    .el-checkbox {
+      margin: 0 !important;
+    }
   }
   /* 可以设置不同的进入和离开动画 */
   /* 设置持续时间和动画函数 */
@@ -498,7 +501,7 @@ $back: #333;
     flex-direction: column;
     justify-content: center;
     align-items: center;
-    margin-top: 35px;
+    margin-top: 30px;
     text-align: center;
     text-align-last: center;
     &-item-tip {
@@ -542,22 +545,17 @@ $light_gray: #eee;
   flex-direction: column;
   justify-content: center;
   align-items: center;
-  padding: 0 30px;
+  margin: 0 30px;
   cursor: pointer;
   font-size: 24px;
   color: #666666;
+  line-height: 40px;
+  border-bottom: 3px solid #FFFFFF;
 }
 .acitve {
   font-weight: bold;
   color: #4684f4;
-}
-.acitve::after {
-  display: block;
-  content: "";
-  margin-top: 7.5px;
-  width: 115px;
-  height: 3px;
-  background-color: #4684f4;
+  border-bottom: 3px solid #4684f4;
 }
 .flexBox {
   display: flex;
@@ -572,7 +570,7 @@ $light_gray: #eee;
   height: 50px;
   margin-bottom: 20px;
   background: #ffffff;
-  border: 1px solid #e6e6e6;
+  border: 1px solid #e6e6e6 !important;
   border-radius: 4px;
 }
 .input-box:last-child {
@@ -629,7 +627,6 @@ $light_gray: #eee;
         letter-spacing: 4px;
         text-align: center;
         margin-bottom: 35px;
-        padding: 10px 0 0 0;
       }
     }
   }

+ 1 - 1
src/views/setting/role.vue

@@ -66,7 +66,7 @@
       <el-tree
         :data="menuRoleList"
         show-checkbox
-        :check-strictly="false"
+        :check-strictly="true"
         :default-expand-all="true"
         node-key="moduleId"
         ref="tree"