diff --git a/src/enums/daxpay/DaxPayEnum.ts b/src/enums/daxpay/DaxPayEnum.ts index 6f4b550..b6d6e38 100644 --- a/src/enums/daxpay/DaxPayEnum.ts +++ b/src/enums/daxpay/DaxPayEnum.ts @@ -54,11 +54,11 @@ export enum GatewayCallTypeEnum { /** * 码牌类型 */ -export enum CashierCodeTypeEnum { - // 微信码牌 +export enum CashierSceneEnum { + // 微信支付 WECHAT_PAY = 'wechat_pay', - // 支付宝码牌 + // 支付宝支付 ALIPAY = 'alipay', - // 云闪付码牌 + // 云闪付支付 UNION_PAY = 'union_pay', } diff --git a/src/views/daxpay/h5/code/CashierCode.api.ts b/src/views/daxpay/h5/code/CashierCode.api.ts index f7b9d74..ffbc637 100644 --- a/src/views/daxpay/h5/code/CashierCode.api.ts +++ b/src/views/daxpay/h5/code/CashierCode.api.ts @@ -122,8 +122,8 @@ export interface GatewayCashierCodeConfig { export interface CashierCodeAuthParam { // 收银码牌编码 cashierCode?: string - // 收银台类型 - scene?: string + // 支付场景 + cashierScene?: string // 授权码 authCode: string } diff --git a/src/views/daxpay/h5/code/alipay/AlipayCashierCode.vue b/src/views/daxpay/h5/code/alipay/AlipayCashierCode.vue index 1127bb3..3695144 100644 --- a/src/views/daxpay/h5/code/alipay/AlipayCashierCode.vue +++ b/src/views/daxpay/h5/code/alipay/AlipayCashierCode.vue @@ -84,7 +84,7 @@ import { useRoute, useRouter } from 'vue-router' import { showNotify } from 'vant' import type { CashierPayParam, GatewayCashierCodeConfig } from '../CashierCode.api' import { cashierPay, getCashierCodeConfig } from '../CashierCode.api' -import { AggregateEnum, CashierCodeTypeEnum } from '@/enums/daxpay/DaxPayEnum' +import { AggregateEnum, CashierSceneEnum } from '@/enums/daxpay/DaxPayEnum' import { useKeyboard } from '@/hooks/daxpay/useKeyboard' const route = useRoute() @@ -109,7 +109,7 @@ onMounted(() => { function initData() { // 获取信息 loading.value = true - getCashierCodeConfig(code, CashierCodeTypeEnum.ALIPAY) + getCashierCodeConfig(code, CashierSceneEnum.ALIPAY) .then((res) => { if (res.code) { router.replace({ name: 'payFail', query: { msg: res.msg } }) diff --git a/src/views/daxpay/h5/code/wechat/WechatCashierCode.vue b/src/views/daxpay/h5/code/wechat/WechatCashierCode.vue index a7ef443..40faa49 100644 --- a/src/views/daxpay/h5/code/wechat/WechatCashierCode.vue +++ b/src/views/daxpay/h5/code/wechat/WechatCashierCode.vue @@ -90,7 +90,7 @@ import type { import { auth, cashierPay, generateAuthUrl, getCashierCodeConfig } from '../CashierCode.api' -import { AggregateEnum, CashierCodeTypeEnum, GatewayCallTypeEnum } from '@/enums/daxpay/DaxPayEnum' +import { AggregateEnum, CashierSceneEnum, GatewayCallTypeEnum } from '@/enums/daxpay/DaxPayEnum' import router from '@/router' import { useKeyboard } from '@/hooks/daxpay/useKeyboard' @@ -138,7 +138,7 @@ async function init() { // 如果不是重定向跳转过来, 跳转到到重定向地址 if (!authCode) { // 重定向跳转到微信授权地址 - generateAuthUrl(cashierCode, CashierCodeTypeEnum.WECHAT_PAY) + generateAuthUrl(cashierCode, CashierSceneEnum.WECHAT_PAY) .then((res) => { if (res.code) { router.replace({ name: 'payFail', query: { msg: res.msg } }) @@ -155,7 +155,7 @@ async function init() { // 认证获取OpenId auth({ cashierCode: cashierCode as string, - cashierType: CashierCodeTypeEnum.WECHAT_PAY, + cashierScene: CashierSceneEnum.WECHAT_PAY, authCode: authCode as string, }) .then((res) => { @@ -195,7 +195,7 @@ function pay() { amount: amountValue, cashierCode, openId: openId.value, - cashierType: CashierCodeTypeEnum.WECHAT_PAY, + cashierType: CashierSceneEnum.WECHAT_PAY, description: description.value, } as CashierPayParam cashierPay(from).then((res) => {