菜单栏样式调整

src/components/home/MainFrame.vue

@@ -55,7 +55,11 @@ export default {
   color: rgba(16, 16, 16, 1);
   line-height: 20px;
   width: 200px !important;
+<<<<<<< HEAD
   background-color: #266999;
+=======
+  background-color: #104986;
+>>>>>>> 87c125fc7f035d7128e81117b725389fba30d67c
   color: rgba(16, 16, 16, 1);
   font-size: 14px;
   text-align: center;

src/layout/sidebar/Sidebar.vue

@@ -1,6 +1,10 @@
 <template>
   <div>
+<<<<<<< HEAD
     <el-menu style="border: 0;" background-color="#266999" text-color="rgba(255, 255, 255, 1)" active-text-color="#ffd04b" :collapse="isCollapse"
+=======
+    <el-menu style="border: 0;" background-color="#104986" text-color="rgba(255, 255, 255, 1)" active-text-color="#ffd04b" :collapse="isCollapse"
+>>>>>>> 87c125fc7f035d7128e81117b725389fba30d67c
       :collapse-transition="false" router mode="vertical" :unique-opened="true">
       <sidebarItem></sidebarItem>
     </el-menu>