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

template/admin/src/components/main/components/tags-nav/tags-nav.less

@@ -40,16 +40,16 @@
       text-align: center;
     }
     &.left-btn {
-      left: 0px;
+      left: -16px;
     }
     &.right-btn {
-      right: 0px;
+      right: -16px;
       // border-right: 1px solid #f0f0f0;
     }
   }
   .scroll-outer {
     position: absolute;
-    left: 28px;
+    left: 8px;
     right: 21px;
     top: 0;
     bottom: 0;

template/admin/src/components/main/main.less

@@ -1,6 +1,7 @@
 .main {
   .logo-con {
     height: 50px;
+    margin-left: 10px;
     img {
       height: 44px;
       width: auto;
@@ -29,16 +30,17 @@
     padding: 0;
     height: 42px;
     background: #f0f0f0;
+    margin-bottom: 3px;
   }
   .content-wrapper {
-    margin: 0 16px;
+    padding: 0 16px;
     height: ~'calc(100% - 80px)';
     overflow: auto;
   }
   .left-sider {
     .ivu-layout-sider-children {
       overflow-y: scroll;
-      margin-right: -16px;
+      //margin-right: -16px;
       overflow-x: hidden;
     }
   }

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="ivu-mt-16">
+  <div>
     <!--头部-->
     <base-info ref="baseInfo" />
     <!--小方块-->

template/admin/src/pages/order/orderList/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="mt10">
+    <Card :bordered="false" dis-hover>
       <Tabs class="mb20" v-model="currentTab" @on-click="onClickTab" v-if="tablists">
         <TabPane v-for="(item, index) in tabs" :label="item.label" :name="item.type" :key="index" />
       </Tabs>