!18 fix:登录验证码错位和退出系统页面抖动问题修复
Merge pull request !18 from skyselang/bugfix
This commit is contained in:
commit
5a68c85821
|
|
@ -70,16 +70,19 @@ function logout() {
|
||||||
confirmButtonText: "确定",
|
confirmButtonText: "确定",
|
||||||
cancelButtonText: "取消",
|
cancelButtonText: "取消",
|
||||||
type: "warning",
|
type: "warning",
|
||||||
}).then(() => {
|
lockScroll: false,
|
||||||
userStore
|
})
|
||||||
.logout()
|
.then(() => {
|
||||||
.then(() => {
|
userStore
|
||||||
tagsViewStore.delAllViews();
|
.logout()
|
||||||
})
|
.then(() => {
|
||||||
.then(() => {
|
tagsViewStore.delAllViews();
|
||||||
router.push(`/login?redirect=${route.fullPath}`);
|
})
|
||||||
});
|
.then(() => {
|
||||||
});
|
router.push(`/login?redirect=${route.fullPath}`);
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.catch(() => {});
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
|
|
|
||||||
|
|
@ -87,6 +87,7 @@
|
||||||
<el-image
|
<el-image
|
||||||
:src="captchaBase64"
|
:src="captchaBase64"
|
||||||
@click="getCaptcha"
|
@click="getCaptcha"
|
||||||
|
:style="{ height: captchaHeight }"
|
||||||
class="w-[120px] h-[48px] cursor-pointer"
|
class="w-[120px] h-[48px] cursor-pointer"
|
||||||
>
|
>
|
||||||
<template #error>
|
<template #error>
|
||||||
|
|
@ -238,6 +239,17 @@ function getCaptcha() {
|
||||||
captchaBase64.value = data.captchaBase64;
|
captchaBase64.value = data.captchaBase64;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
/**
|
||||||
|
* 根据组件大小调整验证码图片高度
|
||||||
|
*/
|
||||||
|
const captchaHeight = computed(() => {
|
||||||
|
if (appStore.size === "large") {
|
||||||
|
return "56px";
|
||||||
|
} else if (appStore.size === "small") {
|
||||||
|
return "40px";
|
||||||
|
}
|
||||||
|
return "48px";
|
||||||
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 登录
|
* 登录
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue