From e0f4815d48bd2d4182fdb044748115254f229896 Mon Sep 17 00:00:00 2001 From: wangys <3401275564@qq.com> Date: Fri, 17 Oct 2025 16:12:29 +0800 Subject: [PATCH] =?UTF-8?q?web-usercenter=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/assets/imgs/default-avatar.png | Bin 0 -> 2901 bytes schoolNewsWeb/src/assets/imgs/female.svg | 12 + schoolNewsWeb/src/assets/imgs/male.svg | 5 + schoolNewsWeb/src/assets/imgs/v1-icon.svg | 120 ++++++ schoolNewsWeb/src/assets/imgs/v1.svg | 4 + schoolNewsWeb/src/assets/imgs/v2-icon.svg | 128 ++++++ schoolNewsWeb/src/assets/imgs/v2.svg | 5 + schoolNewsWeb/src/assets/imgs/v3-icon.svg | 219 ++++++++++ schoolNewsWeb/src/assets/imgs/v3.svg | 5 + schoolNewsWeb/src/assets/imgs/v4-icon.svg | 400 ++++++++++++++++++ schoolNewsWeb/src/assets/imgs/v4.svg | 5 + .../src/components/base/TopNavigation.vue | 42 +- .../src/components/base/UserDropdown.vue | 159 +++++-- .../src/layouts/NavigationLayout.vue | 7 +- .../src/views/user-center/UserCenterView.vue | 225 ++++------ .../views/user-center/components/UserCard.vue | 269 ++++++++++++ 16 files changed, 1398 insertions(+), 207 deletions(-) create mode 100644 schoolNewsWeb/src/assets/imgs/default-avatar.png create mode 100644 schoolNewsWeb/src/assets/imgs/female.svg create mode 100644 schoolNewsWeb/src/assets/imgs/male.svg create mode 100644 schoolNewsWeb/src/assets/imgs/v1-icon.svg create mode 100644 schoolNewsWeb/src/assets/imgs/v1.svg create mode 100644 schoolNewsWeb/src/assets/imgs/v2-icon.svg create mode 100644 schoolNewsWeb/src/assets/imgs/v2.svg create mode 100644 schoolNewsWeb/src/assets/imgs/v3-icon.svg create mode 100644 schoolNewsWeb/src/assets/imgs/v3.svg create mode 100644 schoolNewsWeb/src/assets/imgs/v4-icon.svg create mode 100644 schoolNewsWeb/src/assets/imgs/v4.svg create mode 100644 schoolNewsWeb/src/views/user-center/components/UserCard.vue diff --git a/schoolNewsWeb/src/assets/imgs/default-avatar.png b/schoolNewsWeb/src/assets/imgs/default-avatar.png new file mode 100644 index 0000000000000000000000000000000000000000..91dd02dc8a6edd95fb2a5e56fd8a36bc0f49cc5c GIT binary patch literal 2901 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 literal 0 HcmV?d00001 diff --git a/schoolNewsWeb/src/assets/imgs/female.svg b/schoolNewsWeb/src/assets/imgs/female.svg new file mode 100644 index 0000000..528c26e --- /dev/null +++ b/schoolNewsWeb/src/assets/imgs/female.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/schoolNewsWeb/src/assets/imgs/male.svg b/schoolNewsWeb/src/assets/imgs/male.svg new file mode 100644 index 0000000..9e8db7c --- /dev/null +++ b/schoolNewsWeb/src/assets/imgs/male.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/schoolNewsWeb/src/assets/imgs/v1-icon.svg b/schoolNewsWeb/src/assets/imgs/v1-icon.svg new file mode 100644 index 0000000..3c7fc1c --- /dev/null +++ b/schoolNewsWeb/src/assets/imgs/v1-icon.svg @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/schoolNewsWeb/src/assets/imgs/v1.svg b/schoolNewsWeb/src/assets/imgs/v1.svg new file mode 100644 index 0000000..f126669 --- /dev/null +++ b/schoolNewsWeb/src/assets/imgs/v1.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/schoolNewsWeb/src/assets/imgs/v2-icon.svg b/schoolNewsWeb/src/assets/imgs/v2-icon.svg new file mode 100644 index 0000000..93d1a8f --- /dev/null +++ b/schoolNewsWeb/src/assets/imgs/v2-icon.svg @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/schoolNewsWeb/src/assets/imgs/v2.svg b/schoolNewsWeb/src/assets/imgs/v2.svg new file mode 100644 index 0000000..3bb8961 --- /dev/null +++ b/schoolNewsWeb/src/assets/imgs/v2.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/schoolNewsWeb/src/assets/imgs/v3-icon.svg b/schoolNewsWeb/src/assets/imgs/v3-icon.svg new file mode 100644 index 0000000..027279e --- /dev/null +++ b/schoolNewsWeb/src/assets/imgs/v3-icon.svg @@ -0,0 +1,219 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/schoolNewsWeb/src/assets/imgs/v3.svg b/schoolNewsWeb/src/assets/imgs/v3.svg new file mode 100644 index 0000000..6d435b0 --- /dev/null +++ b/schoolNewsWeb/src/assets/imgs/v3.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/schoolNewsWeb/src/assets/imgs/v4-icon.svg b/schoolNewsWeb/src/assets/imgs/v4-icon.svg new file mode 100644 index 0000000..6ea1ffd --- /dev/null +++ b/schoolNewsWeb/src/assets/imgs/v4-icon.svg @@ -0,0 +1,400 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/schoolNewsWeb/src/assets/imgs/v4.svg b/schoolNewsWeb/src/assets/imgs/v4.svg new file mode 100644 index 0000000..eefe245 --- /dev/null +++ b/schoolNewsWeb/src/assets/imgs/v4.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/schoolNewsWeb/src/components/base/TopNavigation.vue b/schoolNewsWeb/src/components/base/TopNavigation.vue index 8053452..61a317a 100644 --- a/schoolNewsWeb/src/components/base/TopNavigation.vue +++ b/schoolNewsWeb/src/components/base/TopNavigation.vue @@ -3,12 +3,12 @@
-
+
store.getters['auth/menuTree']); const userInfo = computed(() => store.getters['auth/userInfo']); -// 获取第一层的导航菜单（MenuType.NAVIGATION） +// 获取第一层的导航菜单（MenuType.NAVIGATION），过滤掉用户相关菜单 const navigationMenus = computed(() => { - const menus = allMenus.value.filter((menu: SysMenu) => menu.type === MenuType.NAVIGATION); + const menus = allMenus.value.filter((menu: SysMenu) => { + // 过滤掉"用户下拉菜单"容器，这些显示在UserDropdown中 + if (menu.menuID === 'menu_user_dropdown') { + return false; + } + return menu.type === MenuType.NAVIGATION; + }); console.log('导航菜单数据:', menus); menus.forEach((menu: SysMenu) => { console.log(`菜单 ${menu.name}:`, { @@ -190,6 +196,15 @@ function handleMouseLeave() { activeDropdown.value = null; } +// 处理鼠标滚轮水平滚动 +function handleWheel(event: WheelEvent) { + const container = event.currentTarget as HTMLElement; + if (container) { + event.preventDefault(); + container.scrollLeft += event.deltaY; + } +} + // 处理导航点击 function handleNavClick(menu: SysMenu) { activeDropdown.value = null; @@ -227,6 +242,7 @@ function handleLogout() { position: sticky; top: 0; z-index: 1000; + overflow: hidden; } .nav-container { @@ -238,6 +254,7 @@ function handleLogout() { gap: 20px; width: 100%; position: relative; + overflow: visible; } .nav-logo { @@ -268,36 +285,31 @@ function handleLogout() { gap: 0; flex: 1; overflow-x: auto; - overflow-y: hidden; + overflow-y: visible; scroll-behavior: smooth; - padding-bottom: 2px; /* 为滚动条留出空间 */ /* 自定义滚动条样式 */ - scrollbar-width: thin; + scrollbar-width: auto; scrollbar-color: #C62828 #f5f5f5; &::-webkit-scrollbar { - height: 6px; + height: 8px; } &::-webkit-scrollbar-track { background: #f5f5f5; - border-radius: 3px; + border-radius: 4px; + margin: 0 10px; /* 滚动条内缩 */ } &::-webkit-scrollbar-thumb { background: #C62828; - border-radius: 3px; + border-radius: 4px; &:hover { background: #B71C1C; } } - - /* 当内容可以滚动时显示滚动条 */ - &:hover::-webkit-scrollbar-thumb { - background: #C62828; - } } .nav-item { diff --git a/schoolNewsWeb/src/components/base/UserDropdown.vue b/schoolNewsWeb/src/components/base/UserDropdown.vue index ebbf1d3..cd146d5 100644 --- a/schoolNewsWeb/src/components/base/UserDropdown.vue +++ b/schoolNewsWeb/src/components/base/UserDropdown.vue @@ -1,5 +1,12 @@