diff --git a/src/views/daxpay/admin/merchant/app/MchApp.api.ts b/src/views/daxpay/admin/merchant/app/MchApp.api.ts index ccd7a2e24..8614ce5fa 100644 --- a/src/views/daxpay/admin/merchant/app/MchApp.api.ts +++ b/src/views/daxpay/admin/merchant/app/MchApp.api.ts @@ -1,6 +1,7 @@ import { defHttp } from '@/utils/http/axios' import { PageResult, Result } from '#/axios' import { BaseEntity } from '#/web' +import {LabeledValue} from "ant-design-vue/lib/select"; /** * 分页 @@ -49,6 +50,16 @@ export const del = (id) => { }) } +/** + * 查询商户下的应用列表 + */ +export function mchAppDropdown(mchNo) { + return defHttp.get>({ + url: '/mch/app/dropdown', + params: { mchNo }, + }) +} + /** * 商户应用 */ diff --git a/src/views/daxpay/admin/merchant/app/MchAppEdit.vue b/src/views/daxpay/admin/merchant/app/MchAppEdit.vue index 6a335d63c..2cef8b83e 100644 --- a/src/views/daxpay/admin/merchant/app/MchAppEdit.vue +++ b/src/views/daxpay/admin/merchant/app/MchAppEdit.vue @@ -23,6 +23,7 @@ { /** * 商户下拉列表 */ -export const dropdown = () => { +export const merchantDropdown = () => { return defHttp.get>({ url: '/merchant/dropdown', }) diff --git a/src/views/daxpay/admin/order/pay/PayOrderList.vue b/src/views/daxpay/admin/order/pay/PayOrderList.vue index 9d70e954c..880d6fb0f 100644 --- a/src/views/daxpay/admin/order/pay/PayOrderList.vue +++ b/src/views/daxpay/admin/order/pay/PayOrderList.vue @@ -72,6 +72,8 @@ + + - + + + + - + + + +