!18 fix：登录验证码错位和退出系统页面抖动问题修复

Merge pull request !18 from skyselang/bugfix

src/layout/components/NavBar/NavRight.vue

@@ -70,7 +70,9 @@ function logout() {
     confirmButtonText: "确定",
     cancelButtonText: "取消",
     type: "warning",
-  }).then(() => {
+    lockScroll: false,
+  })
+    .then(() => {
       userStore
         .logout()
         .then(() => {
@@ -79,7 +81,8 @@ function logout() {
         .then(() => {
           router.push(`/login?redirect=${route.fullPath}`);
         });
-  });
+    })
+    .catch(() => {});
 }
 </script>
 <style lang="scss" scoped>

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";
+});
 
 /**
  * 登录