整理商品管理模块

src/views/shop/merchant/components/search.vue

@@ -5,7 +5,19 @@
       <template #icon>
         <PlusOutlined />
       </template>
-      <span>添加商户</span>
+      <span>添加</span>
+    </a-button>
+    <a-button class="ele-btn-icon" @click="openUrl(`/shop/index`)">
+      <span>店铺管理</span>
+    </a-button>
+    <a-button class="ele-btn-icon" @click="openUrl(`/shop/apply`)">
+      <span>入驻申请</span>
+    </a-button>
+    <a-button class="ele-btn-icon" @click="openUrl(`/shop/desk`)">
+      <span>桌号管理</span>
+    </a-button>
+    <a-button class="ele-btn-icon" @click="openUrl(`/shop/type`)">
+      <span>店铺类型</span>
     </a-button>
   </a-space>
 </template>
@@ -14,6 +26,8 @@
   import { PlusOutlined } from '@ant-design/icons-vue';
   import type { GradeParam } from '@/api/user/grade/model';
   import { watch } from 'vue';
+  import { openUrl } from '@/utils/common';
+  import router from '@/router';
 
   const props = withDefaults(
     defineProps<{
@@ -36,7 +50,9 @@
   };
 
   watch(
-    () => props.selection,
-    () => {}
+    () => router.currentRoute,
+    (route) => {
+      console.log(route,'route');
+    }
   );
 </script>

src/views/shop/merchant/index.vue

@@ -30,7 +30,9 @@
             </template>
             <template v-if="column.key === 'action'">
               <a-space>
-                <a @click="openNew(record.adminUrl)">商家后台</a>
+                <a @click="openUrl(`/shop/account/${record.merchantId}`)"
+                  >门店用户</a
+                >
                 <a-divider type="vertical" />
                 <a @click="openEdit(record)">修改</a>
                 <a-divider type="vertical" />
@@ -64,9 +66,13 @@
   } from 'ele-admin-pro/es/ele-pro-table/types';
   import Search from './components/search.vue';
   import MerchantEdit from './components/merchantEdit.vue';
-  import { pageMerchant, removeMerchant, removeBatchMerchant } from '@/api/shop/merchant';
+  import {
+    pageMerchant,
+    removeMerchant,
+    removeBatchMerchant
+  } from '@/api/shop/merchant';
   import type { Merchant, MerchantParam } from '@/api/shop/merchant/model';
-  import {openNew, openPreview} from "@/utils/common";
+  import { openNew, openPreview, openUrl } from '@/utils/common';
 
   // 表格实例
   const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
@@ -107,49 +113,49 @@
       title: 'ID',
       dataIndex: 'merchantId',
       key: 'merchantId',
-      width: 90,
+      width: 90
     },
     {
-      title: '商户名称',
+      title: '店铺名称',
       dataIndex: 'merchantName',
       key: 'merchantName',
-      align: 'center',
+      align: 'center'
     },
     {
       title: '商户图标',
       dataIndex: 'image',
       key: 'image',
-      align: 'center',
+      align: 'center'
     },
     {
       title: '商户姓名',
       dataIndex: 'realName',
       key: 'realName',
-      align: 'center',
+      align: 'center'
     },
     {
       title: '商户手机号',
       dataIndex: 'phone',
       key: 'phone',
-      align: 'center',
+      align: 'center'
     },
     {
       title: '店铺类型',
       dataIndex: 'shopType',
       key: 'shopType',
-      align: 'center',
+      align: 'center'
     },
     {
       title: '状态',
       dataIndex: 'status',
       key: 'status',
-      align: 'center',
+      align: 'center'
     },
     {
       title: '排序号',
       dataIndex: 'sortNumber',
       key: 'sortNumber',
-      align: 'center',
+      align: 'center'
     },
     {
       title: '创建时间',