From f1d3126f9a98776dc9c9e72caab0f05942abf890 Mon Sep 17 00:00:00 2001
From: birt <2499248221@qq.com>
Date: 星期日, 13 四月 2025 13:26:49 +0800
Subject: [PATCH] 123
---
zhitan-vue/src/views/login.vue | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/zhitan-vue/src/views/login.vue b/zhitan-vue/src/views/login.vue
index 2fe18dd..c99007b 100644
--- a/zhitan-vue/src/views/login.vue
+++ b/zhitan-vue/src/views/login.vue
@@ -201,14 +201,19 @@
.login {
display: flex;
align-items: center;
+<<<<<<< HEAD
+ height: 100vh;
+=======
height: 100%;
- background-image: url("@/assets/images/login-background.jpg");
+>>>>>>> bf185c5d6a86eaa6a27d93b6d5942234d5bebb24
+ background-image: url("@/assets/images/login-background.png");
background-repeat: no-repeat;
background-size: cover;
flex-direction: column;
position: relative;
min-width: 700px;
min-height: 700px;
+ background-color:#001146
}
.middle-view {
--
Gitblit v1.9.3