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 | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/admin/src/components/common/CommonHeader.vue b/admin/src/components/common/CommonHeader.vue
index acb630d..60ac907 100644
--- a/admin/src/components/common/CommonHeader.vue
+++ b/admin/src/components/common/CommonHeader.vue
@@ -21,8 +21,8 @@
</div>
</div>
<div class="user-images">
- <img src="@/assets/icons/ic_1.jpg" alt="">
- <img src="@/assets/icons/ic_2.png" alt="">
+<!-- <img src="@/assets/icons/ic_1.jpg" alt="">-->
+<!-- <img src="@/assets/icons/ic_2.png" alt="">-->
<img src="@/assets/icons/ic_3.jpg" alt="">
<img src="@/assets/icons/ic_4.jpg" alt="">
<img src="@/assets/icons/ic_5.jpg" alt="">
@@ -209,9 +209,9 @@
getAppHeaderNav(type).then(res => {
if (label === '瀹夐槻涓績') {
let openWindow = window.open(res, '_blank')
- setTimeout(() => {
- openWindow.close()
- }, 7 * 1000)
+ // setTimeout(() => {
+ // openWindow.close()
+ // }, 7 * 1000)
} else {
window.open(res, '_blank')
}
@@ -334,7 +334,7 @@
@import "@/assets/style/variables.scss";
.common-header {
- background-color: #2080f7;
+ background-color: #1E7FFF;
}
.list {
@@ -344,7 +344,7 @@
display: flex;
align-items: center;
.item {
- margin-right: 40px;
+ margin-right: 24px;
font-size: 16px;
font-weight: 400;
display: flex;
@@ -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,9 +484,9 @@
align-items: center;
img {
top: 0 !important;
- width: 24px;
- height: 24px;
- margin-right: 15px;
+ width: 18px;
+ height: 18px;
+ margin-right: 12px;
}
}
.el-dropdown {
--
Gitblit v1.9.3