From 4e5eed5227b22fefc5b87d5ca338a7bc8d93338d Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Thu, 23 Feb 2023 10:06:40 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/components/side-menu/side-menu.vue       |  2 +-
 .../main/components/tags-nav/tags-nav.less        | 15 ++++++++-------
 .../main/components/tags-nav/tags-nav.vue         |  4 ++--
 template/admin/src/components/main/main.vue       |  4 ++--
 .../admin/src/pages/setting/setSystem/index.vue   |  1 +
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/template/admin/src/components/main/components/side-menu/side-menu.vue b/template/admin/src/components/main/components/side-menu/side-menu.vue
index ccc00545f..a29dddde8 100644
--- a/template/admin/src/components/main/components/side-menu/side-menu.vue
+++ b/template/admin/src/components/main/components/side-menu/side-menu.vue
@@ -31,7 +31,7 @@
           :open-names="openMenus"
           :accordion="accordion"
           :theme="theme"
-          width="140px"
+          width="145px"
           @on-open-change="openChildNameData"
           @on-select="handleChildSelect"
         >
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 c3669c889..626c5eb86 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
@@ -12,8 +12,9 @@
 }
 .tags-nav {
   position: relative;
-  border-top: 1px solid #f0f0f0;
-  border-bottom: 1px solid #f0f0f0;
+  margin-top: 4px;
+  // border-top: 1px solid #f0f0f0;
+  // border-bottom: 1px solid #f0f0f0;
   .no-select;
   .size;
   .close-con {
@@ -30,7 +31,7 @@
     position: absolute;
     top: 0px;
     height: 100%;
-    background: #fff;
+    // background: #fff;
     padding-top: 3px;
     z-index: 10;
     button {
@@ -42,17 +43,17 @@
       left: 0px;
     }
     &.right-btn {
-      right: 32px;
-      border-right: 1px solid #f0f0f0;
+      right: 0px;
+      // border-right: 1px solid #f0f0f0;
     }
   }
   .scroll-outer {
     position: absolute;
     left: 28px;
-    right: 61px;
+    right: 21px;
     top: 0;
     bottom: 0;
-    box-shadow: 0px 0 3px 2px rgba(100, 100, 100, 0.1) inset;
+    // box-shadow: 0px 0 3px 2px rgba(100, 100, 100, 0.1) inset;
     .scroll-body {
       height: ~'calc(100% - 1px)';
       display: inline-block;
diff --git a/template/admin/src/components/main/components/tags-nav/tags-nav.vue b/template/admin/src/components/main/components/tags-nav/tags-nav.vue
index 0b06cc21c..0ca6e6313 100644
--- a/template/admin/src/components/main/components/tags-nav/tags-nav.vue
+++ b/template/admin/src/components/main/components/tags-nav/tags-nav.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="tags-nav">
-    <div class="close-con">
+    <!-- <div class="close-con">
       <Dropdown transfer @on-click="handleTagsOption" style="margin-top: 7px">
         <Button size="small" type="text">
           <Icon :size="18" type="ios-close-circle-outline" />
@@ -10,7 +10,7 @@
           <DropdownItem name="close-others">关闭其他</DropdownItem>
         </DropdownMenu>
       </Dropdown>
-    </div>
+    </div> -->
     <ul v-show="visible" :style="{ left: contextMenuLeft + 'px', top: contextMenuTop + 'px' }" class="contextmenu">
       <li v-for="(item, key) of menuList" @click="handleTagsOption(key)" :key="key">{{ item }}</li>
     </ul>
diff --git a/template/admin/src/components/main/main.vue b/template/admin/src/components/main/main.vue
index 3e5cfca03..1a0333a0b 100644
--- a/template/admin/src/components/main/main.vue
+++ b/template/admin/src/components/main/main.vue
@@ -2,8 +2,8 @@
   <Layout style="height: 100%" class="main">
     <Header class="header-con" v-if="!headMenuNoShow">
       <div class="logo-con">
-        <img v-show="!collapsed" :src="maxLogo" key="max-logo" />
-        <img v-show="collapsed" :src="minLogo" key="min-logo" />
+        <img :src="maxLogo" key="max-logo" />
+        <!-- <img v-show="collapsed" :src="minLogo" key="min-logo" /> -->
       </div>
       <header-bar :collapsed="collapsed" @on-coll-change="handleCollapsedChange">
         <user :message-unread-count="unreadCount" :user-avatar="userAvatar" />
diff --git a/template/admin/src/pages/setting/setSystem/index.vue b/template/admin/src/pages/setting/setSystem/index.vue
index 1e592a7e2..0649838d5 100644
--- a/template/admin/src/pages/setting/setSystem/index.vue
+++ b/template/admin/src/pages/setting/setSystem/index.vue
@@ -223,5 +223,6 @@ export default {
 
 .fromBox {
   min-height: 600px;
+  margin-top 0px !important ;
 }
 </style>