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

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

@@ -464,11 +464,11 @@ export default {
     }
     .ivu-menu-submenu {
       .ivu-menu-item {
-        padding-left: 16px !important;
+        padding-left: 23px !important;
       }
       .ivu-menu-submenu {
         .ivu-menu-submenu-title {
-          padding-left: 16px !important;
+          padding-left: 23px !important;
         }
       }
     }

template/admin/src/pages/marketing/recharge/index.vue

@@ -1386,7 +1386,6 @@ export default {
   padding: 20px;
   background-color: #fff;
   border-radius: 5px;
-  margin: 20px;
 }
 
 .iview-video-style {

template/admin/src/pages/system/group/visualization.vue

@@ -1801,7 +1801,6 @@ export default {
   padding: 20px;
   background-color: #fff;
   border-radius: 5px;
-  margin: 20px;
 }
 
 .iview-video-style {

template/admin/src/styles/style.css

@@ -507,7 +507,7 @@ body {
   border: 0;
 }
 .i-layout-page-header {
-  margin: 0 -18px;
+  margin: 0;
   /* display: none; */
   background-color: #fff;
   padding: 7px 32px 0 32px;
@@ -687,4 +687,4 @@ body {
 }
 .pt10{
   padding-top: 10px;
-}
+}