From 93e6872739d247f530df80d585b39361f7fccc1f Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Sat, 6 May 2023 15:22:31 +0800
Subject: [PATCH] =?UTF-8?q?improve:=20=E9=A1=B5=E9=9D=A2=E5=8F=8A=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/layout/component/transverseAside.vue  |  2 --
 .../src/layout/navBars/breadcrumb/setings.vue | 24 +++++++++----------
 .../src/layout/navBars/breadcrumb/user.vue    |  8 +++----
 .../src/pages/division/agent/applyList.vue    |  3 +--
 4 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/template/admin/src/layout/component/transverseAside.vue b/template/admin/src/layout/component/transverseAside.vue
index 46807e6b5..5e4cce5db 100644
--- a/template/admin/src/layout/component/transverseAside.vue
+++ b/template/admin/src/layout/component/transverseAside.vue
@@ -255,10 +255,8 @@ export default {
     }
     .columns-round {
       background: var(--prev-color-primary);
-      // color: var(--prev-color-text-white);
       position: absolute;
       left: 0;
-      //   top: 2px;
       height: 50px;
       width: 80px;
       transform: translatey(0%);
diff --git a/template/admin/src/layout/navBars/breadcrumb/setings.vue b/template/admin/src/layout/navBars/breadcrumb/setings.vue
index bcd0febb8..7a88e4e88 100644
--- a/template/admin/src/layout/navBars/breadcrumb/setings.vue
+++ b/template/admin/src/layout/navBars/breadcrumb/setings.vue
@@ -41,7 +41,7 @@
               <aside class="el-aside mr5" style="width: 10px"></aside>
               <aside class="el-aside-dark mr5" style="width: 17px"></aside>
               <section class="el-container is-vertical">
-                <!-- <header class="el-header" style="height: 10px"></header> -->
+                <header class="el-header mb5" style="height: 10px"></header>
                 <main class="el-main"></main>
               </section>
             </section>
@@ -60,7 +60,7 @@
             <section class="el-container is-vertical el-circular">
               <header class="el-aside mb5" style="height: 10px"></header>
               <section class="el-container">
-                <aside class="el-aside mr5" style="width: 20px"></aside>
+                <aside class="el-aside-dark mr5" style="width: 17px"></aside>
                 <section class="el-container is-vertical">
                   <main class="el-main"></main>
                 </section>
@@ -140,7 +140,7 @@
               <el-option label="紫白" value="theme-6"></el-option>
               <el-option label="红黑" value="theme-7"></el-option>
               <el-option label="红白" value="theme-8"></el-option>
-              <el-option label="渐变" value="theme-9"></el-option>
+              <el-option label="渐变" value="theme-9" v-if="getThemeConfig.layout === 'columns'"></el-option>
             </el-select>
           </div>
         </div>
@@ -197,7 +197,7 @@
             <el-switch v-model="getThemeConfig.isTagsview" :width="35" @change="setLocalThemeConfig"></el-switch>
           </div>
         </div>
-        <div class="layout-breadcrumb-seting-bar-flex mt15">
+        <!-- <div class="layout-breadcrumb-seting-bar-flex mt15">
           <div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsTagsviewIcon') }}</div>
           <div class="layout-breadcrumb-seting-bar-flex-value">
             <el-switch
@@ -207,7 +207,7 @@
               @change="setLocalThemeConfig"
             ></el-switch>
           </div>
-        </div>
+        </div> -->
         <!-- <div class="layout-breadcrumb-seting-bar-flex mt15">
           <div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsCacheTagsView') }}</div>
           <div class="layout-breadcrumb-seting-bar-flex-value">
@@ -601,10 +601,7 @@ export default {
 </script>
 <style>
 body .v-modal {
-  opacity: 0.5;
-  background-color: rgba(0, 0, 0, 0.3);
-  -webkit-backdrop-filter: blur(3px);
-  backdrop-filter: blur(5px);
+  background-color: rgba(0, 0, 0, 0.1);
 }
 </style>
 <style scoped lang="scss">
@@ -640,12 +637,12 @@ body .v-modal {
     margin: 0 -5px;
     .layout-drawer-content-item.drawer-layout-active {
       border: 1px solid;
-      border-color: #2d8cf0;
+      border-color: var(--prev-color-primary);
     }
     .layout-drawer-content-item:hover {
       transition: all 0.3s ease-in-out;
       border: 1px solid;
-      border-color: #2d8cf0;
+      border-color: var(--prev-color-primary);
     }
     .layout-drawer-content-item {
       width: 107px;
@@ -663,7 +660,8 @@ body .v-modal {
       .el-container {
         height: 100%;
         .el-aside-dark {
-          background-color: var(--prev-color-seting-header);
+          opacity: .5;
+          background-color: var(--prev-tag-active-color);
           border-radius: 2px;
         }
         .el-aside {
@@ -676,7 +674,7 @@ body .v-modal {
         }
         .el-main {
           border-radius: 2px;
-          border: 1px dashed #2d8cf0;
+          border: 1px dashed var(--prev-color-primary);
           padding: 0;
           background-color: var(--prev-color-seting-main);
         }
diff --git a/template/admin/src/layout/navBars/breadcrumb/user.vue b/template/admin/src/layout/navBars/breadcrumb/user.vue
index ae6c066ba..860298c87 100644
--- a/template/admin/src/layout/navBars/breadcrumb/user.vue
+++ b/template/admin/src/layout/navBars/breadcrumb/user.vue
@@ -191,19 +191,19 @@ export default {
                 instance.confirmButtonLoading = true;
                 instance.confirmButtonText = this.$t('message.user.logOutExit');
                 AccountLogout().then((res) => {
-                  this.$router.replace({ name: 'login' });
+                  done();
+                  this.$Message.success('您已成功退出');
                   this.$store.commit('clearAll');
                   localStorage.clear();
                   sessionStorage.clear();
                   removeCookies('token');
                   removeCookies('expires_time');
                   removeCookies('uuid');
-                  this.$Message.success('您已成功退出');
                   // this.$router.replace({ path: `${settings.routePre}/login` });
-                  done();
                   setTimeout(() => {
+                    this.$router.replace({ name: 'login' });
                     instance.confirmButtonLoading = false;
-                  }, 300);
+                  }, 1500);
                 });
               } else {
                 done();
diff --git a/template/admin/src/pages/division/agent/applyList.vue b/template/admin/src/pages/division/agent/applyList.vue
index 02c90e7af..d5799926d 100644
--- a/template/admin/src/pages/division/agent/applyList.vue
+++ b/template/admin/src/pages/division/agent/applyList.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
+    <Card :bordered="false" dis-hover class="ivu-mt mb10">
       <Form
         ref="formValidate"
         :model="formValidate"
@@ -48,7 +48,6 @@
             :columns="columns"
             :data="userLists"
             ref="table"
-            class="mt25"
             :loading="loading"
             highlight-row
             no-formValidate-text="暂无数据"