Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/layout/index.vue

@@ -169,14 +169,15 @@ export default {
   position: fixed;
   display: block;
   width: 100%;
-  z-index: 9999;
+  z-index: 1000;
   background: #fff;
   border-bottom: 1px solid #6f7af3;
   box-shadow: 0px 0px 2px 0px #222653;
 }
+
 .jianbiase {
-  width: 87.55px;
-  height: 29.25px;
+  width: 100px;
+  height: 37px;
   /* height: 25px; */
   background: linear-gradient(128.13deg, rgba(82, 79, 255, 1) 0%, rgba(255, 74, 74, 1) 100%);
   box-shadow: 0px 4px 16px  rgba(179, 192, 231, 1);
@@ -191,8 +192,8 @@ export default {
 }
 .user-avatar {
   cursor: pointer;
-  width: 40px;
-  height: 40px;
+  width: 50px;
+  height: 50px;
   border-radius: 50px; //是谁的样式来着
   z-index: 2;