From 7b3fc7a544a78833d84cd547e87e8a4dce943331 Mon Sep 17 00:00:00 2001 From: wang_fan_w <2547096351@qq.com> Date: Sun, 7 Apr 2024 00:06:15 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E5=92=8C=E9=80=9A=E7=9F=A5=E6=B5=AE=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/icons/bill.svg | 1 - src/icons/comm.svg | 1 - src/icons/exit.svg | 1 + src/icons/form.svg | 1 - src/icons/gitee.svg | 1 + src/icons/home.svg | 1 - src/icons/lock-pwd.svg | 1 + src/icons/set.svg | 1 - src/icons/switch.svg | 1 - src/icons/user.svg | 1 + .../Header/components/Notice/index.vue | 52 +++++++++++++++++++ src/layout/components/Header/index.vue | 50 +++++++++++------- src/layout/components/Tabs/index.vue | 8 --- src/style/global-style.scss | 9 ++++ src/style/global-theme.scss | 1 + src/style/index.scss | 2 +- 16 files changed, 99 insertions(+), 33 deletions(-) delete mode 100644 src/icons/bill.svg delete mode 100644 src/icons/comm.svg create mode 100644 src/icons/exit.svg delete mode 100644 src/icons/form.svg create mode 100644 src/icons/gitee.svg delete mode 100644 src/icons/home.svg create mode 100644 src/icons/lock-pwd.svg delete mode 100644 src/icons/set.svg delete mode 100644 src/icons/switch.svg create mode 100644 src/icons/user.svg create mode 100644 src/layout/components/Header/components/Notice/index.vue create mode 100644 src/style/global-style.scss diff --git a/src/icons/bill.svg b/src/icons/bill.svg deleted file mode 100644 index 1f1775e..0000000 --- a/src/icons/bill.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/comm.svg b/src/icons/comm.svg deleted file mode 100644 index c33ae30..0000000 --- a/src/icons/comm.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/exit.svg b/src/icons/exit.svg new file mode 100644 index 0000000..eb8ea9d --- /dev/null +++ b/src/icons/exit.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/form.svg b/src/icons/form.svg deleted file mode 100644 index 99d7b4a..0000000 --- a/src/icons/form.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/gitee.svg b/src/icons/gitee.svg new file mode 100644 index 0000000..b55b63c --- /dev/null +++ b/src/icons/gitee.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/home.svg b/src/icons/home.svg deleted file mode 100644 index c375e64..0000000 --- a/src/icons/home.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/lock-pwd.svg b/src/icons/lock-pwd.svg new file mode 100644 index 0000000..5b8519e --- /dev/null +++ b/src/icons/lock-pwd.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/set.svg b/src/icons/set.svg deleted file mode 100644 index c0b63e7..0000000 --- a/src/icons/set.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/switch.svg b/src/icons/switch.svg deleted file mode 100644 index 6a63856..0000000 --- a/src/icons/switch.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/user.svg b/src/icons/user.svg new file mode 100644 index 0000000..12efb35 --- /dev/null +++ b/src/icons/user.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/layout/components/Header/components/Notice/index.vue b/src/layout/components/Header/components/Notice/index.vue new file mode 100644 index 0000000..3b30145 --- /dev/null +++ b/src/layout/components/Header/components/Notice/index.vue @@ -0,0 +1,52 @@ + + + + {{ `${item.title}(${item.data.length})` }} + + + + + {{ content.nickname }} + {{ content.time }} + + + + + + + + + + + diff --git a/src/layout/components/Header/index.vue b/src/layout/components/Header/index.vue index 049d51c..b4cb46b 100644 --- a/src/layout/components/Header/index.vue +++ b/src/layout/components/Header/index.vue @@ -42,13 +42,14 @@ - - + + - + + @@ -73,7 +74,7 @@ - + admin @@ -81,29 +82,29 @@ - - + + + 个人信息 - 个人信息 - - + + + 修改密码 - 修改密码 - - + + + 项目地址 - 项目地址 - - + + + 退出登录 - 退出登录 @@ -111,6 +112,7 @@ @@ -159,9 +161,7 @@ import Tom from "@/assets/img/tom.jpg"; } .my_setting { - // width: 32px; height: 32px; - // border-radius: 50%; margin-left: $margin; overflow: hidden; display: flex; @@ -179,6 +179,20 @@ import Tom from "@/assets/img/tom.jpg"; } } } +.notice { + position: relative; + &::before { + content: ""; + width: 6px; + height: 6px; + border: 2px solid #fff; + border-radius: 50%; + position: absolute; + right: -2px; + top: -4px; + background: $color-danger; + } +} :deep(.arco-dropdown-open) { .icon_down { transform: rotate(180deg) !important; diff --git a/src/layout/components/Tabs/index.vue b/src/layout/components/Tabs/index.vue index 70a2b47..1f620ea 100644 --- a/src/layout/components/Tabs/index.vue +++ b/src/layout/components/Tabs/index.vue @@ -91,15 +91,7 @@ const handleDelete = (key: any) => { margin: 0 0 0 $margin; .setting { margin-right: $margin; - transform: rotate(0deg); color: $color-text-2; - // transition: - // transform 0.2s, - // color 0.2s; - // &:hover { - // transform: rotate(180deg); - // color: $color-primary; - // } } } } diff --git a/src/style/global-style.scss b/src/style/global-style.scss new file mode 100644 index 0000000..557d308 --- /dev/null +++ b/src/style/global-style.scss @@ -0,0 +1,9 @@ +/* global style scss */ +// 左间距-行内文字 +.margin-left-text { + margin-left: $margin-text; +} +// 右间距-行内文字 +.margin-right-text { + margin-right: $margin-text; +} diff --git a/src/style/global-theme.scss b/src/style/global-theme.scss index 5e578e2..1184ad2 100644 --- a/src/style/global-theme.scss +++ b/src/style/global-theme.scss @@ -1,6 +1,7 @@ /* global css theme */ $margin: 14px; // 盒子间距 +$margin-text: 8px; // 文字间距-行内 $padding: 16px; // 盒子和内容的间距 $radius-box: 4px; // 边框圆角 $icon-box: 24px; // icon盒子通用大小 diff --git a/src/style/index.scss b/src/style/index.scss index 1d58681..360eb87 100644 --- a/src/style/index.scss +++ b/src/style/index.scss @@ -1,6 +1,6 @@ @import "./global-theme.scss"; @import "./global-transition.scss"; - +@import "./global-style.scss"; * { margin: 0; padding: 0;