diff --git a/src/views/pay/merchant/MerchantModal.vue b/src/views/pay/merchant/MerchantModal.vue
new file mode 100644
index 00000000..4959e19a
--- /dev/null
+++ b/src/views/pay/merchant/MerchantModal.vue
@@ -0,0 +1,49 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="isUpdate ? '编辑' : '新增'" @ok="handleSubmit">
+    <BasicForm @register="registerForm" />
+  </BasicModal>
+</template>
+<script lang="ts" setup name="MerchantModal">
+import { ref, unref } from 'vue'
+import { BasicModal, useModalInner } from '@/components/Modal'
+import { BasicForm, useForm } from '@/components/Form'
+import { formSchema } from './merchant.data'
+import { createMerchant, updateMerchant, getMerchant } from '@/api/pay/merchant'
+
+const emit = defineEmits(['success', 'register'])
+const isUpdate = ref(true)
+
+const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
+  labelWidth: 120,
+  baseColProps: { span: 24 },
+  schemas: formSchema,
+  showActionButtonGroup: false,
+  actionColOptions: { span: 23 }
+})
+
+const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+  resetFields()
+  setModalProps({ confirmLoading: false })
+  isUpdate.value = !!data?.isUpdate
+  if (unref(isUpdate)) {
+    const res = await getMerchant(data.record.id)
+    setFieldsValue({ ...res })
+  }
+})
+
+async function handleSubmit() {
+  try {
+    const values = await validate()
+    setModalProps({ confirmLoading: true })
+    if (unref(isUpdate)) {
+      await updateMerchant(values)
+    } else {
+      await createMerchant(values)
+    }
+    closeModal()
+    emit('success')
+  } finally {
+    setModalProps({ confirmLoading: false })
+  }
+}
+</script>
diff --git a/src/views/pay/merchant/index.vue b/src/views/pay/merchant/index.vue
index 3b64cfc4..1f61ec41 100644
--- a/src/views/pay/merchant/index.vue
+++ b/src/views/pay/merchant/index.vue
@@ -1,3 +1,90 @@
 <template>
-  <div>开发中</div>
+  <div>
+    <BasicTable @register="registerTable">
+      <template #toolbar>
+        <a-button type="primary" v-auth="['pay:merchant:create']" :preIcon="IconEnum.ADD" @click="handleCreate">
+          {{ t('action.create') }}
+        </a-button>
+        <a-button type="warning" v-auth="['pay:merchant:export']" :preIcon="IconEnum.EXPORT" @click="handleExport">
+          {{ t('action.export') }}
+        </a-button>
+      </template>
+      <template #bodyCell="{ column, record }">
+        <template v-if="column.key === 'action'">
+          <TableAction
+            :actions="[
+              { icon: IconEnum.EDIT, label: t('action.edit'), auth: 'pay:merchant:update', onClick: handleEdit.bind(null, record) },
+              {
+                icon: IconEnum.DELETE,
+                color: 'error',
+                label: t('action.delete'),
+                auth: 'pay:merchant:delete',
+                popConfirm: {
+                  title: t('common.delMessage'),
+                  placement: 'left',
+                  confirm: handleDelete.bind(null, record)
+                }
+              }
+            ]"
+          />
+        </template>
+      </template>
+    </BasicTable>
+    <MerchantModal @register="registerModal" @success="reload()" />
+  </div>
 </template>
+<script lang="ts" setup name="Merchant">
+import { useI18n } from '@/hooks/web/useI18n'
+import { useMessage } from '@/hooks/web/useMessage'
+import { useModal } from '@/components/Modal'
+import MerchantModal from './MerchantModal.vue'
+import { IconEnum } from '@/enums/appEnum'
+import { BasicTable, useTable, TableAction } from '@/components/Table'
+import { MerchantExportReqVO, deleteMerchant, getMerchantPage, exportMerchant } from '@/api/pay/merchant'
+import { columns, searchFormSchema } from './merchant.data'
+
+const { t } = useI18n()
+const { createConfirm, createMessage } = useMessage()
+const [registerModal, { openModal }] = useModal()
+
+const [registerTable, { getForm, reload }] = useTable({
+  title: '商户列表',
+  api: getMerchantPage,
+  columns,
+  formConfig: { labelWidth: 120, schemas: searchFormSchema },
+  useSearchForm: true,
+  showTableSetting: true,
+  actionColumn: {
+    width: 140,
+    title: t('common.action'),
+    dataIndex: 'action',
+    fixed: 'right'
+  }
+})
+
+function handleCreate() {
+  openModal(true, { isUpdate: false })
+}
+
+function handleEdit(record: Recordable) {
+  openModal(true, { record, isUpdate: true })
+}
+
+async function handleExport() {
+  createConfirm({
+    title: t('common.exportTitle'),
+    iconType: 'warning',
+    content: t('common.exportMessage'),
+    async onOk() {
+      await exportMerchant(getForm().getFieldsValue() as MerchantExportReqVO)
+      createMessage.success(t('common.exportSuccessText'))
+    }
+  })
+}
+
+async function handleDelete(record: Recordable) {
+  await deleteMerchant(record.id)
+  createMessage.success(t('common.delSuccessText'))
+  reload()
+}
+</script>
diff --git a/src/views/pay/merchant/merchant.data.ts b/src/views/pay/merchant/merchant.data.ts
new file mode 100644
index 00000000..01ff8588
--- /dev/null
+++ b/src/views/pay/merchant/merchant.data.ts
@@ -0,0 +1,151 @@
+import { changeMerchantStatus } from '@/api/pay/merchant'
+import { BasicColumn, FormSchema, useRender } from '@/components/Table'
+import { useMessage } from '@/hooks/web/useMessage'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { Switch } from 'ant-design-vue'
+import { h } from 'vue'
+
+export const columns: BasicColumn[] = [
+  {
+    title: '商户编号',
+    dataIndex: 'id',
+    width: 100
+  },
+  {
+    title: '商户号',
+    dataIndex: 'no',
+    width: 180
+  },
+  {
+    title: '商户全称',
+    dataIndex: 'name',
+    width: 100
+  },
+  {
+    title: '商户简称',
+    dataIndex: 'shortName',
+    width: 120
+  },
+  {
+    title: '开启状态',
+    dataIndex: 'status',
+    width: 180,
+    customRender: ({ record }) => {
+      if (!Reflect.has(record, 'pendingStatus')) {
+        record.pendingStatus = false
+      }
+      return h(Switch, {
+        checked: record.status === 0,
+        checkedChildren: '已启用',
+        unCheckedChildren: '已禁用',
+        loading: record.pendingStatus,
+        onChange(checked: boolean) {
+          record.pendingStatus = true
+          const newStatus = checked ? 0 : 1
+          const { createMessage } = useMessage()
+          changeMerchantStatus(record.id, newStatus)
+            .then(() => {
+              record.status = newStatus
+              createMessage.success(`已成功修改商户状态`)
+            })
+            .catch(() => {
+              createMessage.error('修改商户状态失败')
+            })
+            .finally(() => {
+              record.pendingStatus = false
+            })
+        }
+      })
+    }
+  },
+  {
+    title: '备注',
+    dataIndex: 'remark',
+    width: 180
+  },
+  {
+    title: '创建时间',
+    dataIndex: 'createTime',
+    width: 180,
+    customRender: ({ text }) => {
+      return useRender.renderDate(text)
+    }
+  }
+]
+
+export const searchFormSchema: FormSchema[] = [
+  {
+    label: '商户号',
+    field: 'no',
+    component: 'Input',
+    colProps: { span: 8 }
+  },
+  {
+    label: '商户全称',
+    field: 'name',
+    component: 'Input',
+    colProps: { span: 8 }
+  },
+  {
+    label: '商户简称',
+    field: 'shortName',
+    component: 'Input',
+    colProps: { span: 8 }
+  },
+  {
+    label: '状态',
+    field: 'status',
+    component: 'Select',
+    componentProps: {
+      options: getIntDictOptions(DICT_TYPE.COMMON_STATUS)
+    },
+    colProps: { span: 8 }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    component: 'Input',
+    colProps: { span: 8 }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    component: 'RangePicker',
+    colProps: { span: 8 }
+  }
+]
+
+export const formSchema: FormSchema[] = [
+  {
+    label: '编号',
+    field: 'id',
+    show: false,
+    component: 'Input'
+  },
+  {
+    label: '商户全称',
+    field: 'name',
+    required: true,
+    component: 'Input'
+  },
+  {
+    label: '商户简称',
+    field: 'shortName',
+    required: true,
+    component: 'Input'
+  },
+  {
+    label: '开启状态',
+    field: 'status',
+    component: 'Select',
+    defaultValue: 0,
+    componentProps: {
+      options: getIntDictOptions(DICT_TYPE.COMMON_STATUS)
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    component: 'InputTextArea'
+  }
+]