Skip to content

Commit a319d09

Browse files
committed
REVIEW 支付商户
1 parent aea1270 commit a319d09

File tree

4 files changed

+111
-107
lines changed

4 files changed

+111
-107
lines changed

src/api/pay/merchant/index.ts

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,17 @@ export interface MerchantExportReqVO {
2929
}
3030

3131
// 查询列表支付商户
32-
export const getMerchantPageApi = (params: MerchantPageReqVO) => {
32+
export const getMerchantPage = (params: MerchantPageReqVO) => {
3333
return request.get({ url: '/pay/merchant/page', params })
3434
}
3535

3636
// 查询详情支付商户
37-
export const getMerchantApi = (id: number) => {
37+
export const getMerchant = (id: number) => {
3838
return request.get({ url: '/pay/merchant/get?id=' + id })
3939
}
4040

4141
// 根据商户名称搜索商户列表
42-
export const getMerchantListByNameApi = (name: string) => {
42+
export const getMerchantListByName = (name: string) => {
4343
return request.get({
4444
url: '/pay/merchant/list-by-name?id=',
4545
params: {
@@ -49,26 +49,27 @@ export const getMerchantListByNameApi = (name: string) => {
4949
}
5050

5151
// 新增支付商户
52-
export const createMerchantApi = (data: MerchantVO) => {
52+
export const createMerchant = (data: MerchantVO) => {
5353
return request.post({ url: '/pay/merchant/create', data })
5454
}
5555

5656
// 修改支付商户
57-
export const updateMerchantApi = (data: MerchantVO) => {
57+
export const updateMerchant = (data: MerchantVO) => {
5858
return request.put({ url: '/pay/merchant/update', data })
5959
}
6060

6161
// 删除支付商户
62-
export const deleteMerchantApi = (id: number) => {
62+
export const deleteMerchant = (id: number) => {
6363
return request.delete({ url: '/pay/merchant/delete?id=' + id })
6464
}
6565

6666
// 导出支付商户
67-
export const exportMerchantApi = (params: MerchantExportReqVO) => {
67+
export const exportMerchant = (params: MerchantExportReqVO) => {
6868
return request.download({ url: '/pay/merchant/export-excel', params })
6969
}
70+
7071
// 支付商户状态修改
71-
export const changeMerchantStatusApi = (id: number, status: number) => {
72+
export const updateMerchantStatus = (id: number, status: number) => {
7273
const data = {
7374
id,
7475
status

src/views/pay/merchant/form.vue renamed to src/views/pay/merchant/MerchantForm.vue

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
<template>
2-
<Dialog :title="modelTitle" v-model="modelVisible" width="800">
3-
<!-- 对话框(添加 / 修改) -->
4-
<el-form ref="formRef" :model="form" :rules="formRules" label-width="80px">
2+
<Dialog :title="modelTitle" v-model="modelVisible">
3+
<el-form ref="formRef" :model="formData" :rules="formRules" label-width="80px">
54
<el-form-item label="商户全称" prop="name">
6-
<el-input v-model="form.name" placeholder="请输入商户全称" />
5+
<el-input v-model="formData.name" placeholder="请输入商户全称" />
76
</el-form-item>
87
<el-form-item label="商户简称" prop="shortName">
9-
<el-input v-model="form.shortName" placeholder="请输入商户简称" />
8+
<el-input v-model="formData.shortName" placeholder="请输入商户简称" />
109
</el-form-item>
1110
<el-form-item label="开启状态" prop="status">
12-
<el-select v-model="form.status" placeholder="请选择状态" clearable>
11+
<el-select v-model="formData.status" placeholder="请选择状态" clearable>
1312
<el-option
1413
v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
1514
:key="dict.value"
@@ -19,7 +18,7 @@
1918
</el-select>
2019
</el-form-item>
2120
<el-form-item label="备注" prop="remark">
22-
<el-input v-model="form.remark" placeholder="请输入备注" />
21+
<el-input type="textarea" v-model="formData.remark" placeholder="请输入备注" />
2322
</el-form-item>
2423
</el-form>
2524
<template #footer>
@@ -31,18 +30,19 @@
3130
<script setup lang="ts">
3231
import * as MerchantApi from '@/api/pay/merchant'
3332
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
33+
import { CommonStatusEnum } from '@/utils/constants'
3434
const { t } = useI18n() // 国际化
3535
const message = useMessage() // 消息弹窗
3636
3737
const modelVisible = ref(false) // 弹窗的是否展示
3838
const modelTitle = ref('') // 弹窗的标题
3939
const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用
4040
const formType = ref('') // 表单的类型:create - 新增;update - 修改
41-
const form = ref({
41+
const formData = ref({
4242
id: undefined,
4343
name: '',
4444
shortName: '',
45-
status: undefined,
45+
status: CommonStatusEnum.ENABLE,
4646
remark: ''
4747
})
4848
const formRules = reactive({
@@ -53,7 +53,7 @@ const formRules = reactive({
5353
const formRef = ref() // 表单 Ref
5454
5555
/** 打开弹窗 */
56-
const openModal = async (type: string, id?: number) => {
56+
const open = async (type: string, id?: number) => {
5757
modelVisible.value = true
5858
modelTitle.value = t('action.' + type)
5959
formType.value = type
@@ -62,13 +62,13 @@ const openModal = async (type: string, id?: number) => {
6262
if (id) {
6363
formLoading.value = true
6464
try {
65-
form.value = await MerchantApi.getMerchantApi(id)
65+
formData.value = await MerchantApi.getMerchant(id)
6666
} finally {
6767
formLoading.value = false
6868
}
6969
}
7070
}
71-
defineExpose({ openModal }) // 提供 openModal 方法,用于打开弹窗
71+
defineExpose({ open }) // 提供 open 方法,用于打开弹窗
7272
7373
/** 提交表单 */
7474
const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调
@@ -80,12 +80,12 @@ const submitForm = async () => {
8080
// 提交请求
8181
formLoading.value = true
8282
try {
83-
const data = form.value as unknown as MerchantApi.MerchantVO
83+
const data = formData.value as unknown as MerchantApi.MerchantVO
8484
if (formType.value === 'create') {
85-
await MerchantApi.createMerchantApi(data)
85+
await MerchantApi.createMerchant(data)
8686
message.success(t('common.createSuccess'))
8787
} else {
88-
await MerchantApi.updateMerchantApi(data)
88+
await MerchantApi.updateMerchant(data)
8989
message.success(t('common.updateSuccess'))
9090
}
9191
modelVisible.value = false
@@ -98,11 +98,11 @@ const submitForm = async () => {
9898
9999
/** 重置表单 */
100100
const resetForm = () => {
101-
form.value = {
101+
formData.value = {
102102
id: undefined,
103103
name: '',
104104
shortName: '',
105-
status: undefined,
105+
status: CommonStatusEnum.ENABLE,
106106
remark: ''
107107
}
108108
formRef.value?.resetFields()

0 commit comments

Comments
 (0)