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

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

@@ -16,6 +16,15 @@
     </Dropdown>
   </div>
 </template>
+<style scoped>
+.ivu-dropdown-item{
+  display: flex;
+  align-items: center;
+}
+.ivu-dropdown-item .iconImg{
+  margin-right: 10px;
+}
+</style>
 <style lang="less">
 .header-notice {
   margin-right: 30px;
@@ -36,7 +45,7 @@
   border-radius: 50%;
   color: #fff;
   font-size: 18px;
-  margin-right: 10px;
+  padding-right: 10px;
   vertical-align: middle;
 }
 .header-notice .ivu-dropdown {

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

@@ -93,7 +93,10 @@ export default {
   justify-content space-between
   width 100%
 }
+/deep/ .ivu-dropdown-rel {
+  width: 75px !important;
+}
 .drop-menu-a /deep/ .ivu-dropdown-rel {
-  min-width: 75px !important;
+  width: 75px !important;
 }
 </style>