整理商品管理模块

src/views/shop/merchantApply/index.vue

@@ -11,6 +11,15 @@
           tool-class="ele-toolbar-form"
           class="sys-org-table"
         >
+          <template #toolbar>
+            <search
+              @search="reload"
+              :selection="selection"
+              @add="openEdit"
+              @remove="removeBatch"
+              @batchMove="openMove"
+            />
+          </template>
           <template #bodyCell="{ column, record }">
             <template v-if="column.key === 'image'">
               <a-image :src="record.image" :width="50" />
@@ -21,8 +30,11 @@
             </template>
             <template v-if="column.key === 'action'">
               <a-space>
-                <a-button :size="`small`" @click="openEdit(record)">详情</a-button>
-                <a-button :size="`small`"
+                <a-button :size="`small`" @click="openEdit(record)"
+                  >详情</a-button
+                >
+                <a-button
+                  :size="`small`"
                   title="确定要删除此记录吗？"
                   :disabled="record.status === 1"
                   @confirm="remove(record)"
@@ -36,7 +48,11 @@
       </a-card>
 
       <!-- 编辑弹窗 -->
-      <MerchantApplyEdit v-model:visible="showEdit" :data="current" @done="reload" />
+      <MerchantApplyEdit
+        v-model:visible="showEdit"
+        :data="current"
+        @done="reload"
+      />
     </div>
   </div>
 </template>
@@ -51,10 +67,17 @@
     DatasourceFunction,
     ColumnItem
   } from 'ele-admin-pro/es/ele-pro-table/types';
-  import Search from './components/search.vue';
+  import Search from '../merchant/components/search.vue';
   import MerchantApplyEdit from './components/merchantApplyEdit.vue';
-  import { pageMerchantApply, removeMerchantApply, removeBatchMerchantApply } from '@/api/shop/merchantApply';
-  import type { MerchantApply, MerchantApplyParam } from '@/api/shop/merchantApply/model';
+  import {
+    pageMerchantApply,
+    removeMerchantApply,
+    removeBatchMerchantApply
+  } from '@/api/shop/merchantApply';
+  import type {
+    MerchantApply,
+    MerchantApplyParam
+  } from '@/api/shop/merchantApply/model';
 
   // 表格实例
   const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
@@ -95,25 +118,25 @@
       title: 'ID',
       dataIndex: 'applyId',
       key: 'applyId',
-      width: 90,
+      width: 90
     },
     {
       title: '商户名称',
       dataIndex: 'merchantName',
       key: 'merchantName',
-      align: 'center',
+      align: 'center'
     },
     {
       title: '商户姓名',
       dataIndex: 'realName',
       key: 'realName',
-      align: 'center',
+      align: 'center'
     },
     {
       title: '商户手机号',
       dataIndex: 'phone',
       key: 'phone',
-      align: 'center',
+      align: 'center'
     },
     {
       title: '申请时间',
@@ -128,13 +151,13 @@
       title: '店铺类型',
       dataIndex: 'shopType',
       key: 'shopType',
-      align: 'center',
+      align: 'center'
     },
     {
       title: '状态',
       dataIndex: 'status',
       key: 'status',
-      align: 'center',
+      align: 'center'
     },
     {
       title: '操作',