diff --git a/src/assets/image/icon/notice.png b/src/assets/image/icon/notice.png new file mode 100644 index 0000000..aec6f3b Binary files /dev/null and b/src/assets/image/icon/notice.png differ diff --git a/src/components/page/GlobalLayout.vue b/src/components/page/GlobalLayout.vue index 7e714d3..d089bdd 100644 --- a/src/components/page/GlobalLayout.vue +++ b/src/components/page/GlobalLayout.vue @@ -359,16 +359,18 @@ body { .header, .top-nav-header-index { .user-wrapper { + display: flex; float: right; height: 100%; .action { cursor: pointer; - padding: 0 14px; - display: inline-block; + padding: 0 8px; + display: inline-flex; + align-items: center; transition: all .3s; - height: 70%; + //height: 70%; line-height: 46px; &.action-full { diff --git a/src/components/tools/HeaderNotice.vue b/src/components/tools/HeaderNotice.vue index 09186d5..a84f677 100644 --- a/src/components/tools/HeaderNotice.vue +++ b/src/components/tools/HeaderNotice.vue @@ -30,7 +30,8 @@ - + + @@ -299,4 +300,8 @@ export default { vertical-align: initial; } } +.header-notice-btn { + width: 32px; + height: 32px; +} diff --git a/src/components/tools/UserMenu.vue b/src/components/tools/UserMenu.vue index 7b74a5b..a9a5d33 100644 --- a/src/components/tools/UserMenu.vue +++ b/src/components/tools/UserMenu.vue @@ -31,6 +31,16 @@ +
+ + En + + + + + + +
@@ -91,12 +101,12 @@ - - - - {{ $t('header.logOutOfUserMenu') }} + @@ -360,9 +370,71 @@ export default { /* update_end author:zhaoxin date:20191129 for: 让搜索框颜色能随主题颜色变换*/ -