From 34fe52caba63e6a6337cb9c3e6bd0d4707fd6a99 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 06 三月 2026 10:17:05 +0800
Subject: [PATCH] 解决冲突
---
admin/src/views/login.vue | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/admin/src/views/login.vue b/admin/src/views/login.vue
index 5c64f46..8af0572 100644
--- a/admin/src/views/login.vue
+++ b/admin/src/views/login.vue
@@ -4,7 +4,7 @@
<div class="login_wrap">
<div class="login_img">
<div class="h3" style="font-size: 30px; margin-bottom: 0;">{{sysConfig.title || ''}}</div>
- <div class="h3">{{sysConfig.subtitle || title}}</div>
+ <div class="h3">鏅烘収鐗╂祦鍥尯瀹夋秷涓�浣撳寲绯荤粺</div>
</div>
<div class="form_wrap">
<div class="tabs">
@@ -104,6 +104,7 @@
...mapState(['sysConfig'])
},
mounted () {
+ alert(1)
this.username = localStorage.getItem('username') || ''
this.password = localStorage.getItem('password') || ''
this.phone = localStorage.getItem('phone') || ''
--
Gitblit v1.9.3