From f913bb8a0325efdf9c1cbc63d83001c2e8263131 Mon Sep 17 00:00:00 2001 From: bootx Date: Thu, 21 Aug 2025 13:58:40 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=A0=81=E7=89=8C=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E5=9C=BA=E6=99=AF=E4=BF=A1=E6=81=AF=E8=AF=BB=E5=8F=96=E4=B8=8D?= =?UTF-8?q?=E5=88=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/daxpay/h5/code/CashierCode.api.ts | 16 ++++++++-------- .../daxpay/h5/code/alipay/AlipayCashierCode.vue | 2 +- .../daxpay/h5/code/wechat/WechatCashierCode.vue | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/views/daxpay/h5/code/CashierCode.api.ts b/src/views/daxpay/h5/code/CashierCode.api.ts index 1bce08d..c840185 100644 --- a/src/views/daxpay/h5/code/CashierCode.api.ts +++ b/src/views/daxpay/h5/code/CashierCode.api.ts @@ -5,22 +5,22 @@ import type { AuthResult } from '@/views/daxpay/h5/auth/ChannelAuth.api' /** * 获取码牌配置 */ -export function getCashierCodeConfig(cashierCode, cashierType) { +export function getCashierCodeConfig(cashierCode, scene) { return http.request>({ url: '/unipay/gateway/cashier/getCodeConfig', method: 'GET', - params: { cashierCode, cashierType }, + params: { cashierCode, scene }, }) } /** * 获取码牌收银台所需授权链接, 用于获取OpenId一类的信息 */ -export function generateAuthUrl(cashierCode, cashierType) { +export function generateAuthUrl(cashierCode, cashierScene) { return http.request>({ url: '/unipay/gateway/cashier/code/generateAuthUrl', method: 'POST', - data: { cashierCode, cashierType }, + data: { cashierCode, cashierScene }, }) } @@ -53,7 +53,7 @@ export interface CashierPayParam { // 收银码牌编码 cashierCode?: string // 收银台类型 - cashierType?: string + cashierScene?: string // 支付金额 amount?: number // 唯一标识 @@ -112,10 +112,10 @@ export interface GatewayCashierConfig { * 码牌用户标识认证类 */ export interface CashierCodeAuthParam { - // 收银码牌编码 + // 码牌编码 cashierCode?: string - // 收银台类型 - cashierType?: 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 70df632..4773676 100644 --- a/src/views/daxpay/h5/code/alipay/AlipayCashierCode.vue +++ b/src/views/daxpay/h5/code/alipay/AlipayCashierCode.vue @@ -125,7 +125,7 @@ function pay() { const from = { amount: amountValue, cashierCode: code, - cashierType: AggregateEnum.ALI, + scene: AggregateEnum.ALI, description: description.value, } as CashierPayParam cashierPay(from).then((res) => { diff --git a/src/views/daxpay/h5/code/wechat/WechatCashierCode.vue b/src/views/daxpay/h5/code/wechat/WechatCashierCode.vue index 96d16c9..3736aa0 100644 --- a/src/views/daxpay/h5/code/wechat/WechatCashierCode.vue +++ b/src/views/daxpay/h5/code/wechat/WechatCashierCode.vue @@ -138,7 +138,7 @@ async function init() { } else { // 认证获取OpenId - auth({ cashierCode: cashierCode as string, cashierType: CashierCodeTypeEnum.WECHAT_PAY, authCode: authCode as string }) + auth({ cashierCode: cashierCode as string, scene: CashierCodeTypeEnum.WECHAT_PAY, authCode: authCode as string }) .then((res) => { if (res.code) { router.replace({ name: 'payFail', query: { msg: res.msg } }) @@ -175,7 +175,7 @@ function pay() { amount: amountValue, cashierCode, openId: openId.value, - cashierType: CashierCodeTypeEnum.WECHAT_PAY, + scene: CashierCodeTypeEnum.WECHAT_PAY, description: description.value, } as CashierPayParam cashierPay(from)