适配多商户

src/layout/components/header-tools.vue

@@ -1,11 +1,6 @@
 <!-- 顶栏右侧区域 -->
 <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
@@ -13,15 +8,24 @@
         treeDefaultExpandAll
         :bordered="bordered"
         :tree-data="menuTree"
-        :placeholder="`搜索...`"
+        :placeholder="`请输入搜索关键词`"
         :value="parentId || undefined"
         style="width: 180px"
+        v-if="menuTree.length"
         :dropdown-style="{ maxHeight: '560px', overflow: 'auto' }"
         @change="onChange"
       >
         <template #suffixIcon><SearchOutlined /></template>
       </a-tree-select>
     </div>
+    <!-- 商户名称 -->
+    <template v-if="getMerchantName()">
+      <div class="ele-admin-header-tool-item">
+        <a-button @click="openUrl(`/booking/school`)">{{
+          getMerchantName()
+        }}</a-button>
+      </div>
+    </template>
     <!--    <div-->
     <!--      class="ele-admin-header-tool-item"-->
     <!--      @click="openUrl('https://b.gxwebsoft.com')"-->
@@ -168,7 +172,7 @@
     SearchOutlined
   } from '@ant-design/icons-vue';
   import { storeToRefs } from 'pinia';
-  import { copyText, getUserId, openNew, openUrl } from '@/utils/common';
+  import { copyText, openNew, openUrl } from '@/utils/common';
   import { useThemeStore } from '@/store/modules/theme';
   import HeaderNotice from './header-notice.vue';
   import PasswordModal from './password-modal.vue';
@@ -178,7 +182,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';
+  import { getMerchantName } from '@/utils/merchant';
 
   // 是否开启响应式布局
   const themeStore = useThemeStore();