From 0cc4f2660e22ee16eebb82d3ddbdf2e365747920 Mon Sep 17 00:00:00 2001
From: xiaoxian521 <1923740402@qq.com>
Date: Mon, 28 Jun 2021 15:40:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E9=A1=B5=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/setting/index.vue |  4 +-
 src/layout/components/sidebar/Logo.vue  |  7 ++--
 src/layout/components/tag/index.vue     | 51 ++++++++++++++-----------
 3 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/src/layout/components/setting/index.vue b/src/layout/components/setting/index.vue
index e68875a25..3100393b0 100644
--- a/src/layout/components/setting/index.vue
+++ b/src/layout/components/setting/index.vue
@@ -79,8 +79,8 @@ export default {
   setup() {
     const router = useRouter();
 
-    // 默认卡片模式
-    const markValue = ref(storageLocal.getItem("showModel") || "card");
+    // 默认灵动模式
+    const markValue = ref(storageLocal.getItem("showModel") || "smart");
 
     const logoVal = ref(storageLocal.getItem("logoVal") || "1");
 
diff --git a/src/layout/components/sidebar/Logo.vue b/src/layout/components/sidebar/Logo.vue
index 86eb7165d..160e38bc1 100644
--- a/src/layout/components/sidebar/Logo.vue
+++ b/src/layout/components/sidebar/Logo.vue
@@ -42,7 +42,6 @@ export default defineComponent({
   position: relative;
   width: 100%;
   height: 50px;
-  background: #2b2f3a;
   text-align: center;
   overflow: hidden;
 
@@ -52,15 +51,15 @@ export default defineComponent({
     .sidebar-title {
       display: inline-block;
       margin: 0;
-      color: #fff;
+      color: #1890ff;
       font-weight: 600;
-      line-height: 50px;
       font-size: 20px;
+      margin-top: 16px;
       font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
     }
 
     .fa-optin-monster {
-      font-size: 38px;
+      font-size: 30px;
       color: #1890ff;
       margin-top: 5px;
     }
diff --git a/src/layout/components/tag/index.vue b/src/layout/components/tag/index.vue
index 88f9b30fc..e033d70bd 100644
--- a/src/layout/components/tag/index.vue
+++ b/src/layout/components/tag/index.vue
@@ -5,17 +5,17 @@
         v-for="(item, index) in dynamicTagList"
         :key="index"
         :ref="'dynamic' + index"
-        :class="['scroll-item', $route.path === item.path ? 'is-active' : '', $route.path === item.path && showModel ==='card'  ? 'card-active' : '' ]"
+        :class="['scroll-item is-closable', $route.path === item.path ? 'is-active' : '', $route.path === item.path && showModel ==='card'  ? 'card-active' : '' ]"
         @contextmenu.prevent.native="openMenu(item, $event)"
         @mouseenter.prevent="onMouseenter(item, index)"
         @mouseleave.prevent="onMouseleave(item, index)"
       >
         <router-link :to="item.path">{{ $t(item.meta.title) }}</router-link>
-        <i
+        <span
           v-if="$route.path === item.path && index !== 0 || index === activeIndex && index !== 0"
-          class="iconfont team-iconshanchu"
+          class="el-icon-close"
           @click="deleteMenu(item)"
-        ></i>
+        ></span>
         <div
           :ref="'schedule' + index"
           v-if="showModel !=='card'"
@@ -150,8 +150,8 @@ export default {
       }
     ]);
 
-    // 显示模式，默认卡片模式显示
-    const showModel = ref(storageLocal.getItem("showModel") || "card");
+    // 显示模式，默认灵动模式显示
+    const showModel = ref(storageLocal.getItem("showModel") || "smart");
     if (!showModel) {
       storageLocal.setItem("showModel", "card");
     }
@@ -435,18 +435,36 @@ export default {
   font-size: 14px;
   display: flex;
   box-shadow: 0 0 1px #888888;
+
   .scroll-item {
     border-radius: 3px 3px 0 0;
-    padding: 2px 8px;
+    padding: 2px 6px;
     display: inline-block;
     position: relative;
-    margin-right: 5px;
+    margin-right: 4px;
     height: 28px;
     line-height: 25px;
-    &:hover {
-      background-color: #eaf4fe;
+    transition: all 0.4s;
+
+    .el-icon-close {
+      font-size: 10px;
+      color: #1890ff;
+      cursor: pointer;
+      &:hover {
+        border-radius: 50%;
+        color: #fff;
+        background: #b4bccc;
+        font-size: 14px;
+      }
+    }
+
+    &.is-closable:not(:first-child) {
+      &:hover {
+        padding-right: 8px;
+      }
     }
   }
+
   a {
     text-decoration: none;
     color: #666;
@@ -534,19 +552,6 @@ export default {
   }
 }
 
-// 关闭图标
-.team-iconshanchu {
-  color: #1890ff;
-  cursor: pointer;
-  font-size: 14px;
-  transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-}
-.team-iconshanchu:hover {
-  border-radius: 50%;
-  color: #fff;
-  background: #b4bccc;
-}
-
 // 卡片模式
 .card-active {
   border: 1px solid #1890ff;