Merge branch 'feat/layout-style' of...

Merge branch 'feat/layout-style' of https://app.bmetech.com/liuzhaohui/dctomproject into feat/layout-style

src/layout/menuCom.vue

@@ -101,6 +101,18 @@ const getMenuTitle = (item) => {
     width: 16px;
     // height: 18px;
     margin-right: 5px;
+<<<<<<< HEAD
+=======
+  }
+}
+
+
+.is-active {
+  color: #fff !important;
+  background: #03a1b3 !important;
+  span {
+    color: #fff !important;
+>>>>>>> 1ad6a24f7b192e495e1c4235e6fd952843486a6c
   }
 }