整理系统菜单及权限

src/layout/components/header-tools.vue

@@ -1,6 +1,11 @@
 <!-- 顶栏右侧区域 -->
 <template>
   <div class="ele-admin-header-tool">
+    <div class="ele-admin-header-tool-item">
+      <a-button @click="openUrl(`/merchant/account`)">{{
+        getMerchantName()
+      }}</a-button>
+    </div>
     <div class="ele-admin-header-tool-item">
       <a-tree-select
         show-search
@@ -24,7 +29,7 @@
     <!--      旧版-->
     <!--    </div>-->
     <!-- 消息通知 -->
-    <div class="ele-admin-header-tool-item">
+    <div class="ele-admin-header-tool-item" @click="openUrl(`/user/notice`)">
       <header-notice />
     </div>
     <!-- 全屏切换 -->
@@ -137,9 +142,9 @@
       </a-dropdown>
     </div>
     <!-- 主题设置 -->
-<!--    <div class="ele-admin-header-tool-item" @click="openSetting">-->
-<!--      <more-outlined />-->
-<!--    </div>-->
+    <!--    <div class="ele-admin-header-tool-item" @click="openSetting">-->
+    <!--      <more-outlined />-->
+    <!--    </div>-->
   </div>
   <!-- 修改密码弹窗 -->
   <password-modal v-model:visible="passwordVisible" />
@@ -164,7 +169,7 @@
     SearchOutlined
   } from '@ant-design/icons-vue';
   import { storeToRefs } from 'pinia';
-  import { copyText, openNew, openUrl } from '@/utils/common';
+  import { copyText, getUserId, openNew, openUrl } from '@/utils/common';
   import { useThemeStore } from '@/store/modules/theme';
   import HeaderNotice from './header-notice.vue';
   import PasswordModal from './password-modal.vue';
@@ -174,6 +179,7 @@
   import type { Menu } from '@/api/system/menu/model';
   import { listMenus } from '@/api/system/menu';
   import { isExternalLink, toTreeData } from 'ele-admin-pro';
+  import { getMerchantName } from '../../utils/merchant';
 
   // 是否开启响应式布局
   const themeStore = useThemeStore();