Merge branch 'master' of git.oa00.com:mengfucius/wkcrm_web

2 years ago · 8e2a11c4c5
parent cb52edbdf8 e9fc8fd386
commit 8e2a11c4c5
4 changed files with 2 additions and 0 deletions
--- a/build/logo.png
+++ b/build/logo.png
--- a/src/assets/login/main_pic.png
+++ b/src/assets/login/main_pic.png
--- a/src/assets/logo_white.png
+++ b/src/assets/logo_white.png
--- a/src/views/layout/components/Sidebar/index.vue
+++ b/src/views/layout/components/Sidebar/index.vue
@ -171,12 +171,14 @@ export default {
  background-color: $menuBg;
  overflow: auto;
  flex-shrink: 0;
  padding: 0 5px;
  .scrollbar-wrapper {
    overflow-x: hidden !important;
  }
  .el-scrollbar {
    margin: 0 5px;
    height: 100%;
  }