seewe/sub2api
1
0
Fork 0
mirror of https://github.com/Wei-Shaw/sub2api.git synced 2026-10-14 12:02:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2578 from wucm667/feat/payment-force-qrcode

Browse Source 
feat(payment): 支持强制移动端统一使用二维码支付
This commit is contained in:
Wesley Liddick
2026-05-20 08:41:29 +08:00
committed by GitHub
parent 8e77241386 e4c7927eff
commit 44c13e7a73
13 changed files with 144 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/api/admin/settings.ts
+2
View File
@@ -528,6 +528,7 @@ export interface SystemSettings {
payment_cancel_rate_limit_window: number;
payment_cancel_rate_limit_unit: string;
payment_cancel_rate_limit_window_mode: string;
payment_alipay_force_qrcode?: boolean;
payment_visible_method_alipay_source?: string;
payment_visible_method_wxpay_source?: string;
payment_visible_method_alipay_enabled?: boolean;
@@ -745,6 +746,7 @@ export interface UpdateSettingsRequest {
payment_cancel_rate_limit_window?: number;
payment_cancel_rate_limit_unit?: string;
payment_cancel_rate_limit_window_mode?: string;
payment_alipay_force_qrcode?: boolean;
payment_visible_method_alipay_source?: string;
payment_visible_method_wxpay_source?: string;
payment_visible_method_alipay_enabled?: boolean;
frontend/src/components/payment/__tests__/paymentFlow.spec.ts
+58
View File
@@ -220,6 +220,36 @@ describe('decidePaymentLaunch', () => {
expect(decision.jsapi?.appId).toBe('wx123')
expect(decision.paymentState.orderType).toBe('subscription')
})
it('forces qr_waiting for mobile alipay when forceQRCode is enabled', () => {
const decision = decidePaymentLaunch(createOrderResult({
pay_url: 'https://pay.example.com/mobile/session',
qr_code: 'https://pay.example.com/qr/session',
}), {
visibleMethod: 'alipay',
orderType: 'balance',
isMobile: true,
forceQRCode: true,
})
expect(decision.kind).toBe('qr_waiting')
expect(decision.paymentState.qrCode).toBe('https://pay.example.com/qr/session')
})
it('does not affect non-alipay methods when forceQRCode is enabled', () => {
const decision = decidePaymentLaunch(createOrderResult({
pay_url: 'https://pay.example.com/mobile/session',
qr_code: 'https://pay.example.com/qr/session',
}), {
visibleMethod: 'wxpay',
orderType: 'balance',
isMobile: true,
forceQRCode: true,
})
// wxpay mobile with pay_url still redirects
expect(decision.kind).toBe('redirect_waiting')
})
})
describe('buildCreateOrderPayload', () => {
@@ -260,6 +290,34 @@ describe('buildCreateOrderPayload', () => {
payment_source: 'wechat_in_app_resume',
})
})
it('passes is_mobile: false when forceQRCode is enabled for alipay', () => {
expect(buildCreateOrderPayload({
amount: 50,
paymentType: 'alipay',
orderType: 'balance',
origin: 'https://app.example.com',
isMobile: true,
isWechatBrowser: false,
forceQRCode: true,
})).toMatchObject({
is_mobile: false,
})
})
it('still passes is_mobile: true when forceQRCode is enabled for non-alipay methods', () => {
expect(buildCreateOrderPayload({
amount: 50,
paymentType: 'wxpay',
orderType: 'balance',
origin: 'https://app.example.com',
isMobile: true,
isWechatBrowser: false,
forceQRCode: true,
})).toMatchObject({
is_mobile: true,
})
})
})
describe('readPaymentRecoverySnapshot', () => {
frontend/src/components/payment/paymentFlow.ts
+16 -2
View File
@@ -55,6 +55,8 @@ export interface PaymentLaunchContext {
orderType: OrderType
isMobile: boolean
isWechatBrowser?: boolean
/** When true, Alipay payments always use QR code regardless of device type */
forceQRCode?: boolean
now?: number
stripePopupUrl?: string
stripeRouteUrl?: string
@@ -78,6 +80,8 @@ export interface BuildCreateOrderPayloadInput {
origin?: string
isMobile: boolean
isWechatBrowser: boolean
/** When true, Alipay payments always use QR code (passes is_mobile: false to backend) */
forceQRCode?: boolean
}
type CreateOrderFlowResult = CreateOrderResult & {
@@ -111,11 +115,16 @@ export function getVisibleMethods(methods: Record<string, MethodLimit>): Record<
export function buildCreateOrderPayload(input: BuildCreateOrderPayloadInput): CreateOrderRequest {
const visibleMethod = normalizeVisibleMethod(input.paymentType) || input.paymentType.trim()
const normalizedOrigin = (input.origin || '').trim().replace(/\/+$/, '')
// When forceQRCode is enabled for alipay, always tell the backend this is not a mobile
// request so it generates a QR code instead of a mobile-redirect URL.
const effectiveMobile = (input.forceQRCode && visibleMethod === 'alipay')
? false
: input.isMobile
const payload: CreateOrderRequest = {
amount: input.amount,
payment_type: visibleMethod,
order_type: input.orderType,
is_mobile: input.isMobile,
is_mobile: effectiveMobile,
payment_source: visibleMethod === 'wxpay' && input.isWechatBrowser
? 'wechat_in_app_resume'
: 'hosted_redirect',
@@ -190,9 +199,14 @@ export function decidePaymentLaunch(
}
const normalizedPaymentMode = baseState.paymentMode.trim().toLowerCase()
// When forceQRCode is on for alipay, treat the device as desktop so the mobile-redirect
// branch is bypassed and we fall through to qr_waiting.
const effectiveMobile = (context.forceQRCode && visibleMethod === 'alipay')
? false
: context.isMobile
const prefersRedirect = normalizedPaymentMode === 'redirect'
|| normalizedPaymentMode === 'popup'
|| (context.isMobile && !!baseState.payUrl)
|| (effectiveMobile && !!baseState.payUrl)
const prefersQr = normalizedPaymentMode === 'qrcode'
|| normalizedPaymentMode === 'native'
|| (!prefersRedirect && !!baseState.qrCode)
frontend/src/i18n/locales/en.ts
+2
View File
@@ -5593,6 +5593,8 @@ export default {
cancelRateLimitWindowMode: 'Window Mode',
cancelRateLimitWindowModeRolling: 'Rolling',
cancelRateLimitWindowModeFixed: 'Fixed',
alipayForceQRCode: 'Force Alipay QR Code',
alipayForceQRCodeHint: 'When enabled, mobile Alipay users always see a QR code instead of being redirected to the mobile payment page',
helpText: 'Help Text',
helpImageUrl: 'Help Image URL',
manageProviders: 'Manage Providers',
frontend/src/i18n/locales/zh.ts
+2
View File
@@ -5753,6 +5753,8 @@ export default {
cancelRateLimitWindowMode: '窗口模式',
cancelRateLimitWindowModeRolling: '滚动',
cancelRateLimitWindowModeFixed: '固定',
alipayForceQRCode: '支付宝强制二维码支付',
alipayForceQRCodeHint: '启用后，移动端支付宝用户将统一使用二维码扫码支付，不再跳转至手机网站支付',
helpText: '帮助文本',
helpImageUrl: '帮助图片链接',
manageProviders: '管理服务商',
frontend/src/types/payment.ts
+2
View File
@@ -69,6 +69,8 @@ export interface CheckoutInfoResponse {
help_text: string
help_image_url: string
stripe_publishable_key: string
/** When true, Alipay payments on mobile always show the QR code instead of redirecting */
alipay_force_qrcode?: boolean
}
// ==================== Orders ====================
frontend/src/views/admin/SettingsView.vue
+34
View File
@@ -5843,6 +5843,38 @@
>
</div>
</div>
<div>
<label class="input-label">{{
t("admin.settings.payment.alipayForceQRCode")
}}</label>
<div class="flex items-center gap-2">
<button
type="button"
:class="[
'relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-primary-500 focus:ring-offset-2',
form.payment_alipay_force_qrcode
? 'bg-primary-500'
: 'bg-gray-300 dark:bg-dark-600',
]"
@click="
form.payment_alipay_force_qrcode =
!form.payment_alipay_force_qrcode
"
>
<span
:class="[
'pointer-events-none inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out',
form.payment_alipay_force_qrcode
? 'translate-x-5'
: 'translate-x-0',
]"
/>
</button>
<span class="text-sm text-gray-500 dark:text-gray-400">{{
t("admin.settings.payment.alipayForceQRCodeHint")
}}</span>
</div>
</div>
</div>
<!-- Row 4: Enabled payment types (provider badges like sub2apipay) -->
<div>
@@ -6772,6 +6804,7 @@ const form = reactive<SettingsForm>({
payment_cancel_rate_limit_window: 1,
payment_cancel_rate_limit_unit: "day",
payment_cancel_rate_limit_window_mode: "rolling",
payment_alipay_force_qrcode: false,
table_default_page_size: tablePageSizeDefault,
table_page_size_options: [10, 20, 50, 100],
custom_menu_items: [] as Array<{
@@ -8036,6 +8069,7 @@ async function saveSettings() {
payment_cancel_rate_limit_unit: form.payment_cancel_rate_limit_unit,
payment_cancel_rate_limit_window_mode:
form.payment_cancel_rate_limit_window_mode,
payment_alipay_force_qrcode: form.payment_alipay_force_qrcode,
openai_advanced_scheduler_enabled: form.openai_advanced_scheduler_enabled,
// Balance & quota notification
balance_low_notify_enabled: form.balance_low_notify_enabled,
frontend/src/views/user/PaymentView.vue
+2
View File
@@ -698,6 +698,7 @@ async function createOrder(orderAmount: number, orderType: OrderType, planId?: n
origin: typeof window !== 'undefined' ? window.location.origin : '',
isMobile: isMobileDevice(),
isWechatBrowser: typeof window !== 'undefined' && /MicroMessenger/i.test(window.navigator.userAgent),
forceQRCode: !!(checkout.value.alipay_force_qrcode && normalizeVisibleMethod(requestType) === 'alipay'),
})
if (options.openid) {
payload.openid = options.openid
@@ -745,6 +746,7 @@ async function createOrder(orderAmount: number, orderType: OrderType, planId?: n
orderType,
isMobile: isMobileDevice(),
isWechatBrowser: typeof window !== 'undefined' && /MicroMessenger/i.test(window.navigator.userAgent),
forceQRCode: !!(checkout.value.alipay_force_qrcode && visibleMethod === 'alipay'),
stripePopupUrl: stripeRouteUrl,
stripeRouteUrl,
airwallexRouteUrl,