From 894747ee6b03101994105fd88ff7ff0dbba3c11c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= <2498601771@qq.com>
Date: Fri, 26 Apr 2024 18:04:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E5=BC=B9=E5=87=BA=E6=A1=86=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=B8=A2=E5=A4=B1=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E7=82=B9=E5=87=BBlogout=E6=8C=89=E9=92=AE=E7=A9=BA?=
 =?UTF-8?q?=E7=99=BD=E5=A4=84=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/common.scss       | 76 ++++++++++++++++++++++++++++++--
 src/components/layout/Header.vue | 10 ++---
 2 files changed, 77 insertions(+), 9 deletions(-)

diff --git a/src/assets/css/common.scss b/src/assets/css/common.scss
index 108c64a7..84017e73 100644
--- a/src/assets/css/common.scss
+++ b/src/assets/css/common.scss
@@ -3,13 +3,16 @@
 [v-cloak] {
   display: none !important;
 }
+
 * {
   font-family: NotoSansSChineseRegular, serif;
   box-sizing: border-box;
 }
+
 html, body, #app {
   height: 100%;
 }
+
 body {
   min-width: 1024px;
   margin: 0 !important;
@@ -17,11 +20,13 @@ body {
   cursor: default !important;
   overflow: hidden;
 }
+
 // 在计算文本实际宽度的逻辑中使用到的临时dom
 .temp-dom {
   visibility: hidden;
   position: fixed;
 }
+
 .icon {
   width: 1em;
   height: 1em;
@@ -33,7 +38,7 @@ body {
 /* 淡入淡出动画 */
 .fade-enter-active,
 .fade-leave-active {
- transition: opacity 0.4s ease;
+  transition: opacity 0.4s ease;
 }
 
 .fade-enter-from,
@@ -46,22 +51,24 @@ body {
   //min-width: 30px !important;
   display: inline-block;
   background: #FFE7E6 !important;
-  border: 1px solid rgba(226,97,84,0.42) !important;
+  border: 1px solid rgba(226, 97, 84, 0.42) !important;
   padding: 6.6px 12px !important;
   border-radius: 4px !important;
   font-size: 14px !important;
   color: #F53A19 !important;
   font-weight: 400 !important;
   line-height: 1.2 !important;
+
   .el-popper__arrow {
     display: none !important;
   }
 }
 
 // 表头单词换行不被拆开
-.el-table th > .cell  {
+.el-table th > .cell {
   word-break: keep-all !important;
 }
+
 // 表格内容换行，不对中文生效，避免中文出现省略号
 .el-table .cell {
   word-break: break-word !important;
@@ -79,6 +86,67 @@ body {
   overflow: hidden;
 }
 
-.upload-body{
+.upload-body {
   text-align: center;
 }
+
+.change-pin-dialog {
+  .el-dialog__header {
+    padding: 20px 20px 10px 20px;
+
+    .el-dialog__headerbtn {
+      position: absolute;
+      top: 10px;
+      right: 4px;
+      padding: 0;
+      background: transparent;
+      border: none;
+      outline: none;
+      cursor: pointer;
+      font-size: 16px;
+    }
+  }
+
+  .el-dialog__body {
+    padding: 30px 20px;
+
+    .el-form-item {
+      display: block;
+
+      .el-input__wrapper {
+        height: 39px;
+      }
+    }
+  }
+
+  .el-dialog__footer {
+    padding: 20px;
+
+    .dialog-footer {
+      display: flex;
+      justify-content: flex-end;
+
+      .el-button {
+        border-radius: 2px;
+      }
+
+      .el-button:nth-child(1) {
+        width: 80px;
+        height: 28px;
+        margin-right: 20px;
+        color: var(--el-text-color-primary);
+        background: var(--el-fill-color-light);
+        border: 1px solid var(--el-border-color-dark);
+        border-radius: 2px;
+      }
+
+      .el-button:nth-child(2) {
+        width: 80px;
+        height: 28px;
+        margin-left: 0 !important;
+        background-color: var(--el-color-business);
+        border-color: var(--el-color-business-dark-2);
+      }
+    }
+  }
+}
diff --git a/src/components/layout/Header.vue b/src/components/layout/Header.vue
index e7f886c4..2793642b 100644
--- a/src/components/layout/Header.vue
+++ b/src/components/layout/Header.vue
@@ -29,11 +29,11 @@
           <div class='login-user header-menu__item'>{{ nickName }}&nbsp;<i class="cn-icon cn-icon-arrow-down"></i></div>
           <template #dropdown>
             <el-dropdown-menu>
-              <el-dropdown-item>
-                <div id="header-to-changepin" @click="showPinDialog">{{ $t('overall.changePassword') }}</div>
+              <el-dropdown-item @click="showPinDialog">
+                <div id="header-to-changepin">{{ $t('overall.changePassword') }}</div>
               </el-dropdown-item>
-              <el-dropdown-item>
-                <div id="header-to-logout" @click="logout">{{ $t('overall.logout') }}</div>
+              <el-dropdown-item @click="logout">
+                <div id="header-to-logout">{{ $t('overall.logout') }}</div>
               </el-dropdown-item>
 <!--              <el-dropdown-item>-->
 <!--                <div id="header-to-theme" @click="switchTheme">-->
@@ -190,6 +190,7 @@
 
     <!-- 改密码 -->
     <el-dialog v-model="showChangePin"
+               class="change-pin-dialog"
                width="30%"
                :before-close="handleClose">
       <el-form :rules="changePassFormRules" :model="changePassForm" ref="changePassForm">
@@ -526,7 +527,6 @@ export default {
       this.showChangePin = true
     },
     logout () {
-      //
       sessionStorage.removeItem(storageKey.tokenExpireCurrentPath)
       localStorage.removeItem(storageKey.token)
       axios.get(api.logout)