+
@@ -222,6 +222,7 @@
import { computed, onMounted, onUnmounted, reactive, ref, watch } from 'vue'
import { useI18n } from 'vue-i18n'
import { useAppStore } from '@/stores/app'
+import { FeatureFlags, resolveFeatureFlag } from '@/utils/featureFlags'
import { keysAPI, usageAPI, userGroupsAPI } from '@/api'
import AppLayout from '@/components/layout/AppLayout.vue'
import Pagination from '@/components/common/Pagination.vue'
@@ -391,6 +392,8 @@ const compactionOptions = computed
(() => [
{ value: null, label: t('usage.allCompactionTypes') },
{ value: true, label: t('usage.compactionOnly') },
])
+// 订阅功能关闭后只剩余额计费，「计费类型」筛选（余额/订阅）失去意义，整块隐藏。
+const subscriptionFeatureEnabled = computed(() => resolveFeatureFlag(appStore.cachedPublicSettings, FeatureFlags.subscription))
const billingTypeOptions = computed(() => [
{ value: null, label: t('admin.usage.allBillingTypes') },
{ value: 0, label: t('admin.usage.billingTypeBalance') },
diff --git a/frontend/src/views/user/__tests__/PaymentView.spec.ts b/frontend/src/views/user/__tests__/PaymentView.spec.ts
index 759669cd1b..57ee459266 100644
--- a/frontend/src/views/user/__tests__/PaymentView.spec.ts
+++ b/frontend/src/views/user/__tests__/PaymentView.spec.ts
@@ -1,4 +1,4 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
import { flushPromises, shallowMount } from '@vue/test-utils'
import PaymentView from '../PaymentView.vue'
import { PAYMENT_RECOVERY_STORAGE_KEY } from '@/components/payment/paymentFlow'
@@ -26,6 +26,11 @@ const showWarning = vi.hoisted(() => vi.fn())
const getCheckoutInfo = vi.hoisted(() => vi.fn())
const bridgeInvoke = vi.hoisted(() => vi.fn())
const translate = vi.hoisted(() => vi.fn((key: string) => key))
+// Public settings live in a reactive holder so tests can flip feature flags after mount
+// and exercise the watchers that react to them.
+const appStoreState = vi.hoisted(() => ({
+ setPublicSettings: (_value: Record | undefined) => {},
+}))
vi.mock('vue-router', async () => {
const actual = await vi.importActual('vue-router')
@@ -73,13 +78,23 @@ vi.mock('@/stores/subscriptions', () => ({
}),
}))
-vi.mock('@/stores', () => ({
- useAppStore: () => ({
- showError,
- showInfo,
- showWarning,
- }),
-}))
+vi.mock('@/stores', async () => {
+ const { reactive } = await import('vue')
+ const state = reactive({ cachedPublicSettings: undefined as Record | undefined })
+ appStoreState.setPublicSettings = (value) => {
+ state.cachedPublicSettings = value
+ }
+ return {
+ useAppStore: () => ({
+ showError,
+ showInfo,
+ showWarning,
+ get cachedPublicSettings() {
+ return state.cachedPublicSettings
+ },
+ }),
+ }
+})
vi.mock('@/api/payment', () => ({
paymentAPI: {
@@ -804,3 +819,71 @@ describe('PaymentView WeChat JSAPI flow', () => {
expect(window.localStorage.getItem(PAYMENT_RECOVERY_STORAGE_KEY)).toContain('weixin://wxpay/bizpayurl?pr=fallback-native')
})
})
+
+describe('PaymentView subscription feature flag', () => {
+ afterEach(() => {
+ appStoreState.setPublicSettings(undefined)
+ })
+
+ function tabLabels(wrapper: Awaited>) {
+ return wrapper
+ .findAll('button')
+ .map((button) => button.text())
+ .filter((text) => text === 'payment.tabTopUp' || text === 'payment.tabSubscribe')
+ }
+
+ it('keeps the top-up / subscribe switcher when subscription_enabled is absent (opt-out default)', async () => {
+ const wrapper = await mountSubscriptionPlanList(2)
+
+ expect(tabLabels(wrapper)).toEqual(['payment.tabTopUp', 'payment.tabSubscribe'])
+ expect(wrapper.findAllComponents(SubscriptionPlanCard)).toHaveLength(2)
+ })
+
+ it('drops the subscribe tab, hides the switcher and ignores ?tab=subscription when subscriptions are disabled', async () => {
+ appStoreState.setPublicSettings({ subscription_enabled: false })
+ const wrapper = await mountSubscriptionPlanList(2)
+
+ expect(tabLabels(wrapper)).toEqual([])
+ expect(wrapper.findAllComponents(SubscriptionPlanCard)).toHaveLength(0)
+ expect(wrapper.text()).toContain('payment.rechargeAccount')
+ })
+
+ it('shows an unavailable notice instead of a doomed top-up form when balance recharge is disabled too', async () => {
+ appStoreState.setPublicSettings({ subscription_enabled: false })
+ const wrapper = await mountSubscriptionConfirm({ checkout: { balance_disabled: true } })
+
+ expect(tabLabels(wrapper)).toEqual([])
+ expect(wrapper.findAllComponents(SubscriptionPlanCard)).toHaveLength(0)
+ expect(wrapper.text()).not.toContain('payment.confirmSubscription')
+ expect(wrapper.text()).not.toContain('payment.rechargeAccount')
+ expect(wrapper.text()).toContain('payment.billingUnavailable')
+ wrapper.unmount()
+ })
+
+ it('falls back from the subscribe tab to top-up when the flag flips off after mount', async () => {
+ const wrapper = await mountSubscriptionPlanList(2)
+ expect(wrapper.findAllComponents(SubscriptionPlanCard)).toHaveLength(2)
+
+ appStoreState.setPublicSettings({ subscription_enabled: false })
+ await flushPromises()
+
+ expect(tabLabels(wrapper)).toEqual([])
+ expect(wrapper.findAllComponents(SubscriptionPlanCard)).toHaveLength(0)
+ expect(wrapper.text()).toContain('payment.rechargeAccount')
+ wrapper.unmount()
+ })
+
+ it('enters the subscribe tab when a subscription-only site turns subscriptions back on', async () => {
+ appStoreState.setPublicSettings({ subscription_enabled: false })
+ const wrapper = await mountSubscriptionConfirm({ checkout: { balance_disabled: true } })
+ expect(wrapper.text()).toContain('payment.billingUnavailable')
+
+ appStoreState.setPublicSettings({ subscription_enabled: true })
+ await flushPromises()
+
+ expect(wrapper.text()).not.toContain('payment.billingUnavailable')
+ expect(wrapper.text()).not.toContain('payment.rechargeAccount')
+ expect(wrapper.findAllComponents(SubscriptionPlanCard).length).toBeGreaterThan(0)
+ wrapper.unmount()
+ })
+})
diff --git a/frontend/src/views/user/__tests__/UsageView.spec.ts b/frontend/src/views/user/__tests__/UsageView.spec.ts
index 0099a1095b..44f62000d8 100644
--- a/frontend/src/views/user/__tests__/UsageView.spec.ts
+++ b/frontend/src/views/user/__tests__/UsageView.spec.ts
@@ -1,4 +1,4 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
import { flushPromises, mount } from '@vue/test-utils'
import UsageView from '../UsageView.vue'
@@ -89,10 +89,16 @@ vi.mock('@/api', () => ({
},
}))
+const appStoreState = vi.hoisted(() => ({
+ cachedPublicSettings: { allow_user_view_error_requests: true } as Record,
+}))
+
vi.mock('@/stores/app', () => ({
useAppStore: () => ({
showError, showWarning, showSuccess, showInfo,
- cachedPublicSettings: { allow_user_view_error_requests: true },
+ get cachedPublicSettings() {
+ return appStoreState.cachedPublicSettings
+ },
}),
}))
@@ -460,3 +466,35 @@ describe('user UsageView', () => {
clickSpy.mockRestore()
})
})
+
+describe('UsageView subscription feature flag', () => {
+ afterEach(() => {
+ appStoreState.cachedPublicSettings = { allow_user_view_error_requests: true }
+ })
+
+ function billingTypeSelect(wrapper: ReturnType) {
+ return wrapper.findAllComponents(Select).find((select) =>
+ select.props('options').some((option: SelectOption) => option.label === 'Subscription')
+ )
+ }
+
+ it('offers the balance / subscription billing-type filter by default', async () => {
+ const wrapper = mountUsageView()
+ await flushPromises()
+
+ expect(billingTypeSelect(wrapper)).toBeDefined()
+ expect(wrapper.text()).toContain('Billing type')
+ wrapper.unmount()
+ })
+
+ it('hides the billing-type filter entirely when subscriptions are disabled', async () => {
+ appStoreState.cachedPublicSettings = { allow_user_view_error_requests: true, subscription_enabled: false }
+
+ const wrapper = mountUsageView()
+ await flushPromises()
+
+ expect(billingTypeSelect(wrapper)).toBeUndefined()
+ expect(wrapper.text()).not.toContain('Billing type')
+ wrapper.unmount()
+ })
+})