From 6230caae8cc388f4f024423d791992ba89b81e97 Mon Sep 17 00:00:00 2001
From: skyselang <215817969@qq.com>
Date: Tue, 16 Jan 2024 11:56:51 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=F0=9F=90=9B=20=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E9=A1=B5=E9=AA=8C=E8=AF=81=E7=A0=81=E4=B8=8E=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E6=A1=86=E9=AB=98=E5=BA=A6=E4=B8=8D=E4=B8=80=E8=87=B4(?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=B8=83=E5=B1=80=E5=A4=A7=E5=B0=8F)?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/index.vue | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index fcc1f55..7561775 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -87,6 +87,7 @@
             <el-image
               :src="captchaBase64"
               @click="getCaptcha"
+              :style="{ height: captchaHeight }"
               class="w-[120px] h-[48px] cursor-pointer"
             >
               <template #error>
@@ -238,6 +239,17 @@ function getCaptcha() {
     captchaBase64.value = data.captchaBase64;
   });
 }
+/**
+ * 根据组件大小调整验证码图片高度
+ */
+const captchaHeight = computed(() => {
+  if (appStore.size === "large") {
+    return "56px";
+  } else if (appStore.size === "small") {
+    return "40px";
+  }
+  return "48px";
+});
 
 /**
  * 登录

From 60fa7561890858f0d94952af4f507ace1e340685 Mon Sep 17 00:00:00 2001
From: skyselang <215817969@qq.com>
Date: Tue, 16 Jan 2024 11:59:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=F0=9F=90=9B=20=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=9D=A1=E6=97=B6=E9=80=80=E5=87=BA=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E5=BC=B9=E6=A1=86=E9=A1=B5=E9=9D=A2=E6=8A=96=E5=8A=A8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/NavBar/NavRight.vue | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/layout/components/NavBar/NavRight.vue b/src/layout/components/NavBar/NavRight.vue
index 904f018..fa42222 100644
--- a/src/layout/components/NavBar/NavRight.vue
+++ b/src/layout/components/NavBar/NavRight.vue
@@ -70,16 +70,19 @@ function logout() {
     confirmButtonText: "确定",
     cancelButtonText: "取消",
     type: "warning",
-  }).then(() => {
-    userStore
-      .logout()
-      .then(() => {
-        tagsViewStore.delAllViews();
-      })
-      .then(() => {
-        router.push(`/login?redirect=${route.fullPath}`);
-      });
-  });
+    lockScroll: false,
+  })
+    .then(() => {
+      userStore
+        .logout()
+        .then(() => {
+          tagsViewStore.delAllViews();
+        })
+        .then(() => {
+          router.push(`/login?redirect=${route.fullPath}`);
+        });
+    })
+    .catch(() => {});
 }
 </script>
 <style lang="scss" scoped>