new

2019-09-18 10:15:45 +08:00
parent 02d1678fff 4a39ba8190
commit 93eb6ec5c5
61 changed files with 7778 additions and 24 deletions
--- a/src/views/layout/components/Navbar.vue
+++ b/src/views/layout/components/Navbar.vue
@@ -1,5 +1,9 @@
 <template>
+<<<<<<< HEAD
  <el-menu class="navbar" mode="horizontal" style="background: rgb(87,177,253)!important;">
+=======
+  <el-menu class="navbar" mode="horizontal" style="background: rgb(163,173,182)!important;">
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
    <hamburger :toggle-click="toggleSideBar" :is-active="sidebar.opened" class="hamburger-container"/>
    <breadcrumb />
    <el-dropdown class="avatar-container" trigger="click">