Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev

template/admin/src/components/main/components/header-search/index.vue

@@ -34,7 +34,9 @@
 .search .select .ivu-select-item {
   font-size: 14px !important;
 }
-.ivu-select-input{
+.search .ivu-select-input{
+  padding-left: 19px;
+  border-radius: 30px;
   background-color: rgba(255,255,255,0.3);
 }
 </style>

template/admin/src/components/main/components/side-menu/side-menu.less

@@ -29,7 +29,7 @@
   }
   a.drop-menu-a {
     display: inline-block;
-    padding: 10px 15px 10px 10px;
+    padding: 10px 10px;
     width: 100%;
     text-align: center;
     color: #495060;

template/admin/src/components/main/components/side-menu/side-menu.vue

@@ -311,6 +311,7 @@ export default {
   display: flex;
   align-items: center;
   justify-content: center;
+  width: 75px !important;
 }
 
 .side-menu-box {
@@ -328,7 +329,7 @@ export default {
     }
   }
   .parent-menu {
-    z-index: 8;
+    z-index: 9;
     padding: 0 8px;
     box-shadow: 2px 0px 4px 0px rgba(0, 0, 0, 0.06);
     height: calc(~'100vh - 50px');
@@ -342,6 +343,7 @@ export default {
       margin-bottom: 8px;
       display: flex;
       align-items: center;
+      justify-content: center;
       .title {
         font-size: 13px;
         line-height: 13px;
@@ -432,6 +434,7 @@ export default {
     }
     .title {
       font-size: 13px;
+      line-height: 13px;
       white-space: nowrap;
     }
   }

template/admin/src/libs/system/index.js

@@ -65,7 +65,7 @@ export { getHeaderName };
  * @param {Array} menuList 所有路径
  * */
 function getHeaderSider(menuList) {
-  return menuList.filter((item) => item.is_header === 1);
+  return menuList.filter((item) => item.pid === 0);
 }
 
 export { getHeaderSider };