Merge remote-tracking branch 'origin/develop' into develop

2021-10-12 16:32:27 +08:00
parent 67073864ca aac560e2d3
commit 15a6f6c9a9
5 changed files with 21 additions and 6 deletions
@@ -273,6 +273,7 @@
    overflow-y: auto;
    background: url('~@/assets/images/shangqi/home/BG.png') no-repeat;
    background-size: 100% 100%;
+    font-family: MicrosoftYaHei,微软雅黑;
    & > div{
      position: absolute;
      top: 0;
@@ -304,5 +305,8 @@
        }
      }
    }
+    /deep/.el-menu--vertical {
+      background: red;
+    }
  }
 </style>