From d35afc038576e0d611f30fbe7cffe891a3e933d5 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 17 十二月 2025 18:49:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
admin/src/components/common/CommonHeader.vue | 6 +++---
admin/.env.development | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/admin/.env.development b/admin/.env.development
index 1cfeb98..5328169 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -5,9 +5,9 @@
#VUE_APP_API_URL = 'http://192.168.1.45:10010'
-#VUE_APP_API_URL = 'http://192.168.0.7/system_gateway'
+VUE_APP_API_URL = 'http://192.168.0.7/system_gateway'
-VUE_APP_API_URL = 'http://localhost:10010'
+#VUE_APP_API_URL = 'http://localhost:10010'
#key锛�045542fc5f436b75e6c911c5c84ff8cd
#瀵嗛挜锛�8bd38497f9aee2b75e7a888a4dfd1e6c
diff --git a/admin/src/components/common/CommonHeader.vue b/admin/src/components/common/CommonHeader.vue
index 10ef026..60ac907 100644
--- a/admin/src/components/common/CommonHeader.vue
+++ b/admin/src/components/common/CommonHeader.vue
@@ -379,7 +379,7 @@
box-sizing: border-box;
min-width: 360px;
height: 56px;
- padding: 10px 20px;
+ padding: 10px 12px;
// flex-shrink: 0;
line-height: 36px;
font-size: 22px;
@@ -484,8 +484,8 @@
align-items: center;
img {
top: 0 !important;
- width: 20px;
- height: 20px;
+ width: 18px;
+ height: 18px;
margin-right: 12px;
}
}
--
Gitblit v1.9.3