diff --git a/screen-vue/src/views/Login.vue b/screen-vue/src/views/Login.vue
index d9e543a..690bcba 100644
--- a/screen-vue/src/views/Login.vue
+++ b/screen-vue/src/views/Login.vue
@@ -33,6 +33,7 @@
class="login-btn"
size="small"
:loading="isLoading"
+ round
>
登录
@@ -70,17 +71,11 @@ const handleLogin = async () => {
localStorage.setItem('username', res.username)
ElMessage.success('登录成功!')
setTimeout(() => {
- router.push('/dashboard')
+ router.push('/dashboard');
+ isLoading.value = false;
}, 3000)
} catch (error) {
- if (error.msg) {
- ElMessage.error(error.msg)
- } else {
- ElMessage.error('登录失败,请检查账号密码!')
- }
- console.error('登录出错:', error)
- } finally {
- isLoading.value = false
+ ElMessage.error(res.msg);
}
}
diff --git a/screen-vue/src/views/desktop/index.vue b/screen-vue/src/views/desktop/index.vue
index b6b36af..10cd743 100644
--- a/screen-vue/src/views/desktop/index.vue
+++ b/screen-vue/src/views/desktop/index.vue
@@ -32,16 +32,16 @@
@@ -69,7 +69,6 @@ const handleQuery = () => {
}
-