diff --git a/src/layout/components/NavBar/NavRight.vue b/src/layout/components/NavBar/NavRight.vue
index 904f0182..fa42222b 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>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index fcc1f554..7561775b 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";
+});
 
 /**
  * 登录