适配多商户

src/views/booking/field/index.vue

@@ -2,12 +2,12 @@
   <div class="ele-body">
     <a-card :bordered="false" :body-style="{ padding: '16px' }">
       <ele-split-layout
-        width="266px"
-        allow-collapse
+        :width="!getMerchantName() ? '266px' : ''"
+        :allow-collapse="!getMerchantName()"
         :right-style="{ overflow: 'hidden' }"
-        :style="{ minHeight: 'calc(100vh - 152px)' }"
+        :style="{ minHeight: 'calc(100vh - 252px)' }"
       >
-        <div>
+        <div v-if="!getMerchantName()">
           <ele-toolbar theme="default">
             <span class="ele-text-heading">场馆列表</span>
           </ele-toolbar>
@@ -70,6 +70,8 @@
   import { removeMerchant } from '@/api/shop/merchant';
   import { Merchant } from '@/api/shop/merchant/model';
   import { listMerchant } from '@/api/shop/merchant';
+  import { getMerchantId } from '@/utils/common';
+  import { getMerchantName } from "@/utils/merchant";
 
   // 加载状态
   const loading = ref(true);
@@ -95,7 +97,9 @@
   /* 查询 */
   const query = () => {
     loading.value = true;
-    listMerchant()
+    listMerchant({
+      merchantId: getMerchantId()
+    })
       .then((list) => {
         loading.value = false;
         const eks: number[] = [];

src/views/booking/field/list.vue

@@ -7,7 +7,7 @@
     :datasource="datasource"
     v-model:selection="selection"
     :customRow="customRow"
-    height="calc(100vh - 290px)"
+    height="calc(100vh - 390px)"
     tool-class="ele-toolbar-form"
     :scroll="{ x: 800 }"
   >
@@ -95,6 +95,7 @@
   import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
   import { Merchant } from '@/api/shop/merchant/model';
   import PeriodEdit from './period/index.vue';
+  import { getMerchantId } from "@/utils/common";
 
   const props = defineProps<{
     // 场馆场地 id
@@ -223,6 +224,7 @@
       where.sortNumber = filters.sortNumber;
       where.status = filters.status;
     }
+    where.merchantId = getMerchantId();
     return pageField({
       ...where,
       ...orders,