sync: bring over remaining release/custom-0.1.115 changes

- Extract PublicSettingsInjectionPayload named struct with drift test - Add channel_monitor_default_interval_seconds to SSR injection - Add image_output_price to SupportedModelChip - Simplify AppSidebar buildSelfNavItems (admins see available channels) - Add gateway WARN logs for 503 no-available-accounts branches - Wire ChannelMonitorRunner into provideCleanup for graceful shutdown - Add migrations 130/131 (CC template userid fix + mimicry field cleanup) - Clean up fork-only features (sora, claude max simulation, client affinity) - Remove ~320 obsolete i18n keys - Add codexUsage utility, WechatServiceButton, BulkEditAccountModal - Tidy go.sum
2026-04-23 20:55:18 +08:00
parent d5dac84e12
commit 748a84d871
76 changed files with 1380 additions and 1699 deletions
--- a/frontend/src/tests/setup.ts
+++ b/frontend/src/tests/setup.ts
@@ -36,6 +36,22 @@ class MockResizeObserver {

 globalThis.ResizeObserver = MockResizeObserver as unknown as typeof ResizeObserver

+// Mock matchMedia (jsdom doesn't implement it).
+// Default matches=true so desktop viewport queries pass and components that
+// only lazy-load on mobile render content immediately in tests.
+if (typeof window !== 'undefined' && !window.matchMedia) {
+  window.matchMedia = (query: string): MediaQueryList => ({
+    matches: true,
+    media: query,
+    onchange: null,
+    addListener: vi.fn(),
+    removeListener: vi.fn(),
+    addEventListener: vi.fn(),
+    removeEventListener: vi.fn(),
+    dispatchEvent: vi.fn()
+  }) as MediaQueryList
+}
+
 // Vue Test Utils 全局配置
 config.global.stubs = {
  // 可以在这里添加全局 stub
--- a/frontend/src/api/admin/accounts.ts
+++ b/frontend/src/api/admin/accounts.ts
@@ -17,7 +17,7 @@ import type {
  AdminDataPayload,
  AdminDataImportResult,
  CheckMixedChannelRequest,
-  CheckMixedChannelResponse
+  CheckMixedChannelResponse,
 } from '@/types'

 /**
@@ -663,7 +663,7 @@ export const accountsAPI = {
  getAntigravityDefaultModelMapping,
  batchClearError,
  batchRefresh,
-  setPrivacy
+  setPrivacy,
 }

 export default accountsAPI
--- a/frontend/src/components/account/BulkEditAccountModal.vue
+++ b/frontend/src/components/account/BulkEditAccountModal.vue
@@ -698,6 +698,48 @@
        </div>
      </div>

+      <!-- Allow Overages (Antigravity only) -->
+      <div v-if="allAntigravity" class="border-t border-gray-200 pt-4 dark:border-dark-600">
+        <div class="flex items-center justify-between">
+          <div class="flex-1 pr-4">
+            <label
+              id="bulk-edit-allow-overages-label"
+              class="input-label mb-0"
+              for="bulk-edit-allow-overages-enabled"
+            >
+              {{ t('admin.accounts.allowOverages') }}
+            </label>
+            <p class="mt-1 text-xs text-gray-500 dark:text-gray-400">
+              {{ t('admin.accounts.allowOveragesTooltip') }}
+            </p>
+          </div>
+          <input
+            v-model="enableAllowOverages"
+            id="bulk-edit-allow-overages-enabled"
+            type="checkbox"
+            aria-controls="bulk-edit-allow-overages-body"
+            class="rounded border-gray-300 text-primary-600 focus:ring-primary-500"
+          />
+        </div>
+        <div v-if="enableAllowOverages" id="bulk-edit-allow-overages-body" class="mt-3">
+          <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',
+              allowOverages ? 'bg-primary-600' : 'bg-gray-200 dark:bg-dark-600'
+            ]"
+            @click="allowOverages = !allowOverages"
+          >
+            <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',
+                allowOverages ? 'translate-x-5' : 'translate-x-0'
+              ]"
+            />
+          </button>
+        </div>
+      </div>
+
      <!-- RPM Limit (仅全部为 Anthropic OAuth/SetupToken 时显示) -->
      <div v-if="allAnthropicOAuthOrSetupToken" class="border-t border-gray-200 pt-4 dark:border-dark-600">
        <div class="mb-3 flex items-center justify-between">
@@ -967,6 +1009,11 @@ const allOpenAIOAuth = computed(() => {
  )
 })

+// 是否全部为 Antigravity 平台（allow_overages 仅在此条件下显示）
+const allAntigravity = computed(() =>
+  props.selectedPlatforms.length === 1 && props.selectedPlatforms[0] === 'antigravity'
+)
+
 // 是否全部为 Anthropic OAuth/SetupToken（RPM 配置仅在此条件下显示）
 const allAnthropicOAuthOrSetupToken = computed(() => {
  return (
@@ -1013,6 +1060,7 @@ const enableGroups = ref(false)
 const enableOpenAIPassthrough = ref(false)
 const enableOpenAIWSMode = ref(false)
 const enableRpmLimit = ref(false)
+const enableAllowOverages = ref(false)

 // State - field values
 const submitting = ref(false)
@@ -1040,6 +1088,7 @@ const bulkBaseRpm = ref<number | null>(null)
 const bulkRpmStrategy = ref<'tiered' | 'sticky_exempt'>('tiered')
 const bulkRpmStickyBuffer = ref<number | null>(null)
 const userMsgQueueMode = ref<string | null>(null)
+const allowOverages = ref(false)
 const umqModeOptions = computed(() => [
  { value: '', label: t('admin.accounts.quotaControl.rpmLimit.umqModeOff') },
  { value: 'throttle', label: t('admin.accounts.quotaControl.rpmLimit.umqModeThrottle') },
@@ -1281,6 +1330,13 @@ const buildUpdatePayload = (): Record<string, unknown> | null => {
    umqExtra.user_msg_queue_enabled = false  // 清理旧字段（JSONB merge）
  }

+  // Allow overages (Antigravity only)
+  if (enableAllowOverages.value) {
+    if (!updates.extra) updates.extra = {}
+    const overagesExtra = updates.extra as Record<string, unknown>
+    overagesExtra.allow_overages = allowOverages.value
+  }
+
  return Object.keys(updates).length > 0 ? updates : null
 }

@@ -1345,6 +1401,7 @@ const handleSubmit = async () => {
    enableGroups.value ||
    enableOpenAIWSMode.value ||
    enableRpmLimit.value ||
+    enableAllowOverages.value ||
    userMsgQueueMode.value !== null

  if (!hasAnyFieldEnabled) {
@@ -1438,6 +1495,7 @@ watch(
      enableOpenAIPassthrough.value = false
      enableOpenAIWSMode.value = false
      enableRpmLimit.value = false
+      enableAllowOverages.value = false

      // Reset all values
      baseUrl.value = ''
@@ -1461,6 +1519,7 @@ watch(
      bulkRpmStrategy.value = 'tiered'
      bulkRpmStickyBuffer.value = null
      userMsgQueueMode.value = null
+      allowOverages.value = false

      // Reset mixed channel warning state
      showMixedChannelWarning.value = false
--- a/frontend/src/components/account/CreateAccountModal.vue
+++ b/frontend/src/components/account/CreateAccountModal.vue
@@ -3322,7 +3322,12 @@ watch(
    if (newVal) {
      // Load TLS fingerprint profiles
      adminAPI.tlsFingerprintProfiles.list()
-        .then(profiles => { tlsFingerprintProfiles.value = profiles.map(p => ({ id: p.id, name: p.name })) })
+        .then(profiles => {
+          tlsFingerprintProfiles.value = profiles.map(p => ({
+            id: p.id,
+            name: p.name,
+          }))
+        })
        .catch(() => { tlsFingerprintProfiles.value = [] })
      // Modal opened - fill related models
      allowedModels.value = [...getModelsByPlatform(form.platform)]
--- a/frontend/src/components/account/EditAccountModal.vue
+++ b/frontend/src/components/account/EditAccountModal.vue
@@ -2440,7 +2440,10 @@ watch(
 const loadTLSProfiles = async () => {
  try {
    const profiles = await adminAPI.tlsFingerprintProfiles.list()
-    tlsFingerprintProfiles.value = profiles.map(p => ({ id: p.id, name: p.name }))
+    tlsFingerprintProfiles.value = profiles.map(p => ({
+      id: p.id,
+      name: p.name,
+    }))
  } catch {
    tlsFingerprintProfiles.value = []
  }
@@ -3309,4 +3312,5 @@ const handleMixedChannelConfirm = async () => {
 const handleMixedChannelCancel = () => {
  clearMixedChannelDialog()
 }
+
 </script>
--- a/frontend/src/components/account/tests/AccountStatusIndicator.spec.ts
+++ b/frontend/src/components/account/tests/AccountStatusIndicator.spec.ts
@@ -122,7 +122,7 @@ describe('AccountStatusIndicator', () => {
      }
    })

-    expect(wrapper.text()).toContain('account.creditsExhausted')
+    expect(wrapper.text()).toContain('admin.accounts.status.creditsExhausted')
  })

  it('模型限流 + overages 启用 + AICredits key 生效 → 普通限流样式（积分耗尽，无 ⚡）', () => {
@@ -157,6 +157,6 @@ describe('AccountStatusIndicator', () => {
    expect(wrapper.text()).toContain('CSon45')
    expect(wrapper.text()).not.toContain('⚡')
    // AICredits 积分耗尽状态应显示
-    expect(wrapper.text()).toContain('account.creditsExhausted')
+    expect(wrapper.text()).toContain('admin.accounts.status.creditsExhausted')
  })
 })
--- a/frontend/src/components/account/tests/AccountUsageCell.spec.ts
+++ b/frontend/src/components/account/tests/AccountUsageCell.spec.ts
@@ -15,6 +15,10 @@ vi.mock('@/api/admin', () => ({
  }
 }))

+vi.mock('@/utils/usageLoadQueue', () => ({
+  enqueueUsageRequest: (_account: unknown, fn: () => Promise<unknown>) => fn()
+}))
+
 vi.mock('vue-i18n', async () => {
  const actual = await vi.importActual<typeof import('vue-i18n')>('vue-i18n')
  return {
@@ -385,6 +389,117 @@ describe('AccountUsageCell', () => {
 	expect(wrapper.text()).toContain('7d|0|27700')
  })

+  it('OpenAI OAuth 在 usage 请求失败时仍回退显示本地 codex 快照', async () => {
+    getUsage.mockRejectedValue(new Error('network error'))
+    const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
+
+    const wrapper = mount(AccountUsageCell, {
+      props: {
+        account: makeAccount({
+          id: 2004,
+          platform: 'openai',
+          type: 'oauth',
+          extra: {
+            codex_usage_updated_at: '2099-03-07T10:00:00Z',
+            codex_5h_used_percent: 12,
+            codex_5h_reset_at: '2099-03-07T12:00:00Z',
+            codex_7d_used_percent: 34,
+            codex_7d_reset_at: '2099-03-13T12:00:00Z'
+          }
+        })
+      },
+      global: {
+        stubs: {
+          UsageProgressBar: {
+            props: ['label', 'utilization', 'resetsAt', 'windowStats', 'color'],
+            template: '<div class="usage-bar">{{ label }}|{{ utilization }}|{{ resetsAt }}</div>'
+          },
+          AccountQuotaInfo: true
+        }
+      }
+    })
+
+    await flushPromises()
+
+    expect(getUsage).toHaveBeenCalledWith(2004)
+    expect(wrapper.text()).toContain('5h|12|2099-03-07T12:00:00.000Z')
+    expect(wrapper.text()).toContain('7d|34|2099-03-13T12:00:00.000Z')
+    errorSpy.mockRestore()
+  })
+
+  it('OpenAI OAuth 已限额时首屏优先等待重新查询的 usage，而不是先显示旧 codex 快照', async () => {
+    let resolveUsage: ((value: any) => void) | null = null
+    getUsage.mockReturnValue(
+      new Promise((resolve) => {
+        resolveUsage = resolve
+      })
+    )
+
+    const wrapper = mount(AccountUsageCell, {
+      props: {
+        account: makeAccount({
+          id: 2005,
+          platform: 'openai',
+          type: 'oauth',
+          rate_limit_reset_at: '2099-03-07T12:00:00Z',
+          extra: {
+            codex_5h_used_percent: 0,
+            codex_5h_reset_at: '2099-03-07T12:00:00Z',
+            codex_7d_used_percent: 0,
+            codex_7d_reset_at: '2099-03-13T12:00:00Z'
+          }
+        })
+      },
+      global: {
+        stubs: {
+          UsageProgressBar: {
+            props: ['label', 'utilization', 'resetsAt', 'windowStats', 'color'],
+            template: '<div class="usage-bar">{{ label }}|{{ utilization }}|{{ windowStats?.tokens }}</div>'
+          },
+          AccountQuotaInfo: true
+        }
+      }
+    })
+
+    await Promise.resolve()
+
+    expect(getUsage).toHaveBeenCalledWith(2005)
+    expect(wrapper.text()).not.toContain('5h|0|')
+    expect(wrapper.text()).not.toContain('7d|0|')
+
+    resolveUsage?.({
+      five_hour: {
+        utilization: 100,
+        resets_at: '2026-03-07T12:00:00Z',
+        remaining_seconds: 3600,
+        window_stats: {
+          requests: 211,
+          tokens: 106540000,
+          cost: 38.13,
+          standard_cost: 38.13,
+          user_cost: 38.13
+        }
+      },
+      seven_day: {
+        utilization: 100,
+        resets_at: '2026-03-13T12:00:00Z',
+        remaining_seconds: 3600,
+        window_stats: {
+          requests: 211,
+          tokens: 106540000,
+          cost: 38.13,
+          standard_cost: 38.13,
+          user_cost: 38.13
+        }
+      }
+    })
+
+    await flushPromises()
+
+    expect(wrapper.text()).toContain('5h|100|106540000')
+    expect(wrapper.text()).toContain('7d|100|106540000')
+  })
+
  it('OpenAI OAuth 在行数据刷新但仍无 codex 快照时会重新拉取 usage', async () => {
 	getUsage
 	  .mockResolvedValueOnce({
--- a/frontend/src/components/channels/SupportedModelChip.vue
+++ b/frontend/src/components/channels/SupportedModelChip.vue
@@ -90,6 +90,13 @@
                :unit="t(prefixKey('unitPerMillion'))"
                :scale="perMillionScale"
              />
+              <PricingRow
+                v-if="model.pricing.image_output_price != null && model.pricing.image_output_price > 0"
+                :label="t(prefixKey('imageOutputPrice'))"
+                :value="model.pricing.image_output_price"
+                :unit="t(prefixKey('unitPerMillion'))"
+                :scale="perMillionScale"
+              />
            </template>

            <PricingRow
--- a/frontend/src/components/common/HelpTooltip.vue
+++ b/frontend/src/components/common/HelpTooltip.vue
@@ -1,67 +1,21 @@
 <script setup lang="ts">
-import { onBeforeUnmount, onMounted, ref, useTemplateRef, nextTick } from 'vue'
+import { ref, useTemplateRef, nextTick } from 'vue'

-const props = withDefaults(defineProps<{
+defineProps<{
  content?: string
-  trigger?: 'hover' | 'click'
-  widthClass?: string
-}>(), {
-  trigger: 'hover',
-  widthClass: 'w-64',
-})
+}>()

 const show = ref(false)
 const triggerRef = useTemplateRef<HTMLElement>('trigger')
-const tooltipRef = useTemplateRef<HTMLElement>('tooltip')
 const tooltipStyle = ref({ top: '0px', left: '0px' })

-function openTooltip() {
+function onEnter() {
  show.value = true
  nextTick(updatePosition)
 }

-function closeTooltip() {
-  show.value = false
-}
-
-function onEnter() {
-  if (props.trigger !== 'hover') return
-  openTooltip()
-}
-
 function onLeave() {
-  if (props.trigger !== 'hover') return
-  closeTooltip()
-}
-
-function onClick(event: MouseEvent) {
-  if (props.trigger !== 'click') return
-  event.stopPropagation()
-  if (show.value) {
-    closeTooltip()
-    return
-  }
-  openTooltip()
-}
-
-function onDocumentClick(event: MouseEvent) {
-  if (props.trigger !== 'click' || !show.value) return
-  const target = event.target as Node | null
-  if (!target) return
-  if (triggerRef.value?.contains(target) || tooltipRef.value?.contains(target)) return
-  closeTooltip()
-}
-
-function onDocumentKeydown(event: KeyboardEvent) {
-  if (props.trigger !== 'click') return
-  if (event.key === 'Escape') {
-    closeTooltip()
-  }
-}
-
-function onViewportChange() {
-  if (!show.value) return
-  updatePosition()
+  show.value = false
 }

 function updatePosition() {
@@ -73,20 +27,6 @@ function updatePosition() {
    left: `${rect.left + rect.width / 2 + window.scrollX}px`,
  }
 }
-
-onMounted(() => {
-  document.addEventListener('click', onDocumentClick, true)
-  document.addEventListener('keydown', onDocumentKeydown)
-  window.addEventListener('resize', onViewportChange)
-  window.addEventListener('scroll', onViewportChange, true)
-})
-
-onBeforeUnmount(() => {
-  document.removeEventListener('click', onDocumentClick, true)
-  document.removeEventListener('keydown', onDocumentKeydown)
-  window.removeEventListener('resize', onViewportChange)
-  window.removeEventListener('scroll', onViewportChange, true)
-})
 </script>

 <template>
@@ -95,7 +35,6 @@ onBeforeUnmount(() => {
    class="group relative ml-1 inline-flex items-center align-middle"
    @mouseenter="onEnter"
    @mouseleave="onLeave"
-    @click="onClick"
  >
    <!-- Trigger Icon -->
    <slot name="trigger">
@@ -117,26 +56,10 @@ onBeforeUnmount(() => {
    <!-- Teleport to body to escape modal overflow clipping -->
    <Teleport to="body">
      <div
-        ref="tooltip"
        v-show="show"
-        role="tooltip"
-        :class="[
-          'fixed z-[99999] -translate-x-1/2 -translate-y-full rounded-lg bg-gray-900 p-3 text-xs leading-relaxed text-white shadow-xl ring-1 ring-white/10 dark:bg-gray-800',
-          props.widthClass,
-        ]"
+        class="fixed z-[99999] w-64 -translate-x-1/2 -translate-y-full rounded-lg bg-gray-900 p-3 text-xs leading-relaxed text-white shadow-xl ring-1 ring-white/10 dark:bg-gray-800"
        :style="{ top: `calc(${tooltipStyle.top} - 8px)`, left: tooltipStyle.left }"
      >
-        <button
-          v-if="props.trigger === 'click'"
-          type="button"
-          class="absolute right-1.5 top-1.5 rounded p-1 text-gray-300 transition-colors hover:bg-white/10 hover:text-white"
-          aria-label="Close"
-          @click.stop="closeTooltip"
-        >
-          <svg class="h-3.5 w-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
-            <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
-          </svg>
-        </button>
        <slot>{{ content }}</slot>
        <div class="absolute -bottom-1 left-1/2 h-2 w-2 -translate-x-1/2 rotate-45 bg-gray-900 dark:bg-gray-800"></div>
      </div>
--- a/frontend/src/components/common/WechatServiceButton.vue
+++ b/frontend/src/components/common/WechatServiceButton.vue
@@ -0,0 +1,104 @@
+<template>
+  <!-- 悬浮按钮 - 使用主题色 -->
+  <button
+    @click="showModal = true"
+    class="fixed bottom-6 right-6 z-50 flex items-center gap-2 rounded-full bg-gradient-to-r from-primary-500 to-primary-600 px-4 py-3 text-white shadow-lg shadow-primary-500/25 transition-all hover:from-primary-600 hover:to-primary-700 hover:shadow-xl hover:shadow-primary-500/30"
+  >
+    <svg class="h-5 w-5" viewBox="0 0 24 24" fill="currentColor">
+      <path d="M8.691 2.188C3.891 2.188 0 5.476 0 9.53c0 2.212 1.17 4.203 3.002 5.55a.59.59 0 01.213.665l-.39 1.48c-.019.07-.048.141-.048.213 0 .163.13.295.29.295a.328.328 0 00.186-.059l2.114-1.225a.87.87 0 01.415-.106.807.807 0 01.213.026 10.07 10.07 0 002.696.37c.262 0 .52-.011.776-.028a5.91 5.91 0 01-.193-1.479c0-3.644 3.374-6.6 7.536-6.6.262 0 .52.011.776.028-.628-3.513-4.27-6.472-8.885-6.472zM5.785 5.97a1.1 1.1 0 110 2.2 1.1 1.1 0 010-2.2zm5.813 0a1.1 1.1 0 110 2.2 1.1 1.1 0 010-2.2zm5.192 2.642c-3.703 0-6.71 2.567-6.71 5.73 0 3.163 3.007 5.73 6.71 5.73a7.9 7.9 0 002.126-.288.644.644 0 01.17-.022.69.69 0 01.329.085l1.672.97a.262.262 0 00.147.046c.128 0 .23-.104.23-.233a.403.403 0 00-.038-.168l-.309-1.17a.468.468 0 01.168-.527c1.449-1.065 2.374-2.643 2.374-4.423 0-3.163-3.007-5.73-6.71-5.73h-.159zm-2.434 3.34a.88.88 0 110 1.76.88.88 0 010-1.76zm4.868 0a.88.88 0 110 1.76.88.88 0 010-1.76z"/>
+    </svg>
+    <span class="text-sm font-medium">客服</span>
+  </button>
+
+  <!-- 弹窗 -->
+  <Teleport to="body">
+    <Transition name="fade">
+      <div
+        v-if="showModal"
+        class="fixed inset-0 z-[100] flex items-center justify-center bg-black/50 p-4 backdrop-blur-sm"
+        @click.self="showModal = false"
+      >
+        <Transition name="scale">
+          <div
+            v-if="showModal"
+            class="relative w-full max-w-sm rounded-2xl bg-white p-6 shadow-2xl dark:bg-dark-700"
+          >
+            <!-- 关闭按钮 -->
+            <button
+              @click="showModal = false"
+              class="absolute right-4 top-4 text-gray-400 transition-colors hover:text-gray-600 dark:text-dark-400 dark:hover:text-dark-200"
+            >
+              <svg class="h-5 w-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
+              </svg>
+            </button>
+
+            <!-- 标题 -->
+            <div class="mb-4 flex items-center gap-3">
+              <div class="flex h-10 w-10 items-center justify-center rounded-full bg-gradient-to-br from-primary-500 to-primary-600">
+                <svg class="h-6 w-6 text-white" viewBox="0 0 24 24" fill="currentColor">
+                  <path d="M8.691 2.188C3.891 2.188 0 5.476 0 9.53c0 2.212 1.17 4.203 3.002 5.55a.59.59 0 01.213.665l-.39 1.48c-.019.07-.048.141-.048.213 0 .163.13.295.29.295a.328.328 0 00.186-.059l2.114-1.225a.87.87 0 01.415-.106.807.807 0 01.213.026 10.07 10.07 0 002.696.37c.262 0 .52-.011.776-.028a5.91 5.91 0 01-.193-1.479c0-3.644 3.374-6.6 7.536-6.6.262 0 .52.011.776.028-.628-3.513-4.27-6.472-8.885-6.472zM5.785 5.97a1.1 1.1 0 110 2.2 1.1 1.1 0 010-2.2zm5.813 0a1.1 1.1 0 110 2.2 1.1 1.1 0 010-2.2zm5.192 2.642c-3.703 0-6.71 2.567-6.71 5.73 0 3.163 3.007 5.73 6.71 5.73a7.9 7.9 0 002.126-.288.644.644 0 01.17-.022.69.69 0 01.329.085l1.672.97a.262.262 0 00.147.046c.128 0 .23-.104.23-.233a.403.403 0 00-.038-.168l-.309-1.17a.468.468 0 01.168-.527c1.449-1.065 2.374-2.643 2.374-4.423 0-3.163-3.007-5.73-6.71-5.73h-.159zm-2.434 3.34a.88.88 0 110 1.76.88.88 0 010-1.76zm4.868 0a.88.88 0 110 1.76.88.88 0 010-1.76z"/>
+                </svg>
+              </div>
+              <div>
+                <h3 class="text-lg font-semibold text-gray-900 dark:text-white">联系客服</h3>
+                <p class="text-sm text-gray-500 dark:text-dark-400">扫码添加好友</p>
+              </div>
+            </div>
+
+            <!-- 二维码卡片 -->
+            <div class="mb-4 overflow-hidden rounded-xl border border-primary-100 bg-gradient-to-br from-primary-50 to-white p-3 dark:border-primary-800/30 dark:from-primary-900/10 dark:to-dark-800">
+              <img
+                src="/wechat-qr.jpg"
+                alt="微信二维码"
+                class="w-full rounded-lg"
+              />
+            </div>
+
+            <!-- 提示文字 -->
+            <div class="text-center">
+              <p class="mb-2 text-sm font-medium text-primary-600 dark:text-primary-400">
+                微信扫码添加客服
+              </p>
+              <p class="flex items-center justify-center gap-1 text-xs text-gray-500 dark:text-dark-400">
+                <svg class="h-4 w-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                  <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 8v4l3 3m6-3a9 9 0 11-18 0 9 9 0 0118 0z" />
+                </svg>
+                工作时间：周一至周五 9:00-18:00
+              </p>
+            </div>
+          </div>
+        </Transition>
+      </div>
+    </Transition>
+  </Teleport>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue'
+
+const showModal = ref(false)
+</script>
+
+<style scoped>
+.fade-enter-active,
+.fade-leave-active {
+  transition: opacity 0.2s ease;
+}
+
+.fade-enter-from,
+.fade-leave-to {
+  opacity: 0;
+}
+
+.scale-enter-active,
+.scale-leave-active {
+  transition: all 0.2s ease;
+}
+
+.scale-enter-from,
+.scale-leave-to {
+  opacity: 0;
+  transform: scale(0.95);
+}
+</style>
--- a/frontend/src/components/layout/AppHeader.vue
+++ b/frontend/src/components/layout/AppHeader.vue
@@ -125,7 +125,6 @@
                  <Icon name="key" size="sm" />
                  {{ t('nav.apiKeys') }}
                </router-link>
-
                <a
                  v-if="authStore.isAdmin"
                  href="https://github.com/Wei-Shaw/sub2api"
@@ -143,7 +142,6 @@
                  </svg>
                  {{ t('nav.github') }}
                </a>
-
              </div>

              <!-- Contact Support (only show if configured) -->
--- a/frontend/src/components/layout/AppSidebar.vue
+++ b/frontend/src/components/layout/AppSidebar.vue
@@ -634,18 +634,15 @@ const ChevronDownIcon = {
 const flagChannelMonitor = makeSidebarFlag(FeatureFlags.channelMonitor)
 const flagPayment = makeSidebarFlag(FeatureFlags.payment)
 const flagAvailableChannels = makeSidebarFlag(FeatureFlags.availableChannels)
-void flagAvailableChannels
 const flagOpsMonitoring = () => adminSettingsStore.opsMonitoringEnabled
 const flagAdminPayment = () => adminSettingsStore.paymentEnabled

 // buildSelfNavItems 构造用户自己的导航项（用户端主菜单和管理员的"我的账户"子菜单共享这组声明）。
 // withDashboard=true 时包含仪表盘（用户端），false 时不含（管理员的个人区已经有独立仪表盘入口）。
-// includeAvailableChannels=false 时省略"可用渠道"入口——管理员在 admin 区已经有一个显眼入口，
-// 重复显示会让管理员同时看到两处"可用渠道"。
 //
 // 条目顺序：密钥 → 用量 → 可用渠道 → 渠道状态 → 订阅/支付 → 兑换/资料。
 // 可用渠道紧挨渠道状态之上，让用户"先看自己能用什么、再看对应状态"。
-function buildSelfNavItems(withDashboard: boolean, includeAvailableChannels = true): NavItem[] {
+function buildSelfNavItems(withDashboard: boolean): NavItem[] {
  const items: NavItem[] = []
  if (withDashboard) {
    items.push({ path: '/dashboard', label: t('nav.dashboard'), icon: DashboardIcon })
@@ -653,11 +650,7 @@ function buildSelfNavItems(withDashboard: boolean, includeAvailableChannels = tr
  items.push(
    { path: '/keys', label: t('nav.apiKeys'), icon: KeyIcon },
    { path: '/usage', label: t('nav.usage'), icon: ChartIcon, hideInSimpleMode: true },
-  )
-  if (includeAvailableChannels) {
-    items.push({ path: '/available-channels', label: t('nav.availableChannels'), icon: ChannelIcon, hideInSimpleMode: true, featureFlag: flagAvailableChannels })
-  }
-  items.push(
+    { path: '/available-channels', label: t('nav.availableChannels'), icon: ChannelIcon, hideInSimpleMode: true, featureFlag: flagAvailableChannels },
    { path: '/monitor', label: t('nav.channelStatus'), icon: SignalIcon, featureFlag: flagChannelMonitor },
    { path: '/subscriptions', label: t('nav.mySubscriptions'), icon: CreditCardIcon, hideInSimpleMode: true },
    { path: '/purchase', label: t('nav.buySubscription'), icon: RechargeSubscriptionIcon, hideInSimpleMode: true, featureFlag: flagPayment },
@@ -683,7 +676,9 @@ function finalizeNav(items: NavItem[]): NavItem[] {
 // User navigation items (for regular users)
 const userNavItems = computed((): NavItem[] => finalizeNav(buildSelfNavItems(true)))

-// Personal navigation items (for admin's "My Account" section, without Dashboard)
+// Personal navigation items (for admin's "My Account" section, without Dashboard).
+// Admins access 可用渠道 from this section just like regular users — there is no
+// separate admin entry, since the page is purely a user-facing view.
 const personalNavItems = computed((): NavItem[] => finalizeNav(buildSelfNavItems(false)))

 // Custom menu items filtered by visibility
--- a/frontend/src/components/payment/PaymentProviderDialog.vue
+++ b/frontend/src/components/payment/PaymentProviderDialog.vue
@@ -73,42 +73,9 @@

      <!-- Config fields -->
      <div class="border-t border-gray-200 pt-4 dark:border-dark-700">
-        <div class="mb-3 flex items-center gap-2">
-          <h4 class="text-sm font-semibold text-gray-900 dark:text-white">
-            {{ t('admin.settings.payment.providerConfig') }}
-          </h4>
-          <HelpTooltip v-if="paymentGuide" trigger="click" width-class="w-80">
-            <template #trigger>
-              <button
-                type="button"
-                class="inline-flex h-5 w-5 items-center justify-center rounded-full border border-gray-300 text-[11px] font-semibold text-gray-400 transition-colors hover:border-primary-500 hover:text-primary-600 dark:border-dark-500 dark:text-gray-500 dark:hover:border-primary-400 dark:hover:text-primary-400"
-                :aria-label="t('admin.settings.payment.paymentGuideTrigger')"
-                :title="t('admin.settings.payment.paymentGuideTrigger')"
-              >
-                ?
-              </button>
-            </template>
-            <div class="space-y-3">
-              <p class="font-medium text-white">{{ paymentGuide.summary }}</p>
-              <div
-                v-for="item in paymentGuide.items"
-                :key="item.title"
-                class="space-y-1.5 border-t border-white/10 pt-2 first:border-t-0 first:pt-0"
-              >
-                <p class="font-medium text-white">{{ item.title }}</p>
-                <p><span class="text-gray-300">{{ t('admin.settings.payment.guideOpenLabel') }}</span>{{ item.open }}</p>
-                <p><span class="text-gray-300">{{ t('admin.settings.payment.guideCallLabel') }}</span>{{ item.call }}</p>
-                <p><span class="text-gray-300">{{ t('admin.settings.payment.guideFallbackLabel') }}</span>{{ item.fallback }}</p>
-              </div>
-              <p v-if="paymentGuide.note" class="border-t border-white/10 pt-2 text-[11px] text-gray-300">
-                {{ paymentGuide.note }}
-              </p>
-            </div>
-          </HelpTooltip>
-        </div>
-        <p v-if="paymentGuide" class="mb-3 text-xs text-gray-500 dark:text-gray-400">
-          {{ paymentGuide.summary }}
-        </p>
+        <h4 class="mb-3 text-sm font-semibold text-gray-900 dark:text-white">
+          {{ t('admin.settings.payment.providerConfig') }}
+        </h4>
        <div class="space-y-3">
          <div v-for="field in resolvedFields" :key="field.key">
            <label class="input-label">
@@ -253,7 +220,6 @@
 import { reactive, computed, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 import BaseDialog from '@/components/common/BaseDialog.vue'
-import HelpTooltip from '@/components/common/HelpTooltip.vue'
 import Select from '@/components/common/Select.vue'
 import type { SelectOption } from '@/components/common/Select.vue'
 import ToggleSwitch from './ToggleSwitch.vue'
@@ -297,19 +263,6 @@ const emit = defineEmits<{

 const { t } = useI18n()

-interface PaymentGuideItem {
-  title: string
-  open: string
-  call: string
-  fallback: string
-}
-
-interface PaymentGuide {
-  summary: string
-  items: PaymentGuideItem[]
-  note?: string
-}
-
 // --- Form state ---
 const form = reactive({
  name: '',
@@ -361,63 +314,6 @@ const resolvedFields = computed(() => {
  }))
 })

-const paymentGuide = computed<PaymentGuide | null>(() => {
-  if (form.provider_key === 'alipay') {
-    return {
-      summary: t('admin.settings.payment.alipayGuideSummary'),
-      items: [
-        {
-          title: t('admin.settings.payment.alipayGuideFaceToFaceTitle'),
-          open: t('admin.settings.payment.alipayGuideFaceToFaceOpen'),
-          call: t('admin.settings.payment.alipayGuideFaceToFaceCall'),
-          fallback: t('admin.settings.payment.alipayGuideFaceToFaceFallback'),
-        },
-        {
-          title: t('admin.settings.payment.alipayGuidePagePayTitle'),
-          open: t('admin.settings.payment.alipayGuidePagePayOpen'),
-          call: t('admin.settings.payment.alipayGuidePagePayCall'),
-          fallback: t('admin.settings.payment.alipayGuidePagePayFallback'),
-        },
-        {
-          title: t('admin.settings.payment.alipayGuideWapTitle'),
-          open: t('admin.settings.payment.alipayGuideWapOpen'),
-          call: t('admin.settings.payment.alipayGuideWapCall'),
-          fallback: t('admin.settings.payment.alipayGuideWapFallback'),
-        },
-      ],
-    }
-  }
-
-  if (form.provider_key === 'wxpay') {
-    return {
-      summary: t('admin.settings.payment.wxpayGuideSummary'),
-      note: t('admin.settings.payment.wxpayGuideNote'),
-      items: [
-        {
-          title: t('admin.settings.payment.wxpayGuideNativeTitle'),
-          open: t('admin.settings.payment.wxpayGuideNativeOpen'),
-          call: t('admin.settings.payment.wxpayGuideNativeCall'),
-          fallback: t('admin.settings.payment.wxpayGuideNativeFallback'),
-        },
-        {
-          title: t('admin.settings.payment.wxpayGuideJsapiTitle'),
-          open: t('admin.settings.payment.wxpayGuideJsapiOpen'),
-          call: t('admin.settings.payment.wxpayGuideJsapiCall'),
-          fallback: t('admin.settings.payment.wxpayGuideJsapiFallback'),
-        },
-        {
-          title: t('admin.settings.payment.wxpayGuideH5Title'),
-          open: t('admin.settings.payment.wxpayGuideH5Open'),
-          call: t('admin.settings.payment.wxpayGuideH5Call'),
-          fallback: t('admin.settings.payment.wxpayGuideH5Fallback'),
-        },
-      ],
-    }
-  }
-
-  return null
-})
-
 const limitableTypes = computed(() => {
  // Stripe: single "stripe" entry (one set of shared limits)
  if (form.provider_key === 'stripe') {
--- a/frontend/src/components/payment/PaymentStatusPanel.vue
+++ b/frontend/src/components/payment/PaymentStatusPanel.vue
@@ -84,9 +84,6 @@
            </div>
          </div>
          <p v-if="scanHint" class="text-center text-sm text-gray-500 dark:text-gray-400">{{ scanHint }}</p>
-          <button v-if="payUrl" class="btn btn-secondary text-sm" @click="reopenPopup">
-            {{ t('payment.qr.openPayWindow') }}
-          </button>
        </div>
      </div>
      <div class="card p-4 text-center">
--- a/frontend/src/components/payment/tests/PaymentStatusPanel.spec.ts
+++ b/frontend/src/components/payment/tests/PaymentStatusPanel.spec.ts
@@ -96,36 +96,4 @@ describe('PaymentStatusPanel', () => {
    expect(wrapper.text()).toContain('payment.result.success')
    expect(wrapper.emitted('success')).toHaveLength(1)
  })
-
-  it('shows reopen button in QR mode when payUrl is also available', async () => {
-    const openSpy = vi.spyOn(window, 'open').mockReturnValue({ closed: false } as Window)
-
-    const wrapper = mount(PaymentStatusPanel, {
-      props: {
-        orderId: 42,
-        qrCode: 'https://pay.example.com/qr/42',
-        payUrl: 'https://pay.example.com/session/42',
-        expiresAt: '2099-01-01T12:30:00Z',
-        paymentType: 'alipay',
-        orderType: 'balance',
-      },
-      global: {
-        stubs: {
-          Icon: true,
-        },
-      },
-    })
-
-    await flushPromises()
-    expect(wrapper.text()).toContain('payment.qr.openPayWindow')
-
-    await wrapper.get('button.btn.btn-secondary.text-sm').trigger('click')
-    expect(openSpy).toHaveBeenCalledWith(
-      'https://pay.example.com/session/42',
-      'paymentPopup',
-      expect.any(String),
-    )
-
-    openSpy.mockRestore()
-  })
 })
--- a/frontend/src/components/payment/tests/paymentFlow.spec.ts
+++ b/frontend/src/components/payment/tests/paymentFlow.spec.ts
@@ -190,14 +190,12 @@ describe('buildCreateOrderPayload', () => {
      paymentType: 'alipay_direct',
      orderType: 'balance',
      origin: 'https://app.example.com/',
-      isMobile: true,
      isWechatBrowser: false,
    })).toEqual({
      amount: 88,
      payment_type: 'alipay',
      order_type: 'balance',
      return_url: 'https://app.example.com/payment/result',
-      is_mobile: true,
      payment_source: 'hosted_redirect',
    })
  })
@@ -209,7 +207,6 @@ describe('buildCreateOrderPayload', () => {
      orderType: 'subscription',
      planId: 7,
      origin: 'https://app.example.com',
-      isMobile: false,
      isWechatBrowser: true,
    })).toEqual({
      amount: 128,
@@ -217,7 +214,6 @@ describe('buildCreateOrderPayload', () => {
      order_type: 'subscription',
      plan_id: 7,
      return_url: 'https://app.example.com/payment/result',
-      is_mobile: false,
      payment_source: 'wechat_in_app_resume',
    })
  })
--- a/frontend/src/components/payment/tests/providerConfig.spec.ts
+++ b/frontend/src/components/payment/tests/providerConfig.spec.ts
@@ -12,9 +12,9 @@ describe('PROVIDER_CONFIG_FIELDS.wxpay', () => {
    expect(findField('certSerial')?.optional).toBeFalsy()
  })

-  it('only keeps the simplified visible credential set in the admin form', () => {
-    expect(findField('mpAppId')).toBeUndefined()
-    expect(findField('h5AppName')).toBeUndefined()
-    expect(findField('h5AppUrl')).toBeUndefined()
+  it('exposes optional mp and H5 metadata fields for WeChat-specific flows', () => {
+    expect(findField('mpAppId')?.optional).toBe(true)
+    expect(findField('h5AppName')?.optional).toBe(true)
+    expect(findField('h5AppUrl')?.optional).toBe(true)
  })
 })
--- a/frontend/src/components/payment/paymentFlow.ts
+++ b/frontend/src/components/payment/paymentFlow.ts
@@ -68,7 +68,6 @@ export interface BuildCreateOrderPayloadInput {
  orderType: OrderType
  planId?: number
  origin?: string
-  isMobile: boolean
  isWechatBrowser: boolean
 }

@@ -107,7 +106,6 @@ export function buildCreateOrderPayload(input: BuildCreateOrderPayloadInput): Cr
    amount: input.amount,
    payment_type: visibleMethod,
    order_type: input.orderType,
-    is_mobile: input.isMobile,
    payment_source: visibleMethod === 'wxpay' && input.isWechatBrowser
      ? 'wechat_in_app_resume'
      : 'hosted_redirect',
--- a/frontend/src/components/payment/providerConfig.ts
+++ b/frontend/src/components/payment/providerConfig.ts
@@ -96,12 +96,15 @@ export const PROVIDER_CONFIG_FIELDS: Record<string, ConfigFieldDef[]> = {
  ],
  wxpay: [
    { key: 'appId', label: 'App ID', sensitive: false },
+    { key: 'mpAppId', label: '', sensitive: false, optional: true },
    { key: 'mchId', label: '', sensitive: false },
    { key: 'privateKey', label: '', sensitive: true },
    { key: 'apiV3Key', label: '', sensitive: true },
    { key: 'certSerial', label: '', sensitive: false },
    { key: 'publicKey', label: '', sensitive: true },
    { key: 'publicKeyId', label: '', sensitive: false },
+    { key: 'h5AppName', label: '', sensitive: false, optional: true },
+    { key: 'h5AppUrl', label: '', sensitive: false, optional: true },
  ],
  stripe: [
    { key: 'secretKey', label: '', sensitive: true },
--- a/frontend/src/i18n/locales/en.ts
+++ b/frontend/src/i18n/locales/en.ts
@@ -1665,8 +1665,6 @@ export default {
      failedToLoadApiKeys: 'Failed to load user API keys',
      emailRequired: 'Please enter email',
      concurrencyMin: 'Concurrency must be at least 1',
-      soraStorageQuota: 'Sora Storage Quota',
-      soraStorageQuotaHint: 'In GB, 0 means use group or system default quota',
      amountRequired: 'Please enter a valid amount',
      insufficientBalance: 'Insufficient balance',
      deleteConfirm: "Are you sure you want to delete '{email}'? This action cannot be undone.",
@@ -1999,14 +1997,6 @@ export default {
        enabled: 'Enabled',
        disabled: 'Disabled'
      },
-      claudeMaxSimulation: {
-        title: 'Claude Max Usage Simulation',
-        tooltip:
-          'When enabled, for Claude models without upstream cache-write usage, the system deterministically maps tokens to a small input plus 1h cache creation while keeping total tokens unchanged.',
-        enabled: 'Enabled (simulate 1h cache)',
-        disabled: 'Disabled',
-        hint: 'Only token categories in usage billing logs are adjusted. No per-request mapping state is persisted.'
-      },
      supportedScopes: {
        title: 'Supported Model Families',
        tooltip: 'Select the model families this group supports. Unchecked families will not be routed to this group.',
@@ -2640,7 +2630,7 @@ export default {
      resetQuota: 'Reset Quota',
      quotaLimit: 'Quota Limit',
      quotaLimitPlaceholder: '0 means unlimited',
-      quotaLimitHint: 'Set daily/weekly/total spending limits (USD). Anthropic API key accounts can also configure client affinity. Changing limits won\'t reset usage.',
+      quotaLimitHint: 'Set daily/weekly/total spending limits (USD). Changing limits won\'t reset usage.',
      quotaLimitToggle: 'Enable Quota Limit',
      quotaLimitToggleHint: 'When enabled, account will be paused when usage reaches the set limit',
      quotaDailyLimit: 'Daily Limit',
@@ -2844,7 +2834,7 @@ export default {
      // Quota control (Anthropic OAuth/SetupToken only)
      quotaControl: {
        title: 'Quota Control',
-        hint: 'Configure cost window, session limits, client affinity and other scheduling controls.',
+        hint: 'Configure cost windows, session limits and other scheduling controls.',
        windowCost: {
          label: '5h Window Cost Limit',
          hint: 'Limit account cost usage within the 5-hour window',
@@ -2890,7 +2880,7 @@ export default {
          label: 'TLS Fingerprint Simulation',
          hint: 'Simulate Node.js/Claude Code client TLS fingerprint',
          defaultProfile: 'Built-in Default',
-          randomProfile: 'Random'
+          randomProfile: 'Random',
        },
        sessionIdMasking: {
          label: 'Session ID Masking',
@@ -2907,25 +2897,7 @@ export default {
          hint: 'Forward requests to a custom relay service. Proxy URL will be passed as a query parameter.',
          urlHint: 'Relay service URL (e.g., https://relay.example.com)',
        },
-        clientAffinity: {
-          label: 'Client Affinity Scheduling',
-          hint: 'When enabled, new sessions prefer accounts previously used by this client to reduce account switching'
-        }
      },
-      affinityNoClients: 'No affinity clients',
-      affinityClients: '{count} affinity clients:',
-      affinitySection: 'Client Affinity',
-      affinitySectionHint: 'Control how clients are distributed across accounts. Configure zone thresholds to balance load.',
-      affinityToggle: 'Enable Client Affinity',
-      affinityToggleHint: 'New sessions prefer accounts previously used by this client',
-      affinityBase: 'Base Limit (Green Zone)',
-      affinityBasePlaceholder: 'Empty = no limit',
-      affinityBaseHint: 'Max clients in green zone (full priority scheduling)',
-      affinityBaseOffHint: 'No green zone limit. All clients receive full priority scheduling.',
-      affinityBuffer: 'Buffer (Yellow Zone)',
-      affinityBufferPlaceholder: 'e.g. 3',
-      affinityBufferHint: 'Additional clients allowed in the yellow zone (degraded priority)',
-      affinityBufferInfinite: 'Unlimited',
      expired: 'Expired',
      proxy: 'Proxy',
      noProxy: 'No Proxy',
@@ -4947,12 +4919,6 @@ export default {
        integrationDoc: 'Payment Integration Docs',
        integrationDocHint: 'Covers endpoint specs, idempotency semantics, and code samples'
      },
-      soraClient: {
-        title: 'Sora Client',
-        description: 'Control whether to show the Sora client entry in the sidebar',
-        enabled: 'Enable Sora Client',
-        enabledHint: 'When enabled, the Sora entry will be shown in the sidebar for users to access Sora features'
-      },
      customMenu: {
        title: 'Custom Menu Pages',
        description: 'Add custom iframe pages to the sidebar navigation. Each page can be visible to regular users or administrators.',
@@ -5044,8 +5010,6 @@ export default {
        field_certSerial: 'Certificate Serial',
        field_h5AppName: 'H5 App Name',
        field_h5AppUrl: 'H5 App URL',
-        wxpayConfigHint: 'WeChat Pay usually only needs App ID. Fill MP App ID, H5 App Name, and H5 App URL only when your Official Account or H5 flow specifically requires them.',
-        wxpayAdvancedOptions: 'WeChat Pay Advanced Options',
        field_secretKey: 'Secret Key',
        field_publishableKey: 'Publishable Key',
        field_webhookSecret: 'Webhook Secret',
@@ -5076,37 +5040,6 @@ export default {
        providerKey: 'Provider Type',
        selectProviderKey: 'Select Provider Type',
        providerConfig: 'Credentials',
-        paymentGuideTrigger: 'View payment guide',
-        guideOpenLabel: 'Enable: ',
-        guideCallLabel: 'Call: ',
-        guideFallbackLabel: 'Fallback: ',
-        alipayGuideSummary: 'Desktop prefers QR precreate and falls back to cashier; mobile prefers WAP checkout.',
-        alipayGuideFaceToFaceTitle: 'Face-to-face / QR Payment',
-        alipayGuideFaceToFaceOpen: 'Enable face-to-face or QR payment capability.',
-        alipayGuideFaceToFaceCall: 'Desktop orders call alipay.trade.precreate first and render the QR code directly.',
-        alipayGuideFaceToFaceFallback: 'If unavailable or failed, the flow falls back to website checkout automatically.',
-        alipayGuidePagePayTitle: 'Website Payment',
-        alipayGuidePagePayOpen: 'Enable website payment.',
-        alipayGuidePagePayCall: 'When face-to-face is unavailable on desktop, the flow calls alipay.trade.page.pay and still renders the returned link as a QR code.',
-        alipayGuidePagePayFallback: 'The cashier link stays available so users can reopen the checkout page manually.',
-        alipayGuideWapTitle: 'WAP Payment',
-        alipayGuideWapOpen: 'Enable mobile website payment.',
-        alipayGuideWapCall: 'Mobile orders call alipay.trade.wap.pay first and jump to Alipay checkout.',
-        alipayGuideWapFallback: 'If mobile payment is unavailable or fails, the frontend switches to QR payment and shows a notice.',
-        wxpayGuideSummary: 'Desktop prefers Native QR; mobile routes to JSAPI or H5 based on browser context.',
-        wxpayGuideNote: 'The current form defaults to one shared App ID, which fits the common single-subject web, mobile, and Official Account setup.',
-        wxpayGuideNativeTitle: 'Native / QR Payment',
-        wxpayGuideNativeOpen: 'Enable Native or QR payment capability.',
-        wxpayGuideNativeCall: 'Desktop orders use Native by default and the frontend renders the QR payload.',
-        wxpayGuideNativeFallback: 'Mobile flows also fall back here when JSAPI or H5 cannot be used.',
-        wxpayGuideJsapiTitle: 'JSAPI / Official Account',
-        wxpayGuideJsapiOpen: 'Enable Official Account payment and ensure the browser is inside WeChat with an available OpenID.',
-        wxpayGuideJsapiCall: 'Inside WeChat, the app calls JSAPI after authorization and launches WeChat Pay directly.',
-        wxpayGuideJsapiFallback: 'If configuration is missing, the bridge is unavailable, or launch fails, the flow falls back to QR payment.',
-        wxpayGuideH5Title: 'H5 Payment',
-        wxpayGuideH5Open: 'Enable H5 payment.',
-        wxpayGuideH5Call: 'On mobile browsers outside WeChat, the app calls H5 payment when a client IP is available.',
-        wxpayGuideH5Fallback: 'If H5 is unavailable or order creation fails, the flow falls back to QR payment.',
        noProviders: 'No provider instances configured',
        supportedTypes: 'Supported Payment Types',
        supportedTypesHint: 'Comma-separated, e.g. alipay,wxpay',
@@ -5205,98 +5138,6 @@ export default {
        securityWarning: 'Warning: This key provides full admin access. Keep it secure.',
        usage: 'Usage: Add to request header - x-api-key: <your-admin-api-key>'
      },
-      soraS3: {
-        title: 'Sora Storage',
-        description: 'Manage Sora media storage profiles with S3 and Google Drive support',
-        newProfile: 'New Profile',
-        reloadProfiles: 'Reload Profiles',
-        empty: 'No storage profiles yet, create one first',
-        createTitle: 'Create Storage Profile',
-        editTitle: 'Edit Storage Profile',
-        selectProvider: 'Select Storage Type',
-        providerS3Desc: 'S3-compatible object storage',
-        providerGDriveDesc: 'Google Drive cloud storage',
-        profileID: 'Profile ID',
-        profileName: 'Profile Name',
-        setActive: 'Set as active after creation',
-        saveProfile: 'Save Profile',
-        activateProfile: 'Activate',
-        profileCreated: 'Storage profile created',
-        profileSaved: 'Storage profile saved',
-        profileDeleted: 'Storage profile deleted',
-        profileActivated: 'Active storage profile switched',
-        profileIDRequired: 'Profile ID is required',
-        profileNameRequired: 'Profile name is required',
-        profileSelectRequired: 'Please select a profile first',
-        endpointRequired: 'S3 endpoint is required when enabled',
-        bucketRequired: 'Bucket is required when enabled',
-        accessKeyRequired: 'Access Key ID is required when enabled',
-        deleteConfirm: 'Delete storage profile {profileID}?',
-        columns: {
-          profile: 'Profile',
-          profileId: 'Profile ID',
-          name: 'Name',
-          provider: 'Type',
-          active: 'Active',
-          endpoint: 'Endpoint',
-          bucket: 'Bucket',
-          storagePath: 'Storage Path',
-          capacityUsage: 'Capacity / Used',
-          capacityUnlimited: 'Unlimited',
-          videoCount: 'Videos',
-          videoCompleted: 'completed',
-          videoInProgress: 'in progress',
-          quota: 'Default Quota',
-          updatedAt: 'Updated At',
-          actions: 'Actions',
-          rootFolder: 'Root folder',
-          testInTable: 'Test',
-          testingInTable: 'Testing...',
-          testTimeout: 'Test timed out (15s)'
-        },
-        enabled: 'Enable Storage',
-        enabledHint: 'When enabled, Sora generated media files will be automatically uploaded',
-        endpoint: 'S3 Endpoint',
-        region: 'Region',
-        bucket: 'Bucket',
-        prefix: 'Object Prefix',
-        accessKeyId: 'Access Key ID',
-        secretAccessKey: 'Secret Access Key',
-        secretConfigured: '(Configured, leave blank to keep)',
-        cdnUrl: 'CDN URL',
-        cdnUrlHint: 'Optional. When configured, files are accessed via CDN URL',
-        forcePathStyle: 'Force Path Style',
-        defaultQuota: 'Default Storage Quota',
-        defaultQuotaHint: 'Default quota when not specified at user or group level. 0 means unlimited',
-        testConnection: 'Test Connection',
-        testing: 'Testing...',
-        testSuccess: 'Connection test successful',
-        testFailed: 'Connection test failed',
-        saved: 'Storage settings saved successfully',
-        saveFailed: 'Failed to save storage settings',
-        gdrive: {
-          authType: 'Authentication Method',
-          serviceAccount: 'Service Account',
-          clientId: 'Client ID',
-          clientSecret: 'Client Secret',
-          clientSecretConfigured: '(Configured, leave blank to keep)',
-          refreshToken: 'Refresh Token',
-          refreshTokenConfigured: '(Configured, leave blank to keep)',
-          serviceAccountJson: 'Service Account JSON',
-          serviceAccountConfigured: '(Configured, leave blank to keep)',
-          folderId: 'Folder ID (optional)',
-          authorize: 'Authorize Google Drive',
-          authorizeHint: 'Get Refresh Token via OAuth2',
-          oauthFieldsRequired: 'Please fill in Client ID and Client Secret first',
-          oauthSuccess: 'Google Drive authorization successful',
-          oauthFailed: 'Google Drive authorization failed',
-          closeWindow: 'This window will close automatically',
-          processing: 'Processing authorization...',
-          testStorage: 'Test Storage',
-          testSuccess: 'Google Drive storage test passed (upload, access, delete all OK)',
-          testFailed: 'Google Drive storage test failed'
-        }
-      },
      overloadCooldown: {
        title: '529 Overload Cooldown',
        description: 'Configure account scheduling pause strategy when upstream returns 529 (overloaded)',
@@ -5963,7 +5804,6 @@ export default {
      wechatOpenInWeChatHint: 'Open the current page inside WeChat, or switch to desktop WeChat QR payment.',
      wechatScanOnDesktopHint: 'On desktop, use WeChat Scan to pay; on mobile, reopen the current page inside WeChat.',
      wechatSwitchBrowserHint: 'Switch to desktop WeChat QR payment, or reopen this page in an external browser and retry.',
-      mobilePaymentFallbackToQr: 'This merchant has not enabled mobile payment. The flow has been switched to QR payment automatically.',
      alipayDesktopUnavailable: 'The desktop Alipay flow could not generate a QR code.',
      alipayDesktopQrHint: 'Desktop Alipay should render a QR code. Refresh and retry, or make sure the payment page was not blocked.',
      alipayMobileUnavailable: 'This page could not hand off to Alipay.',
--- a/frontend/src/i18n/locales/zh.ts
+++ b/frontend/src/i18n/locales/zh.ts
@@ -1729,8 +1729,6 @@ export default {
      failedToAdjust: '调整失败',
      emailRequired: '请输入邮箱',
      concurrencyMin: '并发数不能小于1',
-      soraStorageQuota: 'Sora 存储配额',
-      soraStorageQuotaHint: '单位 GB，0 表示使用分组或系统默认配额',
      amountRequired: '请输入有效金额',
      insufficientBalance: '余额不足',
      setAllowedGroups: '设置允许分组',
@@ -2987,7 +2985,7 @@ export default {
      // Quota control (Anthropic OAuth/SetupToken only)
      quotaControl: {
        title: '配额控制',
-        hint: '配置费用窗口、会话限制、客户端亲和等调度控制。',
+        hint: '配置费用窗口、会话限制等调度控制。',
        windowCost: {
          label: '5h窗口费用控制',
          hint: '限制账号在5小时窗口内的费用使用',
@@ -3033,7 +3031,7 @@ export default {
          label: 'TLS 指纹模拟',
          hint: '模拟 Node.js/Claude Code 客户端的 TLS 指纹',
          defaultProfile: '内置默认',
-          randomProfile: '随机'
+          randomProfile: '随机',
        },
        sessionIdMasking: {
          label: '会话 ID 伪装',
@@ -3050,25 +3048,7 @@ export default {
          hint: '启用后将请求转发到自定义中继服务，代理地址将作为 URL 参数传递给中继服务',
          urlHint: '中继服务地址（如 https://relay.example.com）',
        },
-        clientAffinity: {
-          label: '客户端亲和调度',
-          hint: '启用后，新会话会优先调度到该客户端之前使用过的账号，避免频繁切换账号'
-        }
      },
-      affinityNoClients: '无亲和客户端',
-      affinityClients: '{count} 个亲和客户端：',
-      affinitySection: '客户端亲和',
-      affinitySectionHint: '控制客户端在账号间的分布。通过配置区域阈值来平衡负载。',
-      affinityToggle: '启用客户端亲和',
-      affinityToggleHint: '新会话优先调度到该客户端之前使用过的账号',
-      affinityBase: '基础限额（绿区）',
-      affinityBasePlaceholder: '留空表示不限制',
-      affinityBaseHint: '绿区最大客户端数量（完整优先级调度）',
-      affinityBaseOffHint: '未开启绿区限制，所有客户端均享受完整优先级调度',
-      affinityBuffer: '缓冲区（黄区）',
-      affinityBufferPlaceholder: '例如 3',
-      affinityBufferHint: '黄区允许的额外客户端数量（降级优先级调度）',
-      affinityBufferInfinite: '不限制',
      expired: '已过期',
      proxy: '代理',
      noProxy: '无代理',
@@ -5111,12 +5091,6 @@ export default {
        integrationDoc: '支付集成文档',
        integrationDocHint: '包含接口说明、幂等语义及示例代码'
      },
-      soraClient: {
-        title: 'Sora 客户端',
-        description: '控制是否在侧边栏展示 Sora 客户端入口',
-        enabled: '启用 Sora 客户端',
-        enabledHint: '开启后，侧边栏将显示 Sora 入口，用户可访问 Sora 功能'
-      },
      customMenu: {
        title: '自定义菜单页面',
        description: '添加自定义 iframe 页面到侧边栏导航。每个页面可以设置为普通用户或管理员可见。',
@@ -5208,8 +5182,6 @@ export default {
        field_certSerial: '证书序列号',
        field_h5AppName: 'H5 应用名称',
        field_h5AppUrl: 'H5 应用地址',
-        wxpayConfigHint: '微信支付通常只需要填写 App ID。公众号 App ID、H5 应用名称、H5 应用地址仅在公众号支付或 H5 场景有特殊要求时再填写。',
-        wxpayAdvancedOptions: '微信支付高级可选项',
        field_secretKey: '密钥',
        field_publishableKey: '公开密钥',
        field_webhookSecret: 'Webhook 密钥',
@@ -5240,37 +5212,6 @@ export default {
        providerKey: '服务商类型',
        selectProviderKey: '选择服务商类型',
        providerConfig: '凭证配置',
-        paymentGuideTrigger: '查看支付方式说明',
-        guideOpenLabel: '开通：',
-        guideCallLabel: '调用：',
-        guideFallbackLabel: '降级：',
-        alipayGuideSummary: '桌面优先扫码单，失败再走收银台；移动优先手机网站支付。',
-        alipayGuideFaceToFaceTitle: '当面付 / 扫码支付',
-        alipayGuideFaceToFaceOpen: '需开通当面付或扫码支付能力。',
-        alipayGuideFaceToFaceCall: '桌面端下单时优先调用 alipay.trade.precreate，前台直接渲染二维码。',
-        alipayGuideFaceToFaceFallback: '接口不可用或返回失败时，自动降级到电脑网站支付。',
-        alipayGuidePagePayTitle: '电脑网站支付',
-        alipayGuidePagePayOpen: '需开通电脑网站支付。',
-        alipayGuidePagePayCall: '桌面端当面付不可用时调用 alipay.trade.page.pay，并继续把返回链接渲染成二维码。',
-        alipayGuidePagePayFallback: '同时保留打开收银台入口，用户可手动重新拉起支付页。',
-        alipayGuideWapTitle: '手机网站支付',
-        alipayGuideWapOpen: '需开通手机网站支付。',
-        alipayGuideWapCall: '移动端优先调用 alipay.trade.wap.pay，跳转支付宝收银台。',
-        alipayGuideWapFallback: '未开通或返回异常时，前端自动改走扫码支付并提示未开通移动支付。',
-        wxpayGuideSummary: '桌面优先 Native 扫码，移动端按浏览器环境走 JSAPI 或 H5。',
-        wxpayGuideNote: '当前表单默认共用一个 App ID，适合同主体下统一配置网页、移动和公众号场景。',
-        wxpayGuideNativeTitle: 'Native / 扫码支付',
-        wxpayGuideNativeOpen: '需开通 Native 或扫码支付能力。',
-        wxpayGuideNativeCall: '桌面端默认调用 Native，下发二维码内容给前台渲染。',
-        wxpayGuideNativeFallback: '移动端无法走 JSAPI 或 H5 时，也会自动回退到这里。',
-        wxpayGuideJsapiTitle: 'JSAPI / 公众号支付',
-        wxpayGuideJsapiOpen: '需开通公众号支付，并保证当前浏览器在微信内且能拿到 OpenID。',
-        wxpayGuideJsapiCall: '微信内浏览器完成授权后调用 JSAPI，直接拉起微信支付。',
-        wxpayGuideJsapiFallback: '未配置、Bridge 不可用或拉起失败时，自动改走扫码支付。',
-        wxpayGuideH5Title: 'H5 支付',
-        wxpayGuideH5Open: '需开通 H5 支付。',
-        wxpayGuideH5Call: '移动端非微信浏览器且有客户端 IP 时调用 H5 支付，跳转微信收银台。',
-        wxpayGuideH5Fallback: '未开通 H5 或下单失败时，自动改走扫码支付。',
        noProviders: '暂无服务商实例',
        supportedTypes: '支持的支付方式',
        supportedTypesHint: '逗号分隔，如 alipay,wxpay',
@@ -5368,98 +5309,6 @@ export default {
        securityWarning: '警告：此密钥拥有完整的管理员权限，请妥善保管。',
        usage: '使用方法：在请求头中添加 x-api-key: <your-admin-api-key>'
      },
-      soraS3: {
-        title: 'Sora 存储配置',
-        description: '以多配置列表管理 Sora 媒体存储，支持 S3 和 Google Drive',
-        newProfile: '新建配置',
-        reloadProfiles: '刷新列表',
-        empty: '暂无存储配置，请先创建',
-        createTitle: '新建存储配置',
-        editTitle: '编辑存储配置',
-        selectProvider: '选择存储类型',
-        providerS3Desc: 'S3 兼容对象存储',
-        providerGDriveDesc: 'Google Drive 云盘',
-        profileID: '配置 ID',
-        profileName: '配置名称',
-        setActive: '创建后设为生效',
-        saveProfile: '保存配置',
-        activateProfile: '设为生效',
-        profileCreated: '存储配置创建成功',
-        profileSaved: '存储配置保存成功',
-        profileDeleted: '存储配置删除成功',
-        profileActivated: '生效配置已切换',
-        profileIDRequired: '请填写配置 ID',
-        profileNameRequired: '请填写配置名称',
-        profileSelectRequired: '请先选择配置',
-        endpointRequired: '启用时必须填写 S3 端点',
-        bucketRequired: '启用时必须填写存储桶',
-        accessKeyRequired: '启用时必须填写 Access Key ID',
-        deleteConfirm: '确定删除存储配置 {profileID} 吗？',
-        columns: {
-          profile: '配置',
-          profileId: 'Profile ID',
-          name: '名称',
-          provider: '存储类型',
-          active: '生效状态',
-          endpoint: '端点',
-          bucket: '存储桶',
-          storagePath: '存储路径',
-          capacityUsage: '容量 / 已用',
-          capacityUnlimited: '无限制',
-          videoCount: '视频数',
-          videoCompleted: '完成',
-          videoInProgress: '进行中',
-          quota: '默认配额',
-          updatedAt: '更新时间',
-          actions: '操作',
-          rootFolder: '根目录',
-          testInTable: '测试',
-          testingInTable: '测试中...',
-          testTimeout: '测试超时（15秒）'
-        },
-        enabled: '启用存储',
-        enabledHint: '启用后，Sora 生成的媒体文件将自动上传到存储',
-        endpoint: 'S3 端点',
-        region: '区域',
-        bucket: '存储桶',
-        prefix: '对象前缀',
-        accessKeyId: 'Access Key ID',
-        secretAccessKey: 'Secret Access Key',
-        secretConfigured: '(已配置，留空保持不变)',
-        cdnUrl: 'CDN URL',
-        cdnUrlHint: '可选，配置后使用 CDN URL 访问文件',
-        forcePathStyle: '强制路径风格（Path Style）',
-        defaultQuota: '默认存储配额',
-        defaultQuotaHint: '未在用户或分组级别指定配额时的默认值，0 表示无限制',
-        testConnection: '测试连接',
-        testing: '测试中...',
-        testSuccess: '连接测试成功',
-        testFailed: '连接测试失败',
-        saved: '存储设置保存成功',
-        saveFailed: '保存存储设置失败',
-        gdrive: {
-          authType: '认证方式',
-          serviceAccount: '服务账号',
-          clientId: 'Client ID',
-          clientSecret: 'Client Secret',
-          clientSecretConfigured: '(已配置，留空保持不变)',
-          refreshToken: 'Refresh Token',
-          refreshTokenConfigured: '(已配置，留空保持不变)',
-          serviceAccountJson: '服务账号 JSON',
-          serviceAccountConfigured: '(已配置，留空保持不变)',
-          folderId: 'Folder ID（可选）',
-          authorize: '授权 Google Drive',
-          authorizeHint: '通过 OAuth2 获取 Refresh Token',
-          oauthFieldsRequired: '请先填写 Client ID 和 Client Secret',
-          oauthSuccess: 'Google Drive 授权成功',
-          oauthFailed: 'Google Drive 授权失败',
-          closeWindow: '此窗口将自动关闭',
-          processing: '正在处理授权...',
-          testStorage: '测试存储',
-          testSuccess: 'Google Drive 存储测试成功（上传、访问、删除均正常）',
-          testFailed: 'Google Drive 存储测试失败'
-        }
-      },
      overloadCooldown: {
        title: '529 过载冷却',
        description: '配置上游返回 529（过载）时的账号调度暂停策略',
@@ -6151,7 +6000,6 @@ export default {
      wechatOpenInWeChatHint: '请复制当前页面链接到微信内打开，或直接改用电脑端微信扫码支付。',
      wechatScanOnDesktopHint: '电脑端请直接使用微信扫一扫完成支付；移动端请在微信内打开当前页面。',
      wechatSwitchBrowserHint: '请改用电脑端微信扫码，或在外部浏览器重新打开本页后再试。',
-      mobilePaymentFallbackToQr: '当前商户未开通移动支付，已自动切换为扫码支付。',
      alipayDesktopUnavailable: '当前支付宝桌面支付未成功生成二维码。',
      alipayDesktopQrHint: '电脑端支付宝应展示扫码单，请刷新后重试，或确认浏览器未拦截当前支付页。',
      alipayMobileUnavailable: '当前页面未成功跳转到支付宝。',
--- a/frontend/src/utils/tests/codexUsage.spec.ts
+++ b/frontend/src/utils/tests/codexUsage.spec.ts
@@ -0,0 +1,186 @@
+import { describe, expect, it } from 'vitest'
+import { resolveCodexUsageWindow } from '@/utils/codexUsage'
+
+describe('resolveCodexUsageWindow', () => {
+  it('快照为空时返回空窗口', () => {
+    const result = resolveCodexUsageWindow(null, '5h', new Date('2026-02-20T08:00:00Z'))
+    expect(result).toEqual({ usedPercent: null, resetAt: null })
+  })
+
+  it('优先使用后端提供的绝对重置时间', () => {
+    const result = resolveCodexUsageWindow(
+      {
+        codex_5h_used_percent: 55,
+        codex_5h_reset_at: '2026-02-20T10:00:00Z',
+        codex_5h_reset_after_seconds: 1
+      },
+      '5h',
+      new Date('2026-02-20T08:00:00Z')
+    )
+
+    expect(result.usedPercent).toBe(55)
+    expect(result.resetAt).toBe('2026-02-20T10:00:00.000Z')
+  })
+
+  it('窗口已过期时自动归零', () => {
+    const result = resolveCodexUsageWindow(
+      {
+        codex_7d_used_percent: 100,
+        codex_7d_reset_at: '2026-02-20T07:00:00Z'
+      },
+      '7d',
+      new Date('2026-02-20T08:00:00Z')
+    )
+
+    expect(result.usedPercent).toBe(0)
+    expect(result.resetAt).toBe('2026-02-20T07:00:00.000Z')
+  })
+
+  it('无绝对时间时使用 updated_at + seconds 回退计算', () => {
+    const result = resolveCodexUsageWindow(
+      {
+        codex_5h_used_percent: 20,
+        codex_5h_reset_after_seconds: 3600,
+        codex_usage_updated_at: '2026-02-20T06:30:00Z'
+      },
+      '5h',
+      new Date('2026-02-20T07:00:00Z')
+    )
+
+    expect(result.usedPercent).toBe(20)
+    expect(result.resetAt).toBe('2026-02-20T07:30:00.000Z')
+  })
+
+  it('支持 legacy primary/secondary 字段映射', () => {
+    const snapshot = {
+      codex_primary_window_minutes: 10080,
+      codex_primary_used_percent: 70,
+      codex_primary_reset_after_seconds: 86400,
+      codex_secondary_window_minutes: 300,
+      codex_secondary_used_percent: 15,
+      codex_secondary_reset_after_seconds: 1200,
+      codex_usage_updated_at: '2026-02-20T07:00:00Z'
+    }
+
+    const result5h = resolveCodexUsageWindow(snapshot, '5h', new Date('2026-02-20T07:05:00Z'))
+    const result7d = resolveCodexUsageWindow(snapshot, '7d', new Date('2026-02-20T07:05:00Z'))
+
+    expect(result5h.usedPercent).toBe(15)
+    expect(result5h.resetAt).toBe('2026-02-20T07:20:00.000Z')
+    expect(result7d.usedPercent).toBe(70)
+    expect(result7d.resetAt).toBe('2026-02-21T07:00:00.000Z')
+  })
+
+  it('legacy 5h 在 primary<=360 时优先 primary 并支持字符串数字', () => {
+    const result = resolveCodexUsageWindow(
+      {
+        codex_primary_window_minutes: '300',
+        codex_primary_used_percent: '21',
+        codex_primary_reset_after_seconds: '1800',
+        codex_secondary_window_minutes: '10080',
+        codex_secondary_used_percent: '99',
+        codex_secondary_reset_after_seconds: '99999',
+        codex_usage_updated_at: '2026-02-20T08:00:00Z'
+      },
+      '5h',
+      new Date('2026-02-20T08:10:00Z')
+    )
+
+    expect(result.usedPercent).toBe(21)
+    expect(result.resetAt).toBe('2026-02-20T08:30:00.000Z')
+  })
+
+  it('legacy 5h 在无窗口信息时回退 secondary', () => {
+    const result = resolveCodexUsageWindow(
+      {
+        codex_secondary_used_percent: 19,
+        codex_secondary_reset_after_seconds: 120,
+        codex_usage_updated_at: '2026-02-20T08:00:00Z'
+      },
+      '5h',
+      new Date('2026-02-20T08:00:01Z')
+    )
+
+    expect(result.usedPercent).toBe(19)
+    expect(result.resetAt).toBe('2026-02-20T08:02:00.000Z')
+  })
+
+  it('legacy 场景下 secondary 为 7d 时能正确识别', () => {
+    const result = resolveCodexUsageWindow(
+      {
+        codex_primary_window_minutes: 300,
+        codex_primary_used_percent: 5,
+        codex_primary_reset_after_seconds: 600,
+        codex_secondary_window_minutes: 10080,
+        codex_secondary_used_percent: 66,
+        codex_secondary_reset_after_seconds: 7200,
+        codex_usage_updated_at: '2026-02-20T07:00:00Z'
+      },
+      '7d',
+      new Date('2026-02-20T07:30:00Z')
+    )
+
+    expect(result.usedPercent).toBe(66)
+    expect(result.resetAt).toBe('2026-02-20T09:00:00.000Z')
+  })
+
+  it('绝对时间非法时回退到 updated_at + seconds', () => {
+    const result = resolveCodexUsageWindow(
+      {
+        codex_5h_used_percent: 33,
+        codex_5h_reset_at: 'not-a-date',
+        codex_5h_reset_after_seconds: 900,
+        codex_usage_updated_at: '2026-02-20T07:30:00Z'
+      },
+      '5h',
+      new Date('2026-02-20T07:40:00Z')
+    )
+
+    expect(result.usedPercent).toBe(33)
+    expect(result.resetAt).toBe('2026-02-20T07:45:00.000Z')
+  })
+
+  it('updated_at 非法且无绝对时间时 resetAt 返回 null', () => {
+    const result = resolveCodexUsageWindow(
+      {
+        codex_5h_used_percent: 10,
+        codex_5h_reset_after_seconds: 123,
+        codex_usage_updated_at: 'invalid-time'
+      },
+      '5h',
+      new Date('2026-02-20T08:00:00Z')
+    )
+
+    expect(result.usedPercent).toBe(10)
+    expect(result.resetAt).toBeNull()
+  })
+
+  it('reset_after_seconds 为负数时按 0 秒处理', () => {
+    const result = resolveCodexUsageWindow(
+      {
+        codex_5h_used_percent: 80,
+        codex_5h_reset_after_seconds: -30,
+        codex_usage_updated_at: '2026-02-20T08:00:00Z'
+      },
+      '5h',
+      new Date('2026-02-20T07:59:00Z')
+    )
+
+    expect(result.usedPercent).toBe(80)
+    expect(result.resetAt).toBe('2026-02-20T08:00:00.000Z')
+  })
+
+  it('百分比缺失时仍可计算 resetAt 供倒计时展示', () => {
+    const result = resolveCodexUsageWindow(
+      {
+        codex_7d_reset_after_seconds: 60,
+        codex_usage_updated_at: '2026-02-20T08:00:00Z'
+      },
+      '7d',
+      new Date('2026-02-20T08:00:01Z')
+    )
+
+    expect(result.usedPercent).toBeNull()
+    expect(result.resetAt).toBe('2026-02-20T08:01:00.000Z')
+  })
+})
--- a/frontend/src/utils/tests/usageLoadQueue.spec.ts
+++ b/frontend/src/utils/tests/usageLoadQueue.spec.ts
@@ -145,6 +145,25 @@ describe('usageLoadQueue', () => {
    expect(Math.abs(timestamps[1] - timestamps[0])).toBeLessThan(50)
  })

+  it('Antigravity 平台直接执行，不排队', async () => {
+    const timestamps: number[] = []
+    const makeFn = () => async () => {
+      timestamps.push(Date.now())
+      return 'ok'
+    }
+
+    const acc1 = makeAccount('antigravity', 'oauth', { host: '1.2.3.4', port: 8080 })
+    const acc2 = makeAccount('antigravity', 'oauth', { host: '1.2.3.4', port: 8080 })
+
+    const p1 = enqueueUsageRequest(acc1, makeFn())
+    const p2 = enqueueUsageRequest(acc2, makeFn())
+
+    await Promise.all([p1, p2])
+
+    expect(timestamps).toHaveLength(2)
+    expect(Math.abs(timestamps[1] - timestamps[0])).toBeLessThan(50)
+  })
+
  it('OpenAI 平台直接执行，不排队', async () => {
    const timestamps: number[] = []
    const makeFn = () => async () => {
--- a/frontend/src/utils/codexUsage.ts
+++ b/frontend/src/utils/codexUsage.ts
@@ -0,0 +1,140 @@
+import type { CodexUsageSnapshot } from '@/types'
+
+export interface ResolvedCodexUsageWindow {
+  usedPercent: number | null
+  resetAt: string | null
+}
+
+type WindowKind = '5h' | '7d'
+
+function asNumber(value: unknown): number | null {
+  if (typeof value === 'number' && Number.isFinite(value)) return value
+  if (typeof value === 'string' && value.trim() !== '') {
+    const n = Number(value)
+    if (Number.isFinite(n)) return n
+  }
+  return null
+}
+
+function asString(value: unknown): string | null {
+  if (typeof value !== 'string') return null
+  const trimmed = value.trim()
+  return trimmed === '' ? null : trimmed
+}
+
+function asISOTime(value: unknown): string | null {
+  const raw = asString(value)
+  if (!raw) return null
+  const date = new Date(raw)
+  if (Number.isNaN(date.getTime())) return null
+  return date.toISOString()
+}
+
+function resolveLegacy5h(snapshot: Record<string, unknown>): {
+  used: number | null
+  resetAfterSeconds: number | null
+} {
+  const primaryWindow = asNumber(snapshot.codex_primary_window_minutes)
+  const secondaryWindow = asNumber(snapshot.codex_secondary_window_minutes)
+  const primaryUsed = asNumber(snapshot.codex_primary_used_percent)
+  const secondaryUsed = asNumber(snapshot.codex_secondary_used_percent)
+  const primaryReset = asNumber(snapshot.codex_primary_reset_after_seconds)
+  const secondaryReset = asNumber(snapshot.codex_secondary_reset_after_seconds)
+
+  if (primaryWindow != null && primaryWindow <= 360) {
+    return { used: primaryUsed, resetAfterSeconds: primaryReset }
+  }
+  if (secondaryWindow != null && secondaryWindow <= 360) {
+    return { used: secondaryUsed, resetAfterSeconds: secondaryReset }
+  }
+  return { used: secondaryUsed, resetAfterSeconds: secondaryReset }
+}
+
+function resolveLegacy7d(snapshot: Record<string, unknown>): {
+  used: number | null
+  resetAfterSeconds: number | null
+} {
+  const primaryWindow = asNumber(snapshot.codex_primary_window_minutes)
+  const secondaryWindow = asNumber(snapshot.codex_secondary_window_minutes)
+  const primaryUsed = asNumber(snapshot.codex_primary_used_percent)
+  const secondaryUsed = asNumber(snapshot.codex_secondary_used_percent)
+  const primaryReset = asNumber(snapshot.codex_primary_reset_after_seconds)
+  const secondaryReset = asNumber(snapshot.codex_secondary_reset_after_seconds)
+
+  if (primaryWindow != null && primaryWindow >= 10000) {
+    return { used: primaryUsed, resetAfterSeconds: primaryReset }
+  }
+  if (secondaryWindow != null && secondaryWindow >= 10000) {
+    return { used: secondaryUsed, resetAfterSeconds: secondaryReset }
+  }
+  return { used: primaryUsed, resetAfterSeconds: primaryReset }
+}
+
+function resolveFromSeconds(
+  snapshot: Record<string, unknown>,
+  resetAfterSeconds: number | null
+): string | null {
+  if (resetAfterSeconds == null) return null
+
+  const baseRaw = asString(snapshot.codex_usage_updated_at)
+  const base = baseRaw ? new Date(baseRaw) : new Date()
+  if (Number.isNaN(base.getTime())) return null
+
+  const sec = Math.max(0, resetAfterSeconds)
+  const resetAt = new Date(base.getTime() + sec * 1000)
+  return resetAt.toISOString()
+}
+
+function applyExpiredRule(
+  window: ResolvedCodexUsageWindow,
+  now: Date
+): ResolvedCodexUsageWindow {
+  if (window.usedPercent == null || !window.resetAt) return window
+  const resetDate = new Date(window.resetAt)
+  if (Number.isNaN(resetDate.getTime())) return window
+  if (resetDate.getTime() <= now.getTime()) {
+    return { usedPercent: 0, resetAt: resetDate.toISOString() }
+  }
+  return window
+}
+
+export function resolveCodexUsageWindow(
+  snapshot: (CodexUsageSnapshot & Record<string, unknown>) | null | undefined,
+  window: WindowKind,
+  now: Date = new Date()
+): ResolvedCodexUsageWindow {
+  if (!snapshot) {
+    return { usedPercent: null, resetAt: null }
+  }
+
+  const typedSnapshot = snapshot as Record<string, unknown>
+  let usedPercent: number | null
+  let resetAfterSeconds: number | null
+  let resetAt: string | null
+
+  if (window === '5h') {
+    usedPercent = asNumber(typedSnapshot.codex_5h_used_percent)
+    resetAfterSeconds = asNumber(typedSnapshot.codex_5h_reset_after_seconds)
+    resetAt = asISOTime(typedSnapshot.codex_5h_reset_at)
+    if (usedPercent == null || (resetAfterSeconds == null && !resetAt)) {
+      const legacy = resolveLegacy5h(typedSnapshot)
+      if (usedPercent == null) usedPercent = legacy.used
+      if (resetAfterSeconds == null) resetAfterSeconds = legacy.resetAfterSeconds
+    }
+  } else {
+    usedPercent = asNumber(typedSnapshot.codex_7d_used_percent)
+    resetAfterSeconds = asNumber(typedSnapshot.codex_7d_reset_after_seconds)
+    resetAt = asISOTime(typedSnapshot.codex_7d_reset_at)
+    if (usedPercent == null || (resetAfterSeconds == null && !resetAt)) {
+      const legacy = resolveLegacy7d(typedSnapshot)
+      if (usedPercent == null) usedPercent = legacy.used
+      if (resetAfterSeconds == null) resetAfterSeconds = legacy.resetAfterSeconds
+    }
+  }
+
+  if (!resetAt) {
+    resetAt = resolveFromSeconds(typedSnapshot, resetAfterSeconds)
+  }
+
+  return applyExpiredRule({ usedPercent, resetAt }, now)
+}
--- a/frontend/src/utils/embedded-url.ts
+++ b/frontend/src/utils/embedded-url.ts
@@ -1,6 +1,6 @@
 /**
 * Shared URL builder for iframe-embedded pages.
- * Used by PurchaseSubscriptionView and CustomPageView to build consistent URLs
+ * Used by CustomPageView to build consistent URLs
 * with user_id, token, theme, lang, ui_mode, src_host, and src parameters.
 */

--- a/frontend/src/views/HomeView.vue
+++ b/frontend/src/views/HomeView.vue
@@ -122,8 +122,11 @@
            >
              {{ siteName }}
            </h1>
-            <p class="mb-8 text-lg text-gray-600 dark:text-dark-300 md:text-xl">
-              {{ siteSubtitle }}
+            <p class="mb-3 text-xl font-semibold text-primary-600 dark:text-primary-400 md:text-2xl">
+              {{ t('home.heroSubtitle') }}
+            </p>
+            <p class="mb-8 text-base text-gray-600 dark:text-dark-300 md:text-lg">
+              {{ t('home.heroDescription') }}
            </p>

            <!-- CTA Button -->
@@ -177,7 +180,7 @@
        </div>

        <!-- Feature Tags - Centered -->
-        <div class="mb-12 flex flex-wrap items-center justify-center gap-4 md:gap-6">
+        <div class="mb-16 flex flex-wrap items-center justify-center gap-4 md:gap-6">
          <div
            class="inline-flex items-center gap-2.5 rounded-full border border-gray-200/50 bg-white/80 px-5 py-2.5 shadow-sm backdrop-blur-sm dark:border-dark-700/50 dark:bg-dark-800/80"
          >
@@ -204,6 +207,63 @@
          </div>
        </div>

+        <!-- Pain Points Section -->
+        <div class="mb-16">
+          <h2 class="mb-8 text-center text-2xl font-bold text-gray-900 dark:text-white md:text-3xl">
+            {{ t('home.painPoints.title') }}
+          </h2>
+          <div class="grid gap-4 sm:grid-cols-2 lg:grid-cols-4">
+            <!-- Pain Point 1: Expensive -->
+            <div class="rounded-xl border border-red-200/50 bg-red-50/50 p-5 dark:border-red-900/30 dark:bg-red-950/20">
+              <div class="mb-3 flex h-10 w-10 items-center justify-center rounded-lg bg-red-100 dark:bg-red-900/30">
+                <svg class="h-5 w-5 text-red-500" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+                  <path stroke-linecap="round" stroke-linejoin="round" d="M12 8c-1.657 0-3 .895-3 2s1.343 2 3 2 3 .895 3 2-1.343 2-3 2m0-8c1.11 0 2.08.402 2.599 1M12 8V7m0 1v8m0 0v1m0-1c-1.11 0-2.08-.402-2.599-1M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
+                </svg>
+              </div>
+              <h3 class="mb-1.5 font-semibold text-gray-900 dark:text-white">{{ t('home.painPoints.items.expensive.title') }}</h3>
+              <p class="text-sm text-gray-600 dark:text-dark-400">{{ t('home.painPoints.items.expensive.desc') }}</p>
+            </div>
+            <!-- Pain Point 2: Complex -->
+            <div class="rounded-xl border border-orange-200/50 bg-orange-50/50 p-5 dark:border-orange-900/30 dark:bg-orange-950/20">
+              <div class="mb-3 flex h-10 w-10 items-center justify-center rounded-lg bg-orange-100 dark:bg-orange-900/30">
+                <svg class="h-5 w-5 text-orange-500" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+                  <path stroke-linecap="round" stroke-linejoin="round" d="M19 11H5m14 0a2 2 0 012 2v6a2 2 0 01-2 2H5a2 2 0 01-2-2v-6a2 2 0 012-2m14 0V9a2 2 0 00-2-2M5 11V9a2 2 0 012-2m0 0V5a2 2 0 012-2h6a2 2 0 012 2v2M7 7h10" />
+                </svg>
+              </div>
+              <h3 class="mb-1.5 font-semibold text-gray-900 dark:text-white">{{ t('home.painPoints.items.complex.title') }}</h3>
+              <p class="text-sm text-gray-600 dark:text-dark-400">{{ t('home.painPoints.items.complex.desc') }}</p>
+            </div>
+            <!-- Pain Point 3: Unstable -->
+            <div class="rounded-xl border border-yellow-200/50 bg-yellow-50/50 p-5 dark:border-yellow-900/30 dark:bg-yellow-950/20">
+              <div class="mb-3 flex h-10 w-10 items-center justify-center rounded-lg bg-yellow-100 dark:bg-yellow-900/30">
+                <svg class="h-5 w-5 text-yellow-600" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+                  <path stroke-linecap="round" stroke-linejoin="round" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z" />
+                </svg>
+              </div>
+              <h3 class="mb-1.5 font-semibold text-gray-900 dark:text-white">{{ t('home.painPoints.items.unstable.title') }}</h3>
+              <p class="text-sm text-gray-600 dark:text-dark-400">{{ t('home.painPoints.items.unstable.desc') }}</p>
+            </div>
+            <!-- Pain Point 4: No Control -->
+            <div class="rounded-xl border border-gray-200/50 bg-gray-50/50 p-5 dark:border-dark-700/50 dark:bg-dark-800/50">
+              <div class="mb-3 flex h-10 w-10 items-center justify-center rounded-lg bg-gray-100 dark:bg-dark-700">
+                <svg class="h-5 w-5 text-gray-500" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+                  <path stroke-linecap="round" stroke-linejoin="round" d="M18.364 18.364A9 9 0 005.636 5.636m12.728 12.728A9 9 0 015.636 5.636m12.728 12.728L5.636 5.636" />
+                </svg>
+              </div>
+              <h3 class="mb-1.5 font-semibold text-gray-900 dark:text-white">{{ t('home.painPoints.items.noControl.title') }}</h3>
+              <p class="text-sm text-gray-600 dark:text-dark-400">{{ t('home.painPoints.items.noControl.desc') }}</p>
+            </div>
+          </div>
+        </div>
+
+        <!-- Solutions Section Title -->
+        <div class="mb-8 text-center">
+          <h2 class="mb-2 text-2xl font-bold text-gray-900 dark:text-white md:text-3xl">
+            {{ t('home.solutions.title') }}
+          </h2>
+          <p class="text-gray-600 dark:text-dark-400">{{ t('home.solutions.subtitle') }}</p>
+        </div>
+
        <!-- Features Grid -->
        <div class="mb-12 grid gap-6 md:grid-cols-3">
          <!-- Feature 1: Unified Gateway -->
@@ -369,6 +429,77 @@
            >
          </div>
        </div>
+
+        <!-- Comparison Table -->
+        <div class="mb-16">
+          <h2 class="mb-8 text-center text-2xl font-bold text-gray-900 dark:text-white md:text-3xl">
+            {{ t('home.comparison.title') }}
+          </h2>
+          <div class="overflow-x-auto">
+            <table class="w-full rounded-xl border border-gray-200/50 bg-white/60 backdrop-blur-sm dark:border-dark-700/50 dark:bg-dark-800/60">
+              <thead>
+                <tr class="border-b border-gray-200/50 dark:border-dark-700/50">
+                  <th class="px-6 py-4 text-left text-sm font-semibold text-gray-900 dark:text-white">{{ t('home.comparison.headers.feature') }}</th>
+                  <th class="px-6 py-4 text-center text-sm font-semibold text-gray-500 dark:text-dark-400">{{ t('home.comparison.headers.official') }}</th>
+                  <th class="px-6 py-4 text-center text-sm font-semibold text-primary-600 dark:text-primary-400">{{ t('home.comparison.headers.us') }}</th>
+                </tr>
+              </thead>
+              <tbody class="divide-y divide-gray-200/50 dark:divide-dark-700/50">
+                <tr>
+                  <td class="px-6 py-4 text-sm font-medium text-gray-900 dark:text-white">{{ t('home.comparison.items.pricing.feature') }}</td>
+                  <td class="px-6 py-4 text-center text-sm text-gray-500 dark:text-dark-400">{{ t('home.comparison.items.pricing.official') }}</td>
+                  <td class="px-6 py-4 text-center text-sm font-medium text-primary-600 dark:text-primary-400">{{ t('home.comparison.items.pricing.us') }}</td>
+                </tr>
+                <tr>
+                  <td class="px-6 py-4 text-sm font-medium text-gray-900 dark:text-white">{{ t('home.comparison.items.models.feature') }}</td>
+                  <td class="px-6 py-4 text-center text-sm text-gray-500 dark:text-dark-400">{{ t('home.comparison.items.models.official') }}</td>
+                  <td class="px-6 py-4 text-center text-sm font-medium text-primary-600 dark:text-primary-400">{{ t('home.comparison.items.models.us') }}</td>
+                </tr>
+                <tr>
+                  <td class="px-6 py-4 text-sm font-medium text-gray-900 dark:text-white">{{ t('home.comparison.items.management.feature') }}</td>
+                  <td class="px-6 py-4 text-center text-sm text-gray-500 dark:text-dark-400">{{ t('home.comparison.items.management.official') }}</td>
+                  <td class="px-6 py-4 text-center text-sm font-medium text-primary-600 dark:text-primary-400">{{ t('home.comparison.items.management.us') }}</td>
+                </tr>
+                <tr>
+                  <td class="px-6 py-4 text-sm font-medium text-gray-900 dark:text-white">{{ t('home.comparison.items.stability.feature') }}</td>
+                  <td class="px-6 py-4 text-center text-sm text-gray-500 dark:text-dark-400">{{ t('home.comparison.items.stability.official') }}</td>
+                  <td class="px-6 py-4 text-center text-sm font-medium text-primary-600 dark:text-primary-400">{{ t('home.comparison.items.stability.us') }}</td>
+                </tr>
+                <tr>
+                  <td class="px-6 py-4 text-sm font-medium text-gray-900 dark:text-white">{{ t('home.comparison.items.control.feature') }}</td>
+                  <td class="px-6 py-4 text-center text-sm text-gray-500 dark:text-dark-400">{{ t('home.comparison.items.control.official') }}</td>
+                  <td class="px-6 py-4 text-center text-sm font-medium text-primary-600 dark:text-primary-400">{{ t('home.comparison.items.control.us') }}</td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </div>
+
+        <!-- CTA Section -->
+        <div class="mb-8 rounded-2xl bg-gradient-to-r from-primary-500 to-primary-600 p-8 text-center shadow-xl shadow-primary-500/20 md:p-12">
+          <h2 class="mb-3 text-2xl font-bold text-white md:text-3xl">
+            {{ t('home.cta.title') }}
+          </h2>
+          <p class="mb-6 text-primary-100">
+            {{ t('home.cta.description') }}
+          </p>
+          <router-link
+            v-if="!isAuthenticated"
+            to="/register"
+            class="inline-flex items-center gap-2 rounded-full bg-white px-8 py-3 font-semibold text-primary-600 shadow-lg transition-all hover:bg-gray-50 hover:shadow-xl"
+          >
+            {{ t('home.cta.button') }}
+            <Icon name="arrowRight" size="md" :stroke-width="2" />
+          </router-link>
+          <router-link
+            v-else
+            :to="dashboardPath"
+            class="inline-flex items-center gap-2 rounded-full bg-white px-8 py-3 font-semibold text-primary-600 shadow-lg transition-all hover:bg-gray-50 hover:shadow-xl"
+          >
+            {{ t('home.goToDashboard') }}
+            <Icon name="arrowRight" size="md" :stroke-width="2" />
+          </router-link>
+        </div>
      </div>
    </main>

@@ -380,27 +511,20 @@
        <p class="text-sm text-gray-500 dark:text-dark-400">
          &copy; {{ currentYear }} {{ siteName }}. {{ t('home.footer.allRightsReserved') }}
        </p>
-        <div class="flex items-center gap-4">
-          <a
-            v-if="docUrl"
-            :href="docUrl"
-            target="_blank"
-            rel="noopener noreferrer"
-            class="text-sm text-gray-500 transition-colors hover:text-gray-700 dark:text-dark-400 dark:hover:text-white"
-          >
-            {{ t('home.docs') }}
-          </a>
-          <a
-            :href="githubUrl"
-            target="_blank"
-            rel="noopener noreferrer"
-            class="text-sm text-gray-500 transition-colors hover:text-gray-700 dark:text-dark-400 dark:hover:text-white"
-          >
-            GitHub
-          </a>
-        </div>
+        <a
+          v-if="docUrl"
+          :href="docUrl"
+          target="_blank"
+          rel="noopener noreferrer"
+          class="text-sm text-gray-500 transition-colors hover:text-gray-700 dark:text-dark-400 dark:hover:text-white"
+        >
+          {{ t('home.docs') }}
+        </a>
      </div>
    </footer>
+
+    <!-- 微信客服悬浮按钮 -->
+    <WechatServiceButton />
  </div>
 </template>

@@ -410,6 +534,7 @@ import { useI18n } from 'vue-i18n'
 import { useAuthStore, useAppStore } from '@/stores'
 import LocaleSwitcher from '@/components/common/LocaleSwitcher.vue'
 import Icon from '@/components/icons/Icon.vue'
+import WechatServiceButton from '@/components/common/WechatServiceButton.vue'

 const { t } = useI18n()

@@ -419,7 +544,6 @@ const appStore = useAppStore()
 // Site settings - directly from appStore (already initialized from injected config)
 const siteName = computed(() => appStore.cachedPublicSettings?.site_name || appStore.siteName || 'Sub2API')
 const siteLogo = computed(() => appStore.cachedPublicSettings?.site_logo || appStore.siteLogo || '')
-const siteSubtitle = computed(() => appStore.cachedPublicSettings?.site_subtitle || 'AI API Gateway Platform')
 const docUrl = computed(() => appStore.cachedPublicSettings?.doc_url || appStore.docUrl || '')
 const homeContent = computed(() => appStore.cachedPublicSettings?.home_content || '')

@@ -432,9 +556,6 @@ const isHomeContentUrl = computed(() => {
 // Theme
 const isDark = ref(document.documentElement.classList.contains('dark'))

-// GitHub URL
-const githubUrl = 'https://github.com/Wei-Shaw/sub2api'
-
 // Auth state
 const isAuthenticated = computed(() => authStore.isAuthenticated)
 const isAdmin = computed(() => authStore.isAdmin)
--- a/frontend/src/views/admin/SettingsView.vue
+++ b/frontend/src/views/admin/SettingsView.vue
@@ -3751,91 +3751,90 @@

        <!-- Tab: Features (功能开关) -->
        <div v-show="activeTab === 'features'" class="space-y-6">
-
-        <div class="card">
-          <div class="border-b border-gray-100 px-6 py-4 dark:border-dark-700">
-            <h2 class="text-lg font-semibold text-gray-900 dark:text-white">
-              {{ t('admin.settings.features.channelMonitor.title') }}
-            </h2>
-            <p class="mt-1 text-sm text-gray-500 dark:text-gray-400">
-              {{ t('admin.settings.features.channelMonitor.description') }}
-            </p>
-            <p class="mt-1.5 text-xs">
-              <router-link
-                to="/admin/channels/monitor"
-                class="inline-flex items-center gap-1 text-primary-600 hover:underline dark:text-primary-400"
-              >
-                {{ t('admin.settings.features.channelMonitor.configureLink') }}
-                <span aria-hidden="true">→</span>
-              </router-link>
-            </p>
-          </div>
-          <div class="space-y-5 p-6">
-            <div class="flex items-center justify-between">
-              <div>
-                <label class="text-sm font-medium text-gray-700 dark:text-gray-300">
-                  {{ t('admin.settings.features.channelMonitor.enabled') }}
-                </label>
-                <p class="mt-0.5 text-xs text-gray-500 dark:text-gray-400">
-                  {{ t('admin.settings.features.channelMonitor.enabledHint') }}
-                </p>
-              </div>
-              <Toggle v-model="form.channel_monitor_enabled" />
-            </div>
-
-            <div v-if="form.channel_monitor_enabled">
-              <label class="input-label">
-                {{ t('admin.settings.features.channelMonitor.defaultInterval') }}
-                <span class="text-red-500">*</span>
-              </label>
-              <input
-                v-model.number="form.channel_monitor_default_interval_seconds"
-                type="number"
-                min="15"
-                max="3600"
-                class="input"
-              />
-              <p class="mt-1 text-xs text-gray-400">
-                {{ t('admin.settings.features.channelMonitor.defaultIntervalHint') }}
+          <div class="card">
+            <div class="border-b border-gray-100 px-6 py-4 dark:border-dark-700">
+              <h2 class="text-lg font-semibold text-gray-900 dark:text-white">
+                {{ t("admin.settings.features.channelMonitor.title") }}
+              </h2>
+              <p class="mt-1 text-sm text-gray-500 dark:text-gray-400">
+                {{ t("admin.settings.features.channelMonitor.description") }}
+              </p>
+              <p class="mt-1.5 text-xs">
+                <router-link
+                  to="/admin/channels/monitor"
+                  class="inline-flex items-center gap-1 text-primary-600 hover:underline dark:text-primary-400"
+                >
+                  {{ t("admin.settings.features.channelMonitor.configureLink") }}
+                  <span aria-hidden="true">→</span>
+                </router-link>
              </p>
            </div>
-          </div>
-        </div>
+            <div class="space-y-5 p-6">
+              <div class="flex items-center justify-between">
+                <div>
+                  <label class="text-sm font-medium text-gray-700 dark:text-gray-300">
+                    {{ t("admin.settings.features.channelMonitor.enabled") }}
+                  </label>
+                  <p class="mt-0.5 text-xs text-gray-500 dark:text-gray-400">
+                    {{ t("admin.settings.features.channelMonitor.enabledHint") }}
+                  </p>
+                </div>
+                <Toggle v-model="form.channel_monitor_enabled" />
+              </div>

-        <div class="card">
-          <div class="border-b border-gray-100 px-6 py-4 dark:border-dark-700">
-            <h2 class="text-lg font-semibold text-gray-900 dark:text-white">
-              {{ t('admin.settings.features.availableChannels.title') }}
-            </h2>
-            <p class="mt-1 text-sm text-gray-500 dark:text-gray-400">
-              {{ t('admin.settings.features.availableChannels.description') }}
-            </p>
-            <p class="mt-1.5 text-xs">
-              <router-link
-                to="/admin/channels/pricing"
-                class="inline-flex items-center gap-1 text-primary-600 hover:underline dark:text-primary-400"
-              >
-                {{ t('admin.settings.features.availableChannels.configureLink') }}
-                <span aria-hidden="true">→</span>
-              </router-link>
-            </p>
-          </div>
-          <div class="space-y-5 p-6">
-            <div class="flex items-center justify-between">
-              <div>
-                <label class="text-sm font-medium text-gray-700 dark:text-gray-300">
-                  {{ t('admin.settings.features.availableChannels.enabled') }}
+              <div v-if="form.channel_monitor_enabled">
+                <label class="input-label">
+                  {{ t("admin.settings.features.channelMonitor.defaultInterval") }}
+                  <span class="text-red-500">*</span>
                </label>
-                <p class="mt-0.5 text-xs text-gray-500 dark:text-gray-400">
-                  {{ t('admin.settings.features.availableChannels.enabledHint') }}
+                <input
+                  v-model.number="form.channel_monitor_default_interval_seconds"
+                  type="number"
+                  min="15"
+                  max="3600"
+                  class="input"
+                />
+                <p class="mt-1 text-xs text-gray-400">
+                  {{ t("admin.settings.features.channelMonitor.defaultIntervalHint") }}
                </p>
              </div>
-              <Toggle v-model="form.available_channels_enabled" />
+            </div>
+          </div>
+
+          <div class="card">
+            <div class="border-b border-gray-100 px-6 py-4 dark:border-dark-700">
+              <h2 class="text-lg font-semibold text-gray-900 dark:text-white">
+                {{ t("admin.settings.features.availableChannels.title") }}
+              </h2>
+              <p class="mt-1 text-sm text-gray-500 dark:text-gray-400">
+                {{ t("admin.settings.features.availableChannels.description") }}
+              </p>
+              <p class="mt-1.5 text-xs">
+                <router-link
+                  to="/admin/channels/pricing"
+                  class="inline-flex items-center gap-1 text-primary-600 hover:underline dark:text-primary-400"
+                >
+                  {{ t("admin.settings.features.availableChannels.configureLink") }}
+                  <span aria-hidden="true">→</span>
+                </router-link>
+              </p>
+            </div>
+            <div class="space-y-5 p-6">
+              <div class="flex items-center justify-between">
+                <div>
+                  <label class="text-sm font-medium text-gray-700 dark:text-gray-300">
+                    {{ t("admin.settings.features.availableChannels.enabled") }}
+                  </label>
+                  <p class="mt-0.5 text-xs text-gray-500 dark:text-gray-400">
+                    {{ t("admin.settings.features.availableChannels.enabledHint") }}
+                  </p>
+                </div>
+                <Toggle v-model="form.available_channels_enabled" />
+              </div>
            </div>
          </div>
        </div>
-
-        </div><!-- /Tab: Features -->
+        <!-- /Tab: Features -->

        <!-- Tab: Email -->
        <!-- Tab: Payment -->
@@ -4254,8 +4253,6 @@
                    }}</label>
                    <ImageUpload
                      v-model="form.payment_help_image_url"
-                      :upload-label="t('admin.settings.site.uploadImage')"
-                      :remove-label="t('admin.settings.site.remove')"
                      :placeholder="
                        t('admin.settings.payment.helpImagePlaceholder')
                      "
--- a/frontend/src/views/admin/tests/SettingsView.spec.ts
+++ b/frontend/src/views/admin/tests/SettingsView.spec.ts
@@ -155,8 +155,6 @@ vi.mock("vue-i18n", async () => {
    "admin.settings.payment.findProvider": "查看支持的支付方式",
    "admin.settings.openaiExperimentalScheduler.title": "OpenAI 实验调度策略",
    "admin.settings.openaiExperimentalScheduler.description": "默认关闭。开启后仅影响本网关在 OpenAI 账号间的实验性调度选择逻辑，不代表上游 OpenAI 官方能力。",
-    "admin.settings.site.uploadImage": "上传图片",
-    "admin.settings.site.remove": "移除",
  };
  return {
    ...actual,
@@ -242,37 +240,6 @@ const SelectStub = defineComponent({
  },
 });

-const ImageUploadStub = defineComponent({
-  props: {
-    modelValue: {
-      type: String,
-      default: "",
-    },
-    uploadLabel: {
-      type: String,
-      default: "",
-    },
-    removeLabel: {
-      type: String,
-      default: "",
-    },
-    placeholder: {
-      type: String,
-      default: "",
-    },
-  },
-  setup(props) {
-    return () =>
-      h("div", {
-        class: "image-upload-stub",
-        "data-model-value": props.modelValue,
-        "data-upload-label": props.uploadLabel,
-        "data-remove-label": props.removeLabel,
-        "data-placeholder": props.placeholder,
-      });
-  },
-});
-
 const baseSettingsResponse = {
  registration_enabled: true,
  email_verify_enabled: false,
@@ -408,7 +375,7 @@ function mountView() {
        GroupBadge: true,
        GroupOptionItem: true,
        ProxySelector: true,
-        ImageUpload: ImageUploadStub,
+        ImageUpload: true,
        BackupSettings: true,
      },
    },
@@ -615,7 +582,7 @@ describe("admin SettingsView payment visible method controls", () => {
          GroupBadge: true,
          GroupOptionItem: true,
          ProxySelector: true,
-          ImageUpload: ImageUploadStub,
+          ImageUpload: true,
          BackupSettings: true,
        },
      },
@@ -641,24 +608,6 @@ describe("admin SettingsView payment visible method controls", () => {
    );
    expect(wrapper.text()).not.toContain("OpenAI 高级调度器");
  });
-
-  it("passes translated upload and remove labels to the payment help image uploader", async () => {
-    const wrapper = mountView();
-
-    await flushPromises();
-    await openPaymentTab(wrapper);
-
-    const imageUploads = wrapper.findAll(".image-upload-stub");
-    expect(imageUploads.length).toBeGreaterThan(0);
-
-    const paymentHelpImageUpload = imageUploads.find(
-      (node) => node.attributes("data-placeholder") === "admin.settings.payment.helpImagePlaceholder",
-    );
-
-    expect(paymentHelpImageUpload).toBeDefined();
-    expect(paymentHelpImageUpload?.attributes("data-upload-label")).toBe("上传图片");
-    expect(paymentHelpImageUpload?.attributes("data-remove-label")).toBe("移除");
-  });
 });

 describe("admin SettingsView wechat connect controls", () => {
--- a/frontend/src/views/admin/ops/components/OpsConcurrencyCard.vue
+++ b/frontend/src/views/admin/ops/components/OpsConcurrencyCard.vue
@@ -122,6 +122,7 @@ const platformRows = computed((): SummaryRow[] => {
      available_accounts: availableAccounts,
      rate_limited_accounts: safeNumber(avail.rate_limit_count),

+
      error_accounts: safeNumber(avail.error_count),
      total_concurrency: totalConcurrency,
      used_concurrency: usedConcurrency,
@@ -161,7 +162,6 @@ const groupRows = computed((): SummaryRow[] => {
        total_accounts: totalAccounts,
        available_accounts: availableAccounts,
        rate_limited_accounts: safeNumber(avail.rate_limit_count),
-  
        error_accounts: safeNumber(avail.error_count),
        total_concurrency: totalConcurrency,
        used_concurrency: usedConcurrency,
@@ -329,6 +329,7 @@ function formatDuration(seconds: number): string {
 }


+
 watch(
  () => realtimeEnabled.value,
  async (enabled) => {
--- a/frontend/src/views/user/PaymentView.vue
+++ b/frontend/src/views/user/PaymentView.vue
@@ -311,7 +311,6 @@ interface CreateOrderOptions {
  wechatResumeToken?: string
  paymentType?: string
  isResume?: boolean
-  mobileQrFallbackAttempted?: boolean
 }

 interface WeixinJSBridgeLike {
@@ -667,15 +666,14 @@ async function createOrder(orderAmount: number, orderType: OrderType, planId?: n
  submitting.value = true
  errorMessage.value = ''
  errorHintMessage.value = ''
-  const requestType = normalizeVisibleMethod(options.paymentType || selectedMethod.value) || options.paymentType || selectedMethod.value
  try {
+    const requestType = normalizeVisibleMethod(options.paymentType || selectedMethod.value) || options.paymentType || selectedMethod.value
    const payload = buildCreateOrderPayload({
      amount: orderAmount,
      paymentType: requestType,
      orderType,
      planId,
      origin: typeof window !== 'undefined' ? window.location.origin : '',
-      isMobile: isMobileDevice(),
      isWechatBrowser: typeof window !== 'undefined' && /MicroMessenger/i.test(window.navigator.userAgent),
    })
    if (options.openid) {
@@ -749,20 +747,8 @@ async function createOrder(orderAmount: number, orderType: OrderType, planId?: n
          appStore.showInfo(t('payment.qr.cancelled'))
          resetPayment()
        } else if (errMsg && !errMsg.includes('ok')) {
+          applyScenarioError({ reason: 'WECHAT_JSAPI_FAILED', message: errMsg }, visibleMethod)
          resetPayment()
-          const fallbackApplied = await attemptMobileQrFallback(
-            { reason: 'WECHAT_JSAPI_FAILED', message: errMsg },
-            {
-              orderAmount,
-              orderType,
-              planId,
-              paymentType: visibleMethod,
-              attempted: options.mobileQrFallbackAttempted === true,
-            },
-          )
-          if (!fallbackApplied) {
-            applyScenarioError({ reason: 'WECHAT_JSAPI_FAILED', message: errMsg }, visibleMethod)
-          }
        } else {
          const resultState = { ...decision.paymentState }
          resetPayment()
@@ -770,16 +756,7 @@ async function createOrder(orderAmount: number, orderType: OrderType, planId?: n
        }
      } catch (err: unknown) {
        resetPayment()
-        const fallbackApplied = await attemptMobileQrFallback(err, {
-          orderAmount,
-          orderType,
-          planId,
-          paymentType: visibleMethod,
-          attempted: options.mobileQrFallbackAttempted === true,
-        })
-        if (!fallbackApplied) {
-          throw err
-        }
+        throw err
      }
      return
    }
@@ -799,14 +776,6 @@ async function createOrder(orderAmount: number, orderType: OrderType, planId?: n
    } else if (apiErr.reason === 'CANCEL_RATE_LIMITED') {
      errorMessage.value = t('payment.errors.cancelRateLimited')
      errorHintMessage.value = ''
-    } else if (await attemptMobileQrFallback(err, {
-      orderAmount,
-      orderType,
-      planId,
-      paymentType: requestType,
-      attempted: options.mobileQrFallbackAttempted === true,
-    })) {
-      return
    } else {
      const handled = applyScenarioError(
        err,
@@ -826,101 +795,6 @@ async function createOrder(orderAmount: number, orderType: OrderType, planId?: n
  }
 }

-interface MobileQrFallbackContext {
-  orderAmount: number
-  orderType: OrderType
-  planId?: number
-  paymentType: string
-  attempted: boolean
-}
-
-function shouldFallbackToDesktopQr(err: unknown, paymentMethod: string, attempted: boolean): boolean {
-  if (attempted || !isMobileDevice()) {
-    return false
-  }
-
-  const normalizedMethod = normalizeVisibleMethod(paymentMethod) || paymentMethod
-  const reason = typeof err === 'object' && err && 'reason' in err && typeof err.reason === 'string'
-    ? err.reason
-    : ''
-  const message = err instanceof Error
-    ? err.message
-    : (typeof err === 'object' && err && 'message' in err && typeof err.message === 'string'
-      ? err.message
-      : '')
-  const normalizedMessage = message.toLowerCase()
-
-  if (normalizedMethod === 'wxpay') {
-    return reason === 'WECHAT_H5_NOT_AUTHORIZED'
-      || reason === 'WECHAT_PAYMENT_MP_NOT_CONFIGURED'
-      || reason === 'WECHAT_JSAPI_FAILED'
-      || reason === 'PAYMENT_GATEWAY_ERROR'
-      || reason === 'UNHANDLED_PAYMENT_SCENARIO'
-      || normalizedMessage.includes('weixinjsbridge is unavailable')
-      || normalizedMessage.includes('wechat_jsapi_unavailable')
-  }
-
-  if (normalizedMethod === 'alipay') {
-    return reason === 'PAYMENT_GATEWAY_ERROR' || reason === 'UNHANDLED_PAYMENT_SCENARIO'
-  }
-
-  return false
-}
-
-async function attemptMobileQrFallback(err: unknown, context: MobileQrFallbackContext): Promise<boolean> {
-  if (!shouldFallbackToDesktopQr(err, context.paymentType, context.attempted)) {
-    return false
-  }
-
-  try {
-    const visibleMethod = normalizeVisibleMethod(context.paymentType) || context.paymentType
-    const payload = buildCreateOrderPayload({
-      amount: context.orderAmount,
-      paymentType: visibleMethod,
-      orderType: context.orderType,
-      planId: context.planId,
-      origin: typeof window !== 'undefined' ? window.location.origin : '',
-      isMobile: false,
-      isWechatBrowser: false,
-    })
-    const result = await paymentStore.createOrder(payload) as CreateOrderResult & { resume_token?: string }
-    const stripeMethod = visibleMethod === 'wxpay' ? 'wechat_pay' : 'alipay'
-    const stripeRouteUrl = result.client_secret
-      ? router.resolve({
-        path: '/payment/stripe',
-        query: {
-          order_id: String(result.order_id),
-          client_secret: result.client_secret,
-          method: stripeMethod,
-          resume_token: result.resume_token || undefined,
-        },
-      }).href
-      : ''
-    const decision = decidePaymentLaunch(result, {
-      visibleMethod,
-      orderType: context.orderType,
-      isMobile: false,
-      isWechatBrowser: false,
-      stripePopupUrl: stripeRouteUrl,
-      stripeRouteUrl,
-    })
-
-    if (decision.kind !== 'qr_waiting' || !decision.paymentState.qrCode) {
-      return false
-    }
-
-    errorMessage.value = ''
-    errorHintMessage.value = ''
-    paymentState.value = decision.paymentState
-    paymentPhase.value = 'paying'
-    persistRecoverySnapshot(decision.recovery)
-    appStore.showWarning(t('payment.errors.mobilePaymentFallbackToQr'))
-    return true
-  } catch {
-    return false
-  }
-}
-
 function applyScenarioError(err: unknown, paymentMethod: string): boolean {
  const descriptor = describePaymentScenarioError(err, {
    paymentMethod,
--- a/frontend/src/views/user/tests/PaymentView.spec.ts
+++ b/frontend/src/views/user/tests/PaymentView.spec.ts
@@ -16,7 +16,6 @@ const refreshUser = vi.hoisted(() => vi.fn())
 const fetchActiveSubscriptions = vi.hoisted(() => vi.fn().mockResolvedValue(undefined))
 const showError = vi.hoisted(() => vi.fn())
 const showInfo = vi.hoisted(() => vi.fn())
-const showWarning = vi.hoisted(() => vi.fn())
 const getCheckoutInfo = vi.hoisted(() => vi.fn())
 const bridgeInvoke = vi.hoisted(() => vi.fn())

@@ -70,7 +69,6 @@ vi.mock('@/stores', () => ({
  useAppStore: () => ({
    showError,
    showInfo,
-    showWarning,
  }),
 }))

@@ -195,7 +193,6 @@ describe('PaymentView WeChat JSAPI flow', () => {
    fetchActiveSubscriptions.mockReset().mockResolvedValue(undefined)
    showError.mockReset()
    showInfo.mockReset()
-    showWarning.mockReset()
    getCheckoutInfo.mockReset().mockResolvedValue(checkoutInfoFixture())
    bridgeInvoke.mockReset()
    window.localStorage.clear()
@@ -367,24 +364,13 @@ describe('PaymentView WeChat JSAPI flow', () => {
    })
  })

-  it('falls back to QR flow when mobile WeChat payment is unavailable', async () => {
+  it('shows explicit H5 authorization guidance instead of failing silently', async () => {
    routeState.query = {
      wechat_resume: '1',
      wechat_resume_token: 'resume-token-h5',
      payment_type: 'wxpay_direct',
    }
-    createOrder
-      .mockRejectedValueOnce({ reason: 'WECHAT_H5_NOT_AUTHORIZED' })
-      .mockResolvedValueOnce({
-        order_id: 778,
-        amount: 88,
-        pay_amount: 88,
-        fee_rate: 0,
-        expires_at: '2099-01-01T00:10:00.000Z',
-        payment_type: 'wxpay',
-        qr_code: 'weixin://wxpay/bizpayurl?pr=fallback-native',
-        out_trade_no: 'sub2_qr_778',
-      })
+    createOrder.mockRejectedValueOnce({ reason: 'WECHAT_H5_NOT_AUTHORIZED' })

    shallowMount(PaymentView, {
      global: {
@@ -397,18 +383,8 @@ describe('PaymentView WeChat JSAPI flow', () => {
    await flushPromises()
    await flushPromises()

-    expect(createOrder).toHaveBeenNthCalledWith(1, expect.objectContaining({
-      payment_type: 'wxpay',
-      is_mobile: true,
-      wechat_resume_token: 'resume-token-h5',
-    }))
-    expect(createOrder).toHaveBeenNthCalledWith(2, expect.objectContaining({
-      payment_type: 'wxpay',
-      is_mobile: false,
-      payment_source: 'hosted_redirect',
-    }))
-    expect(showWarning).toHaveBeenCalledWith('payment.errors.mobilePaymentFallbackToQr')
-    expect(showError).not.toHaveBeenCalled()
-    expect(window.localStorage.getItem(PAYMENT_RECOVERY_STORAGE_KEY)).toContain('weixin://wxpay/bizpayurl?pr=fallback-native')
+    expect(showError).toHaveBeenCalledWith(
+      'payment.errors.wechatH5NotAuthorized payment.errors.wechatOpenInWeChatHint',
+    )
  })
 })