From f752306bee420d6d728f38ccea5d1bb56786151d Mon Sep 17 00:00:00 2001
From: sugar1569 <sugar1569@vip.qq.com>
Date: Thu, 23 Feb 2023 12:17:36 +0800
Subject: [PATCH 1/5] =?UTF-8?q?logo=E9=BB=98=E8=AE=A4=E5=B7=A6=E8=BE=B9?=
 =?UTF-8?q?=E8=B7=9D10px?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/admin/src/components/main/main.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/template/admin/src/components/main/main.less b/template/admin/src/components/main/main.less
index bb4114771..f3783ec2c 100644
--- a/template/admin/src/components/main/main.less
+++ b/template/admin/src/components/main/main.less
@@ -1,6 +1,7 @@
 .main {
   .logo-con {
     height: 50px;
+    margin-left: 10px;
     img {
       height: 44px;
       width: auto;

From 076df39372daa1d20bf9f61126587ee3648b6f6a Mon Sep 17 00:00:00 2001
From: sugar1569 <sugar1569@vip.qq.com>
Date: Thu, 23 Feb 2023 12:17:56 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=A1=B6=E9=83=A8=E5=A4=9A=E4=BA=8610px?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/admin/src/pages/order/orderList/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/admin/src/pages/order/orderList/index.vue b/template/admin/src/pages/order/orderList/index.vue
index 5b61fbaa5..f6601a757 100644
--- a/template/admin/src/pages/order/orderList/index.vue
+++ b/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>

From d258f01419f9cf18823236af8833c51569a7caf8 Mon Sep 17 00:00:00 2001
From: sugar1569 <sugar1569@vip.qq.com>
Date: Thu, 23 Feb 2023 12:18:13 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=A1=B6=E9=83=A8?=
 =?UTF-8?q?=E8=B7=9D=E7=A6=BB=E5=A4=9A=E4=BA=8616px?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/admin/src/pages/index/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/admin/src/pages/index/index.vue b/template/admin/src/pages/index/index.vue
index aab685177..c896a5b45 100644
--- a/template/admin/src/pages/index/index.vue
+++ b/template/admin/src/pages/index/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="ivu-mt-16">
+  <div>
     <!--头部-->
     <base-info ref="baseInfo" />
     <!--小方块-->

From aff53d4117fd203d99eff75276458e19b16c2e6f Mon Sep 17 00:00:00 2001
From: sugar1569 <sugar1569@vip.qq.com>
Date: Thu, 23 Feb 2023 12:32:17 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BC=A9=E8=BF=9B?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=A0=B7=E5=BC=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/admin/src/components/main/main.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/admin/src/components/main/main.less b/template/admin/src/components/main/main.less
index f3783ec2c..d16aa8701 100644
--- a/template/admin/src/components/main/main.less
+++ b/template/admin/src/components/main/main.less
@@ -39,7 +39,7 @@
   .left-sider {
     .ivu-layout-sider-children {
       overflow-y: scroll;
-      margin-right: -16px;
+      //margin-right: -16px;
       overflow-x: hidden;
     }
   }

From f5c8455d66b6e7f7cb798c3198ff73dcc18beb09 Mon Sep 17 00:00:00 2001
From: sugar1569 <sugar1569@vip.qq.com>
Date: Thu, 23 Feb 2023 12:51:30 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/main/components/tags-nav/tags-nav.less   | 6 +++---
 template/admin/src/components/main/main.less                | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/template/admin/src/components/main/components/tags-nav/tags-nav.less b/template/admin/src/components/main/components/tags-nav/tags-nav.less
index b0a50c94e..2d55ac95f 100644
--- a/template/admin/src/components/main/components/tags-nav/tags-nav.less
+++ b/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;
diff --git a/template/admin/src/components/main/main.less b/template/admin/src/components/main/main.less
index d16aa8701..e07900442 100644
--- a/template/admin/src/components/main/main.less
+++ b/template/admin/src/components/main/main.less
@@ -30,9 +30,10 @@
     padding: 0;
     height: 42px;
     background: #f0f0f0;
+    margin-bottom: 3px;
   }
   .content-wrapper {
-    margin: 0 16px;
+    padding: 0 16px;
     height: ~'calc(100% - 80px)';
     overflow: auto;
   }