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

src/components/navMenu/index.vue

@@ -16,7 +16,7 @@
       <el-menu
               unique-opened
               :default-active="defaultActive"
-              background-color="#4788c0"
+              background-color="#8fb0cc"
               text-color="#fff"
               active-text-color="#000"
               router
@@ -518,11 +518,11 @@
   }
   .el-menu--collapse {
     .is-active {
-      background-color: #697178 !important;
+      background-color: rgb(49, 112, 167) !important;
       .shangqi-icon {
         color: #fff !important;
       }
-      color: #697178 !important;
+      color: rgb(49, 112, 167) !important;
     }
   }
   .nav-menu {
@@ -532,7 +532,7 @@
     user-select: none;
     box-sizing: border-box;
     position: absolute;
-    background: #697178;
+    background: rgb(49, 112, 167);
     background-size: 100% 100%;
     /deep/.el-tooltip {
       padding: 0px 16px !important;
@@ -542,7 +542,7 @@
     }
     &:not(.is-collapse) {
       width: 200px;
-      background: #697178;
+      background: rgb(49, 112, 167);
       background-size: 100% 100%;
       .logo {
         padding: 10px;
@@ -581,7 +581,7 @@
       /*background:url("../../assets/images/shangqi/home/logo3.png");*/
     }
     /deep/:not(.is-collapse) .el-menu-item.is-active{
-      background: #4788c0 !important;
+      background: #8fb0cc !important;
       color: #fff !important;
     }
   }
@@ -614,7 +614,7 @@
     color: #fff;
   }
   .nav-menu{
-    background-color: #697178;
+    background-color: rgb(49, 112, 167);
     scrollbar-width: none;
     -ms-overflow-style: none; /* IE 10+ */
   }
@@ -626,11 +626,11 @@
   }
   .nav-menu-popper .el-menu .el-menu-item.is-active {
     background-color: #fff !important;
-    color: #4788c0 !important;
+    color: #8fb0cc !important;
     font-weight: bold;
   }
   .nav-menu-popper .el-menu .el-menu-item:hover {
-    background-color: #697178 !important;
+    background-color: rgb(49, 112, 167) !important;
     color: #fff !important;
     font-weight: bold;
   }