新增：商户入驻申请

src/views/shop/merchantApply/index.vue

@@ -1,13 +1,18 @@
 <template>
   <div class="page">
     <div class="ele-body">
-      <a-card :bordered="false" :body-style="{ padding: '16px' }">
+      <a-card
+        title="商户申请列表"
+        :bordered="false"
+        :body-style="{ padding: '16px' }"
+      >
         <ele-pro-table
           ref="tableRef"
           row-key="merchantApplyId"
           :columns="columns"
           :datasource="datasource"
           :customRow="customRow"
+          :toolbar="false"
           tool-class="ele-toolbar-form"
           class="sys-org-table"
         >
@@ -25,8 +30,9 @@
               <a-image :src="record.image" :width="50" />
             </template>
             <template v-if="column.key === 'status'">
-              <a-tag v-if="record.status === 0" color="orange">待处理</a-tag>
-              <a-tag v-if="record.status === 1" color="green">已通过</a-tag>
+              <a-tag v-if="record.status === 0" color="orange">待审核</a-tag>
+              <a-tag v-if="record.status === 1" color="green">审核通过</a-tag>
+              <a-tag v-if="record.status === 2" color="green">驳回</a-tag>
             </template>
             <template v-if="column.key === 'action'">
               <a-space>
@@ -67,7 +73,7 @@
     DatasourceFunction,
     ColumnItem
   } from 'ele-admin-pro/es/ele-pro-table/types';
-  import Search from '../merchant/components/search.vue';
+  import Search from './components/search.vue';
   import MerchantApplyEdit from './components/merchantApplyEdit.vue';
   import {
     pageMerchantApply,
@@ -138,6 +144,12 @@
       key: 'phone',
       align: 'center'
     },
+    {
+      title: '店铺类型',
+      dataIndex: 'shopType',
+      key: 'shopType',
+      align: 'center'
+    },
     {
       title: '申请时间',
       dataIndex: 'createTime',
@@ -147,12 +159,6 @@
       ellipsis: true,
       customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd HH:MM:ss')
     },
-    {
-      title: '店铺类型',
-      dataIndex: 'shopType',
-      key: 'shopType',
-      align: 'center'
-    },
     {
       title: '状态',
       dataIndex: 'status',