diff --git a/src/api/pay/channel/index.ts b/src/api/pay/channel/index.ts index bec5375..56eb733 100644 --- a/src/api/pay/channel/index.ts +++ b/src/api/pay/channel/index.ts @@ -40,9 +40,8 @@ export function getChannelPage(params: ChannelPageReqVO) { } // 查询详情支付渠道 -export function getChannel(merchantId: number, appId: string, code: string) { +export function getChannel(appId: string, code: string) { const params = { - merchantId, appId, code, } diff --git a/src/enums/systemEnum.ts b/src/enums/systemEnum.ts index 0735e8c..ca51cda 100644 --- a/src/enums/systemEnum.ts +++ b/src/enums/systemEnum.ts @@ -97,6 +97,10 @@ export const PayChannelEnum = { code: 'wx_app', name: '微信 APP 支付', }, + WX_BAR: { + code: 'wx_bar', + name: '微信条码支付', + }, ALIPAY_PC: { code: 'alipay_pc', name: '支付宝 PC 网站支付', @@ -117,6 +121,10 @@ export const PayChannelEnum = { code: 'alipay_bar', name: '支付宝条码支付', }, + MOCK: { + code: 'mock', + name: '模拟支付', + }, } /** @@ -143,6 +151,7 @@ export const PayDisplayModeEnum = { export const PayType = { WECHAT: 'WECHAT', ALIPAY: 'ALIPAY', + MOCK: 'MOCK', } /** diff --git a/src/utils/dict.ts b/src/utils/dict.ts index c4c58b4..0c46457 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -117,15 +117,6 @@ export enum DICT_TYPE { BPM_OA_LEAVE_TYPE = 'bpm_oa_leave_type', // ========== PAY 模块 ========== - PAY_CHANNEL_WECHAT_VERSION = 'pay_channel_wechat_version', // 微信渠道版本 - PAY_CHANNEL_ALIPAY_SIGN_TYPE = 'pay_channel_alipay_sign_type', // 支付渠道支付宝算法类型 - PAY_CHANNEL_ALIPAY_MODE = 'pay_channel_alipay_mode', // 支付宝公钥类型 - PAY_CHANNEL_ALIPAY_SERVER_TYPE = 'pay_channel_alipay_server_type', // 支付宝网关地址 - PAY_CHANNEL_CODE_TYPE = 'pay_channel_code_type', // 支付渠道编码类型 - PAY_ORDER_NOTIFY_STATUS = 'pay_order_notify_status', // 商户支付订单回调状态 - PAY_ORDER_REFUND_STATUS = 'pay_order_refund_status', // 商户支付订单退款状态 - PAY_REFUND_ORDER_STATUS = 'pay_refund_order_status', // 退款订单状态 - PAY_REFUND_ORDER_TYPE = 'pay_refund_order_type', // 退款订单类别 PAY_CHANNEL_CODE = 'pay_channel_code', // 支付渠道编码类型 PAY_ORDER_STATUS = 'pay_order_status', // 商户支付订单状态 PAY_REFUND_STATUS = 'pay_refund_status', // 退款订单状态 diff --git a/src/views/pay/app/ChannelModal.vue b/src/views/pay/app/ChannelModal.vue index 78a3a48..f4db72d 100644 --- a/src/views/pay/app/ChannelModal.vue +++ b/src/views/pay/app/ChannelModal.vue @@ -1,6 +1,6 @@