Merge branch 'release/test' of http://8.163.30.128:10082/html/client-web into release/test

2026-09-29 20:52:36 +08:00
parent d45cd19361 fa9bfd5f97
commit 151106250f
37 changed files with 348 additions and 759 deletions
@@ -2,7 +2,7 @@ import axios, { AxiosError, type AxiosRequestConfig, type InternalAxiosRequestCo
 import { parseApiJsonResponse } from '@chongchong/shared'
 import { clearSessionTokens, getAccessToken, getRefreshToken, persistTokenPair, type TokenPair } from '@/api/session'
 import { apiErrorMessage, asFieldErrors } from '@/api/errorDetails'
-import { ApiError, isApiEnvelope, type ApiEnvelope } from '@/api/types'
+import { ApiError, isApiEnvelope, isApiFailure, type ApiEnvelope } from '@/api/types'
 import { coordinateCrossTabRefresh, CrossTabRefreshTimeoutError } from '@/api/crossTabRefresh'

 const transport = axios.create({
@@ -16,6 +16,13 @@ interface RetryableRequest extends InternalAxiosRequestConfig {
 }

 function unwrap<T>(envelope: ApiEnvelope<T>) {
+  if (!isApiEnvelope(envelope)) {
+    const invalid: unknown = envelope
+    if (isApiFailure(invalid)) {
+      throw new ApiError(invalid.message, invalid.code, undefined, undefined, invalid.traceId, invalid.requestId)
+    }
+    throw new ApiError('接口响应格式错误', 'INVALID_RESPONSE')
+  }
  if (envelope.code !== '200') {
    const fieldErrors = asFieldErrors(envelope.data)
    throw new ApiError(apiErrorMessage(envelope.message, fieldErrors), envelope.code, undefined, fieldErrors, envelope.traceId, envelope.requestId)
@@ -28,8 +35,8 @@ function mapError(error: unknown) {
  if (!axios.isAxiosError(error)) return new ApiError(error instanceof Error ? error.message : '请求失败')

  const body = error.response?.data
-  if (isApiEnvelope(body)) {
-    const fieldErrors = asFieldErrors(body.data)
+  if (isApiEnvelope(body) || isApiFailure(body)) {
+    const fieldErrors = asFieldErrors(isApiEnvelope(body) ? body.data : undefined)
    return new ApiError(
      apiErrorMessage(body.message, fieldErrors),
      body.code,
@@ -170,8 +177,8 @@ async function throwBlobApiError(error: unknown, responseStatus?: number) {
  if (!blob || !blob.type.toLowerCase().includes('json')) return
  try {
    const body = JSON.parse(await blob.text()) as unknown
-    if (!isApiEnvelope(body)) return
-    const fieldErrors = asFieldErrors(body.data)
+    if (!isApiEnvelope(body) && !isApiFailure(body)) return
+    const fieldErrors = asFieldErrors(isApiEnvelope(body) ? body.data : undefined)
    throw new ApiError(
      apiErrorMessage(body.message, fieldErrors),
      body.code,
@@ -26,8 +26,8 @@ test('does not accept malformed or data-less successful responses', () => {
  assert.equal(isApiEnvelope({ code: '200', message: 'OK', data: [] }), true)
 })

-test('overseas transport handles business-code and HTTP security failures', async () => {
-  const transport = await readFile(new URL('./overseasHttp.ts', import.meta.url), 'utf8')
-  assert.match(transport, /if \(isApiFailure\(response.data\)\)/)
+test('unified transport handles business-code and HTTP security failures', async () => {
+  const transport = await readFile(new URL('./http.ts', import.meta.url), 'utf8')
+  assert.match(transport, /if \(isApiFailure\(invalid\)\)/)
  assert.match(transport, /isApiEnvelope\(body\) \|\| isApiFailure\(body\)/)
 })
@@ -1,91 +0,0 @@
-import axios, { type AxiosRequestConfig, type InternalAxiosRequestConfig } from 'axios'
-import { parseApiJsonResponse } from '@chongchong/shared'
-import { ApiError, isApiEnvelope, isApiFailure } from '@/api/types'
-import { getOverseasAccessToken } from '@/api/session'
-import { refreshAuthenticatedSession } from '@/api/http'
-
-interface RetryableRequest extends InternalAxiosRequestConfig { _retriedOverseasAuth?: boolean }
-
-const transport = axios.create({
-  baseURL: import.meta.env.VITE_OVERSEAS_API_BASE_URL || '/overseas-api',
-  timeout: 15_000,
-  transformResponse: [(data: unknown) => parseApiJsonResponse(data)],
-})
-
-async function requireToken() {
-  const current = getOverseasAccessToken()
-  if (current) return current
-  await refreshAuthenticatedSession()
-  const refreshed = getOverseasAccessToken()
-  if (!refreshed) throw new ApiError('当前环境未签发海外访问令牌', 'OVERSEAS_TOKEN_UNAVAILABLE')
-  return refreshed
-}
-
-transport.interceptors.request.use(async (config) => {
-  config.headers.Authorization = `Bearer ${await requireToken()}`
-  return config
-})
-
-transport.interceptors.response.use((response) => response, async (error) => {
-  const request = error.config as RetryableRequest | undefined
-  if (error.response?.status !== 401 || !request || request._retriedOverseasAuth) throw error
-  request._retriedOverseasAuth = true
-  await refreshAuthenticatedSession()
-  request.headers.Authorization = `Bearer ${await requireToken()}`
-  return transport.request(request)
-})
-
-export async function overseasApiRequest<T>(config: AxiosRequestConfig) {
-  try {
-    const response = await transport.request<unknown>(config)
-    if (isApiFailure(response.data)) {
-      throw new ApiError(response.data.message, response.data.code, response.status, undefined,
-        response.data.traceId, response.data.requestId)
-    }
-    if (!isApiEnvelope(response.data) || response.data.code !== '200') {
-      throw new ApiError(
-        isApiEnvelope(response.data) ? response.data.message : '海外接口响应格式错误',
-        isApiEnvelope(response.data) ? response.data.code : 'INVALID_RESPONSE',
-        undefined,
-        undefined,
-        isApiEnvelope(response.data) ? response.data.traceId : null,
-        isApiEnvelope(response.data) ? response.data.requestId : null,
-      )
-    }
-    return response.data.data as T
-  } catch (error) {
-    if (error instanceof ApiError) throw error
-    if (axios.isAxiosError(error)) {
-      const body = error.response?.data
-      if (isApiEnvelope(body) || isApiFailure(body)) {
-        throw new ApiError(body.message, body.code, error.response?.status, undefined, body.traceId, body.requestId)
-      }
-      throw new ApiError(error.code === 'ERR_NETWORK' ? '无法连接海外服务' : error.message, error.code || 'OVERSEAS_HTTP_ERROR', error.response?.status)
-    }
-    throw new ApiError(error instanceof Error ? error.message : '海外接口请求失败')
-  }
-}
-
-export async function overseasBlobRequest(config: AxiosRequestConfig) {
-  try {
-    const response = await transport.request<Blob>({ ...config, responseType: 'blob' })
-    return response.data
-  } catch (error) {
-    if (error instanceof ApiError) throw error
-    if (axios.isAxiosError(error)) {
-      const body = error.response?.data
-      if (body instanceof Blob && body.type.includes('json')) {
-        try {
-          const parsed: unknown = JSON.parse(await body.text())
-          if (isApiEnvelope(parsed) || isApiFailure(parsed)) {
-            throw new ApiError(parsed.message, parsed.code, error.response?.status, undefined, parsed.traceId, parsed.requestId)
-          }
-        } catch (parseError) {
-          if (parseError instanceof ApiError) throw parseError
-        }
-      }
-      throw new ApiError(error.code === 'ERR_NETWORK' ? '无法连接海外服务' : error.message, error.code || 'OVERSEAS_HTTP_ERROR', error.response?.status)
-    }
-    throw new ApiError(error instanceof Error ? error.message : '海外文件下载失败')
-  }
-}
@@ -1,7 +1,5 @@
 export const ACCESS_TOKEN_KEY = 'cc-client-access-token'
 export const REFRESH_TOKEN_KEY = 'cc-client-refresh-token'
-export const OVERSEAS_ACCESS_TOKEN_KEY = 'cc-client-overseas-access-token'
-export const OVERSEAS_EXPIRES_AT_KEY = 'cc-client-overseas-expires-at'
 export const REMEMBERED_LOGIN_ID_KEY = 'cc-client-remembered-login-id'

 export interface TokenPair {
@@ -10,14 +8,8 @@ export interface TokenPair {
  expiresIn: number
  refreshToken: string
  refreshExpiresIn: number
-  overseasAccessToken?: string | null
-  overseasExpiresIn?: number
 }

-function activeStorage() {
-  if (localStorage.getItem(ACCESS_TOKEN_KEY)) return localStorage
-  return sessionStorage
-}

 export function getAccessToken() {
  return localStorage.getItem(ACCESS_TOKEN_KEY) || sessionStorage.getItem(ACCESS_TOKEN_KEY) || ''
@@ -27,21 +19,11 @@ export function getRefreshToken() {
  return localStorage.getItem(REFRESH_TOKEN_KEY) || sessionStorage.getItem(REFRESH_TOKEN_KEY) || ''
 }

-export function getOverseasAccessToken() {
-  const storage = activeStorage()
-  const expiresAt = Number(storage.getItem(OVERSEAS_EXPIRES_AT_KEY) || 0)
-  if (expiresAt <= Date.now() + 30_000) return ''
-  return storage.getItem(OVERSEAS_ACCESS_TOKEN_KEY) || ''
-}

 export function persistTokenPair(tokens: TokenPair) {
  clearSessionTokens()
  localStorage.setItem(ACCESS_TOKEN_KEY, tokens.accessToken)
  localStorage.setItem(REFRESH_TOKEN_KEY, tokens.refreshToken)
-  if (tokens.overseasAccessToken && Number(tokens.overseasExpiresIn) > 0) {
-    localStorage.setItem(OVERSEAS_ACCESS_TOKEN_KEY, tokens.overseasAccessToken)
-    localStorage.setItem(OVERSEAS_EXPIRES_AT_KEY, String(Date.now() + Number(tokens.overseasExpiresIn) * 1000))
-  }
 }

 export function getRememberedLoginId() {
@@ -62,8 +44,6 @@ export function clearSessionTokens() {
  for (const storage of [localStorage, sessionStorage]) {
    storage.removeItem(ACCESS_TOKEN_KEY)
    storage.removeItem(REFRESH_TOKEN_KEY)
-    storage.removeItem(OVERSEAS_ACCESS_TOKEN_KEY)
-    storage.removeItem(OVERSEAS_EXPIRES_AT_KEY)
    storage.removeItem('cc-client-token')
  }
 }
@@ -0,0 +1,71 @@
+import assert from 'node:assert/strict'
+import test from 'node:test'
+import { readFileSync } from 'node:fs'
+import ts from 'typescript'
+import axios from 'axios'
+
+function compile(name, dependencies = {}) {
+  const source = readFileSync(new URL(name, import.meta.url), 'utf8')
+    .replace('import.meta.env.VITE_API_BASE_URL', "'/api'")
+  const code = ts.transpileModule(source, {
+    compilerOptions: { module: ts.ModuleKind.CommonJS, target: ts.ScriptTarget.ES2022, esModuleInterop: true },
+  }).outputText
+  const exports = {}
+  new Function('require', 'exports', code)((id) => {
+    assert.ok(id in dependencies, `unexpected dependency ${id}`)
+    return dependencies[id]
+  }, exports)
+  return exports
+}
+
+function harness(adapter) {
+  let token = 'old-access'
+  let refreshToken = 'old-refresh'
+  const http = compile('./http.ts', {
+    axios: { ...axios, create: (config) => axios.create({ ...config, adapter }) },
+    '@chongchong/shared': { parseApiJsonResponse: (data) => data },
+    '@/api/session': {
+      getAccessToken: () => token, getRefreshToken: () => refreshToken,
+      persistTokenPair: (tokens) => { token = tokens.accessToken; refreshToken = tokens.refreshToken },
+      clearSessionTokens: () => { token = ''; refreshToken = '' },
+    },
+    '@/api/errorDetails': compile('./errorDetails.ts'),
+    '@/api/types': compile('./types.ts'),
+    '@/api/crossTabRefresh': compile('./crossTabRefresh.ts'),
+  })
+  return http
+}
+
+test('order and lastleg 401s share one refresh and replay the unified access token', async () => {
+  let refreshes = 0
+  const calls = []
+  const http = harness(async (config) => {
+    calls.push({ url: config.url, base: config.baseURL, token: config.headers.Authorization })
+    if (config.url === '/auth/refresh') {
+      refreshes++
+      await new Promise((resolve) => setTimeout(resolve, 10))
+      return { config, status: 200, headers: {}, data: { code: '200', message: 'OK', data: { accessToken: 'new-access', refreshToken: 'new-refresh' } } }
+    }
+    if (config.headers.Authorization === 'Bearer old-access') {
+      throw new axios.AxiosError('Expired', 'ERR_BAD_REQUEST', config, null, { status: 401, data: { code: 'A0401', message: 'Expired' } })
+    }
+    return { config, status: 200, headers: {}, data: { code: '200', message: 'OK', data: config.url } }
+  })
+  const urls = ['/merchant/v1/orders', '/merchant/v1/last-leg/inbound-plans']
+  assert.deepEqual(await Promise.all(urls.map((url) => http.apiRequest({ url }))), urls)
+  assert.equal(refreshes, 1)
+  assert.ok(calls.every((call) => call.base === '/api'))
+  assert.equal(calls.find((call) => call.url === '/auth/refresh').token, undefined)
+  assert.equal(calls.filter((call) => call.token === 'Bearer new-access').length, 2)
+})
+
+test('data-less security failures preserve diagnostics and malformed success is rejected', async () => {
+  for (const data of [{ code: 'A0403', message: 'Denied', traceId: 'trace-1', requestId: 'request-1' }, { code: '200', message: 'OK' }]) {
+    const http = harness(async (config) => ({ config, status: 200, headers: {}, data }))
+    await assert.rejects(http.apiRequest({ url: '/merchant/v1/last-leg/inbound-plans' }), (error) => {
+      assert.equal(error.code, data.code === '200' ? 'INVALID_RESPONSE' : 'A0403')
+      if (data.code !== '200') { assert.equal(error.traceId, 'trace-1'); assert.equal(error.requestId, 'request-1') }
+      return true
+    })
+  }
+})
@@ -1,28 +0,0 @@
-import assert from 'node:assert/strict'
-import { readFile } from 'node:fs/promises'
-import test from 'node:test'
-
-const script = (await readFile(new URL('../../scripts/deploy-production.sh', import.meta.url), 'utf8'))
-  .replaceAll('\r\n', '\n')
-const compose = (await readFile(new URL('../../docker-compose.production.yml', import.meta.url), 'utf8'))
-  .replaceAll('\r\n', '\n')
-
-test('client production deployment switches healthy blue-green slots atomically', () => {
-  const start = script.indexOf('compose run -d --no-deps --name "$candidate"')
-  const health = script.indexOf('docker exec "$candidate" wget')
-  const nginx = script.indexOf('nginx -t || ! nginx -s reload')
-  const stop = script.indexOf('docker stop --time 30 "$active_container"')
-  assert.ok(start >= 0 && start < health && health < nginx && nginx < stop)
-  assert.match(script, /target_port=\$\(\(base_port \+ 20000\)\)/)
-  assert.match(script, /target_port=\$\(\(base_port \+ 10000\)\)/)
-  assert.match(script, /00-blue-green-admin-web\.conf/)
-  assert.match(script, /00-blue-green-client-web\.conf/)
-  assert.doesNotMatch(script, /nginx_config=\/www\/server\/panel\/vhost\/nginx\/(?:admin|app)\.buggoglobal\.com\.conf/)
-  assert.match(script, /cp -f "\$backup" "\$nginx_config"/)
-})
-
-test('client uses stable active gateway aliases on the routing network', () => {
-  assert.match(compose, /API_UPSTREAM: "http:\/\/gateway-active:9000"/)
-  assert.match(compose, /OVERSEAS_API_UPSTREAM: "http:\/\/gateway-overseas-active:9300"/)
-  assert.match(compose, /name: firstleg-production-routing/)
-})
@@ -1,67 +1,54 @@
 import assert from 'node:assert/strict'
-import { readFileSync } from 'node:fs'
+import { readFileSync, existsSync } from 'node:fs'
 import test from 'node:test'

-const config = readFileSync(new URL('../../nginx/default.conf.template', import.meta.url), 'utf8')
-const testCompose = readFileSync(new URL('../../docker-compose.test.yml', import.meta.url), 'utf8')
-const developmentCompose = readFileSync(new URL('../../docker-compose.development.yml', import.meta.url), 'utf8')
-const productionCompose = readFileSync(new URL('../../docker-compose.production.yml', import.meta.url), 'utf8')
-const jenkinsfile = readFileSync(new URL('../../Jenkinsfile', import.meta.url), 'utf8')
-const dockerfile = readFileSync(new URL('../../Dockerfile', import.meta.url), 'utf8')
+const root = new URL('../../', import.meta.url)
+const config = readFileSync(new URL('nginx/default.conf.template', root), 'utf8')
+const compose = readFileSync(new URL('docker-compose.test.yml', root), 'utf8')
+const jenkins = readFileSync(new URL('Jenkinsfile', root), 'utf8')
+const vite = readFileSync(new URL('vite.config.ts', root), 'utf8')

-test('allows 50 MiB uploads with multipart overhead through both API proxies', () => {
-  assert.match(config, /location \/api\/ \{[\s\S]*?client_max_body_size 55m;/)
-  assert.match(config, /location \/overseas-api\/ \{[\s\S]*?client_max_body_size 55m;/)
-  assert.equal(config.match(/client_max_body_size 55m;/g)?.length, 2)
-})
-
-test('does not cache the SPA entry while keeping hashed assets immutable', () => {
-  assert.match(config, /location = \/index\.html[\s\S]*no-store, no-cache, must-revalidate/)
-  assert.match(config, /location \/assets\/[\s\S]*max-age=31536000, immutable/)
-  assert.match(config, /location \/ \{[\s\S]*no-store, no-cache, must-revalidate[\s\S]*try_files \$uri \$uri\/ \/index\.html/)
-})
-
-test('routes domestic and overseas browser APIs to their test gateways without duplicate api prefixes', () => {
-  assert.match(testCompose, /- "host\.docker\.internal:host-gateway"/)
-  assert.match(testCompose, /API_UPSTREAM: "\$\{API_UPSTREAM:-http:\/\/host\.docker\.internal:9000\}"/)
-  assert.match(testCompose, /OVERSEAS_API_UPSTREAM: "\$\{OVERSEAS_API_UPSTREAM:-http:\/\/host\.docker\.internal:9300\}"/)
-  assert.doesNotMatch(testCompose, /http:\/\/test-api-(?:cn|global)\.buggoglobal\.com/)
-  assert.match(testCompose, /VITE_ADMIN_WEB_ORIGIN: "\$\{VITE_ADMIN_WEB_ORIGIN:-https:\/\/test-admin\.buggoglobal\.com\}"/)
-  assert.match(config, /location \/overseas-api\/ \{[\s\S]*?rewrite \^\/overseas-api\/\(\.\*\)\$ \/api\/\$1 break;[\s\S]*?proxy_pass \$\{OVERSEAS_API_UPSTREAM\};/)
+test('all business traffic uses one Gateway without rewriting API paths', () => {
+  assert.match(config, /location \/api\//)
+  assert.match(config, /proxy_pass \$\{API_UPSTREAM\};/)
+  assert.doesNotMatch(config, /overseas-api|OVERSEAS_API_UPSTREAM|rewrite/)
+  assert.match(config, /client_max_body_size 55m;/)
  assert.match(config, /proxy_set_header Host \$proxy_host;/)
-  assert.doesNotMatch(config, /\/api\/api/)
+  assert.doesNotMatch(vite, /OVERSEAS_API|AUTH_API_PROXY_TARGET|IAM_API_PROXY_TARGET|WAREHOUSE_API_PROXY_TARGET/)
 })

-test('connects the development client proxy to both development gateways', () => {
-  assert.match(developmentCompose, /API_UPSTREAM: "http:\/\/firstleg-development-gateway:9000"/)
-  assert.match(developmentCompose, /OVERSEAS_API_UPSTREAM: "http:\/\/firstleg-development-gateway-overseas:9300"/)
-  assert.match(developmentCompose, /- development-backend/)
-  assert.match(developmentCompose, /- development-overseas-backend/)
-  assert.match(developmentCompose, /development-overseas-backend:[\s\S]*?external: true[\s\S]*?name: firstleg-development-overseas-network/)
-  assert.doesNotMatch(developmentCompose, /test-api|prod(?:uction)?/i)
+test('test deployment requires an explicit shared network, Gateway and version', () => {
+  for (const key of ['IMAGE_TAG']) {
+    assert.ok(compose.includes('${' + key + ':?'))
+  }
+  assert.ok(compose.includes('${API_UPSTREAM:-http://gateway:9000}'))
+  assert.ok(compose.includes('${TEST_NETWORK:-firstleg-test-network}'))
+  assert.match(compose, /external: true/)
+  assert.match(compose, /127\.0\.0\.1:/)
+  assert.doesNotMatch(compose, /overseas|host\.docker\.internal|production|development/)
+  assert.match(jenkins, /label 'java-test'/)
+  assert.match(jenkins, /docker compose -f docker-compose\.test\.yml config --quiet/)
+  assert.match(jenkins, /docker network inspect/)
+  assert.doesNotMatch(jenkins, /docker-compose\.(production|development)|deploy-production|sshUserPrivateKey/)
+  for (const file of ['docker-compose.production.yml', 'docker-compose.development.yml', 'scripts/deploy-production.sh']) {
+    assert.equal(existsSync(new URL(file, root)), false)
+  }
 })

-test('keeps local environments on target nodes and uses credential-managed SSH for production', () => {
-  assert.match(jenkinsfile, /env\.JOB_BASE_NAME\?\.endsWith\('-prod'\) \? 'java-builder'/)
-  assert.match(jenkinsfile, /DEVELOPMENT_COMPOSE_PROJECT = 'client-web'/)
-  assert.match(jenkinsfile, /docker compose -p "\$DEVELOPMENT_COMPOSE_PROJECT" -f "\$DEVELOPMENT_COMPOSE_FILE" up -d/)
-  assert.doesNotMatch(jenkinsfile, /\/var\/jenkins_home\/\.ssh|docker save/)
-  assert.match(jenkinsfile, /credentialsId: 'firstleg-production-ssh'/)
-  assert.match(jenkinsfile, /git rev-parse origin\/main/)
-  assert.match(productionCompose, /127\.0\.0\.1:\$\{HOST_PORT:-9002\}:80/)
-  assert.match(productionCompose, /API_UPSTREAM: "http:\/\/gateway-active:9000"/)
-  assert.match(productionCompose, /OVERSEAS_API_UPSTREAM: "http:\/\/gateway-overseas-active:9300"/)
-  assert.match(productionCompose, /name: firstleg-production-routing/)
-  assert.match(productionCompose, /name: firstleg-prod-infra-network/)
+test('application shell is revalidated and missing chunks remain 404', () => {
+  assert.match(config, /location = \/index\.html/)
+  assert.match(config, /no-store/)
+  assert.match(config, /max-age=31536000, immutable/)
+  assert.match(config, /try_files \$uri =404;/)
+  assert.match(config, /try_files \$uri \$uri\/ \/index\.html;/)
 })

-test('uses authenticated internal base images in CI', () => {
-  assert.match(dockerfile, /ARG NODE_IMAGE=node:22-alpine/)
-  assert.match(dockerfile, /ARG NGINX_IMAGE=nginx:1\.27-alpine/)
-  assert.match(dockerfile, /FROM \$\{NODE_IMAGE\} AS build/)
-  assert.match(dockerfile, /FROM \$\{NGINX_IMAGE\}/)
-  assert.match(jenkinsfile, /NODE_BASE_IMAGE = '172\.31\.198\.7:10082\/java-project\/node:22-alpine'/)
-  assert.match(jenkinsfile, /NGINX_BASE_IMAGE = '172\.31\.198\.7:10082\/java-project\/nginx:1\.27-alpine'/)
-  assert.match(jenkinsfile, /withCredentials\(\[usernamePassword\(/)
-  assert.match(jenkinsfile, /export DOCKER_CONFIG="\$\{WORKSPACE\}@tmp\/docker-auth"/)
+
+test('container build excludes local environment values and waits for Nginx health', () => {
+  const ignore = readFileSync(new URL('.dockerignore', root), 'utf8')
+  assert.match(ignore, /^\.env$/m)
+  assert.match(ignore, /^\.env\.\*$/m)
+  assert.match(compose, /healthcheck:/)
+  assert.match(compose, /http:\/\/127\.0\.0\.1\/healthz/)
+  assert.match(jenkins, /up -d --wait --wait-timeout 120/)
 })
@@ -1,4 +1,4 @@
-import { overseasApiRequest } from '@/api/overseasHttp'
+import { apiRequest } from '@/api/http'

 export interface PageResult<T> {
  records: T[]
@@ -141,23 +141,23 @@ function normalizePage<T>(data: PageResult<T>): PageResult<T> {
 }

 export function listBusinessOrders<T>(kind: CrossBorderBusinessKind, params: BusinessOrderQuery) {
-  return overseasApiRequest<PageResult<T>>({ method: 'GET', url: endpointByKind[kind], params }).then(normalizePage)
+  return apiRequest<PageResult<T>>({ method: 'GET', url: endpointByKind[kind], params }).then(normalizePage)
 }

 export function getBusinessOrder<T>(kind: CrossBorderBusinessKind, orderNo: string) {
-  return overseasApiRequest<T>({ method: 'GET', url: `${endpointByKind[kind]}/${encodeURIComponent(orderNo)}` })
+  return apiRequest<T>({ method: 'GET', url: `${endpointByKind[kind]}/${encodeURIComponent(orderNo)}` })
 }

 export function createProcurement(payload: ProcurementCreate) {
-  return overseasApiRequest<ProcurementDetail>({ method: 'POST', url: endpointByKind.procurement, data: payload })
+  return apiRequest<ProcurementDetail>({ method: 'POST', url: endpointByKind.procurement, data: payload })
 }

 export function createTransport(kind: 'trucking' | 'looseboard', payload: TransportCreate) {
-  return overseasApiRequest<TransportDetail>({ method: 'POST', url: endpointByKind[kind], data: payload })
+  return apiRequest<TransportDetail>({ method: 'POST', url: endpointByKind[kind], data: payload })
 }

 export function updateTransport(kind: 'trucking' | 'looseboard', orderNo: string, payload: TransportUpdate) {
-  return overseasApiRequest<TransportDetail>({
+  return apiRequest<TransportDetail>({
    method: kind === 'trucking' ? 'PATCH' : 'PUT',
    url: `${endpointByKind[kind]}/${encodeURIComponent(orderNo)}`,
    data: payload,
@@ -1,5 +1,5 @@
 import { ApiError, apiRequest } from '@/api/http'
-import type { ApiContainerMode, ApiDestinationType, ApiFirstLegStatus, ApiPickupMethod, MerchantFirstLegOrderDetail, PageResult } from '@/modules/first-leg/api/firstLeg'
+import type { ApiContainerMode, ApiDestinationType, ApiFirstLegStatus, ApiPickupMethod, ApiTaxMode, MerchantFirstLegOrderDetail, PageResult } from '@/modules/first-leg/api/firstLeg'

 export type ApiUnifiedOrderMainStatus =
  | 'PENDING_REVIEW'
@@ -83,6 +83,8 @@ export interface MerchantUnifiedOrderRow {
  actualGrossWeightKg: number | null
  actualVolumeCbm: number | null
  pickupMethod: ApiPickupMethod | null
+  taxMode: ApiTaxMode | null
+  customsInspection: boolean | null
  requestedPickupAt: string | null
  containerMode: ApiContainerMode | null
  destinationType: ApiDestinationType | null
@@ -303,7 +303,8 @@ function clearanceResultStatusLabel(value: MerchantClearanceResult) {

      <div v-if="locked" class="customs-locked" role="status">
        <LockKeyhole :size="18" />
-        <div><strong>{{ detail.brokerSubmittedAt ? '已发送报关行执行' : '报关资料已锁定' }}</strong><span>{{ detail.brokerSubmittedAt ? '平台已将客户确认后的回执发送给报关行，等待真实报关完税文件。' : '报关开始后仅可查看和下载，不提供退回或解锁。' }}</span></div>
+        <div v-if="detail.status === 'COMPLETED'"><strong>报关已完成</strong><span>真实报关完税文件已齐全，可查看和下载资料、回执及完税文件。</span></div>
+        <div v-else><strong>{{ detail.brokerSubmittedAt ? '已发送报关行执行' : '报关资料已锁定' }}</strong><span>{{ detail.brokerSubmittedAt ? '平台已将客户确认后的回执发送给报关行，等待真实报关完税文件。' : '客户原始资料已冻结，仍可确认或打回待确认的报关行回执。' }}</span></div>
      </div>

      <section class="customs-section">
@@ -107,6 +107,8 @@ test('declares the final C02 row and detail contract in the API adapter', () =>
  for (const field of ['pickupMethod', 'requestedPickupAt', 'containerMode', 'destinationType', 'destinationCode', 'skuNos', 'totalQuantity', 'totalNetWeightKg', 'chargeableVolumeCbm', 'inboundCompletedAt', 'shipmentId', 'referenceId']) {
    assert.match(unifiedApiSource, new RegExp(`${field}:`))
  }
+  assert.match(unifiedApiSource, /taxMode: ApiTaxMode \| null/)
+  assert.match(unifiedApiSource, /customsInspection: boolean \| null/)
  assert.match(unifiedApiSource, /loadingVersion: number/)
  assert.match(unifiedApiSource, /pickingVersion: number/)
  assert.match(unifiedApiSource, /summary: MerchantUnifiedOrderRow/)
@@ -142,6 +144,8 @@ test('maps C02 authoritative status, transport, cargo and pickup snapshots', ()
  assert.match(storeSource, /id: String\(summary\.orderId\)/)
  assert.match(storeSource, /transportMode: unifiedTransport\(summary\.containerMode\)/)
  assert.match(storeSource, /status: summary\.mainStatus/)
+  assert.match(storeSource, /taxMode: summary\.taxMode \?\? 'BUY_DECLARATION'/)
+  assert.match(storeSource, /customsInspection: summary\.customsInspection \?\? false/)
  assert.match(storeSource, /fulfillmentType: summary\.fulfillmentType \?\? 'STANDARD'/)
  assert.match(storeSource, /lxCode: summary\.lxCode \?\? ''/)
  assert.match(storeSource, /mapped\.fulfillmentType = detail\.summary\.fulfillmentType \?\? mapped\.fulfillmentType/)
@@ -343,7 +343,7 @@ function mapUnifiedOrderRow(summary: MerchantUnifiedOrderRow, warehouses: Platfo
    createdAt: summary.createdAt, updatedAt: summary.updatedAt, tradeTerm: '', destinationCountryCode: '',
    destinationWarehouseId: summary.destinationWarehouseId == null ? '' : String(summary.destinationWarehouseId),
    destinationWarehouseName: summary.destinationWarehouseName ?? '', pickupMethod: summary.pickupMethod ?? 'SELF_EXPRESS', channelCode: '',
-    channelName: summary.channelName ?? '', pricingTaxMode: 'TAX_INCLUDED', carrierId: '', carrierName: '', taxMode: 'BUY_DECLARATION', customsInspection: false,
+    channelName: summary.channelName ?? '', pricingTaxMode: 'TAX_INCLUDED', carrierId: '', carrierName: '', taxMode: summary.taxMode ?? 'BUY_DECLARATION', customsInspection: summary.customsInspection ?? false,
    destinationType: summary.destinationType ?? 'PRIVATE', amazonWarehouseCode: summary.destinationCode ?? '', shipmentId: summary.shipmentId ?? '',
    requestedPickupAt: summary.requestedPickupAt ?? '', receivingTime: '', submittedAt: '', completedAt: '',
  }
@@ -1,7 +1,9 @@
 <script setup lang="ts">
-import { computed, onMounted, ref } from 'vue'
-import { FileText, RefreshCcw } from '@lucide/vue'
-import { ElMessage } from 'element-plus'
+import { computed, onMounted, ref, watch } from 'vue'
+import { RefreshCcw } from '@lucide/vue'
+import DataTable, { type DataTableColumn } from '@/components/common/DataTable.vue'
+import QueryToolbar, { type QueryField, type QueryModel } from '@/components/common/QueryToolbar.vue'
+import type { TableAction } from '@/components/common/tableActions'
 import { useFirstLegOrdersStore } from '../public'
 import { getMerchantCustomsForOrder, type MerchantCustomsContainer } from '../api/customs'
 import CustomsDocumentsDialog from '../components/CustomsDocumentsDialog.vue'
@@ -10,17 +12,59 @@ import type { FirstLegOrder } from '../types/firstLegOrder'
 const store = useFirstLegOrdersStore()
 const loading = ref(false)
 const errorMessage = ref('')
-const keyword = ref('')
+const queryModel = ref<QueryModel>({ orderNo: '', inboundCode: '', containerNo: '', status: '' })
+const appliedQuery = ref<QueryModel>({ ...queryModel.value })
+const page = ref(1)
+const pageSize = ref(20)
+const queryFields: QueryField[] = [
+  { key: 'orderNo', label: '订单号', type: 'input', placeholder: '请输入订单号' },
+  { key: 'inboundCode', label: '入仓码', type: 'input', placeholder: '请输入入仓码' },
+  { key: 'containerNo', label: '柜号', type: 'input', placeholder: '请输入柜号' },
+  { key: 'status', label: '状态', type: 'select', placeholder: '全部', options: [
+    { label: '待上传资料', value: 'WAITING_CUSTOMER_DOCUMENTS' },
+    { label: '待报关', value: 'READY_TO_START' },
+    { label: '报关中', value: 'DECLARING' },
+    { label: '报关完成', value: 'COMPLETED' },
+  ] },
+]
+const columns: DataTableColumn[] = [
+  { label: '操作', slotName: 'actions', width: 120, fixed: 'left' },
+  { label: '订单号', slotName: 'orderNo', minWidth: 230 },
+  { label: '入仓码', slotName: 'inboundCode', minWidth: 190 },
+  { label: '柜号', slotName: 'containerNo', minWidth: 170 },
+  { label: '实际箱数', prop: 'detail.actualBoxCount', width: 110, align: 'center' },
+  { label: '资料覆盖', slotName: 'coverage', width: 110, align: 'center' },
+  { label: '状态', slotName: 'status', width: 130 },
+]
 const records = ref<Array<{ order: FirstLegOrder; detail: MerchantCustomsContainer }>>([])
 const dialogOpen = ref(false)
 const selectedOrderId = ref('')
 const selectedDetail = ref<MerchantCustomsContainer | null>(null)

 const filteredRecords = computed(() => {
-  const query = keyword.value.trim().toLowerCase()
-  if (!query) return records.value
-  return records.value.filter(({ order, detail }) => [order.orderNo, order.businessSummary.inboundCode, detail.containerNo, detail.cabinetNo].some((value) => String(value ?? '').toLowerCase().includes(query)))
+  const query = appliedQuery.value
+  const matches = (value: string | null | undefined, key: string) => String(value ?? '').toLowerCase().includes(String(query[key] || '').trim().toLowerCase())
+  return records.value.filter(({ order, detail }) =>
+    matches(order.orderNo, 'orderNo')
+    && matches(order.businessSummary.inboundCode, 'inboundCode')
+    && (matches(detail.containerNo, 'containerNo') || matches(detail.cabinetNo, 'containerNo'))
+    && (!query.status || detail.status === query.status),
+  )
 })
+const pagedRecords = computed(() => filteredRecords.value.slice((page.value - 1) * pageSize.value, page.value * pageSize.value))
+const emptyText = computed(() => Object.values(appliedQuery.value).some((value) => String(value || '').trim()) ? '暂无匹配的报关资料，请调整查询条件' : '暂无报关资料')
+
+function search() {
+  appliedQuery.value = { ...queryModel.value }
+  page.value = 1
+}
+watch(pageSize, () => { page.value = 1 })
+watch(() => filteredRecords.value.length, (total) => {
+  page.value = Math.min(page.value, Math.max(1, Math.ceil(total / pageSize.value)))
+})
+function rowActions(row: object): TableAction[] {
+  return [{ key: 'documents', label: '查看资料', disabled: loading.value, run: () => openDetail(row) }]
+}

 function statusLabel(detail: MerchantCustomsContainer) {
  return ({ WAITING_CUSTOMER_DOCUMENTS: '待上传资料', READY_TO_START: '待报关', DECLARING: '报关中', COMPLETED: '报关完成' } as Record<string, string>)[detail.status] ?? detail.status
@@ -29,6 +73,7 @@ function statusType(detail: MerchantCustomsContainer) {
  return detail.status === 'COMPLETED' ? 'success' : detail.status === 'DECLARING' ? 'primary' : 'warning'
 }
 async function load() {
+  if (loading.value) return
  loading.value = true; errorMessage.value = ''
  try {
    await store.load()
@@ -53,26 +98,25 @@ onMounted(() => { void load() })

 <template>
  <div class="customs-page">
-    <section class="customs-hero"><div><span class="eyebrow">CUSTOMS DOCUMENTS</span><h1>报关资料</h1><p>查看装柜后退税订单的资料清单、文件版本与报关行回执。</p></div><el-button :loading="loading" @click="load"><RefreshCcw :size="15" />刷新</el-button></section>
-    <section class="customs-toolbar"><el-input v-model="keyword" clearable placeholder="搜索订单号、入仓码或柜号" /><span>共 {{ filteredRecords.length }} 个资料包</span></section>
+    <QueryToolbar v-model="queryModel" layout="grid" ariaLabel="报关资料查询条件" :fields="queryFields" @search="search" />
    <section class="customs-card">
-      <el-skeleton v-if="loading" :rows="5" animated />
-      <div v-else-if="errorMessage" class="state-error" role="alert"><p>{{ errorMessage }}</p><el-button @click="load">重试</el-button></div>
-      <el-empty v-else-if="!filteredRecords.length" description="暂无待处理的报关资料" />
-      <el-table v-else :data="filteredRecords" row-key="order.id" stripe>
-        <el-table-column label="操作" width="120" fixed="left"><template #default="{ row }"><el-button link type="primary" @click="openDetail(row)"><FileText :size="15" />查看资料</el-button></template></el-table-column>
-        <el-table-column label="订单号" min-width="160"><template #default="{ row }">{{ row.order.orderNo || '—' }}</template></el-table-column>
-        <el-table-column label="入仓码" min-width="150"><template #default="{ row }">{{ row.order.businessSummary.inboundCode || '—' }}</template></el-table-column>
-        <el-table-column label="柜号" min-width="140"><template #default="{ row }">{{ row.detail.containerNo || row.detail.cabinetNo || '—' }}</template></el-table-column>
-        <el-table-column label="实际箱数" width="100" prop="detail.actualBoxCount" />
-        <el-table-column label="资料覆盖" width="110"><template #default="{ row }">{{ row.detail.coveredTaxRefundCount }} / {{ row.detail.taxRefundCount }}</template></el-table-column>
-        <el-table-column label="状态" width="120"><template #default="{ row }"><el-tag :type="statusType(row.detail)">{{ statusLabel(row.detail) }}</el-tag></template></el-table-column>
-      </el-table>
+      <DataTable v-model:page="page" v-model:page-size="pageSize" :data="pagedRecords" :columns="columns" :loading="loading" :total="filteredRecords.length" :page-sizes="[10, 20, 50, 100]" :row-actions="rowActions" row-key="order.id" :empty-text="emptyText">
+        <template #toolbar><strong>资料列表</strong></template>
+        <template #toolbar-actions><el-button :loading="loading" @click="load"><RefreshCcw :size="16" />刷新</el-button></template>
+        <template v-if="errorMessage" #error><div class="state-error" role="alert"><span>{{ errorMessage }}</span><el-button :loading="loading" @click="load">重新加载</el-button></div></template>
+        <template #orderNo="{ row }">{{ row.order.orderNo || '—' }}</template>
+        <template #inboundCode="{ row }">{{ row.order.businessSummary.inboundCode || '—' }}</template>
+        <template #containerNo="{ row }">{{ row.detail.containerNo || row.detail.cabinetNo || '—' }}</template>
+        <template #coverage="{ row }">{{ row.detail.coveredTaxRefundCount }} / {{ row.detail.taxRefundCount }}</template>
+        <template #status="{ row }"><el-tag :type="statusType(row.detail)" effect="light" size="small">{{ statusLabel(row.detail) }}</el-tag></template>
+      </DataTable>
    </section>
    <CustomsDocumentsDialog v-model="dialogOpen" :order-id="selectedOrderId" :can-edit="selectedDetail?.status !== 'COMPLETED'" :initial-detail="selectedDetail" @updated="updateDetail" />
  </div>
 </template>

 <style scoped>
-.customs-page { display:flex; flex-direction:column; gap:16px; }.customs-hero { display:flex; justify-content:space-between; align-items:flex-start; padding:0 2px 4px; }.eyebrow { color:#5b82c9; font-size:11px; font-weight:750; letter-spacing:.14em; }.customs-hero h1 { margin:6px 0 5px; color:#1f2f46; font-size:26px; line-height:1.25; letter-spacing:-.025em; }.customs-hero p { margin:0; color:#7d8da2; font-size:13px; }.customs-hero .el-button { margin-top:3px; border-color:#d9e3ef; border-radius:9px; background:#fff; color:#61738b; box-shadow:0 3px 8px rgba(26,55,91,.04); }.customs-toolbar { display:flex; min-height:82px; align-items:center; gap:16px; padding:16px 18px; border:1px solid #dce4ef; border-radius:16px; background:#fff; box-shadow:0 5px 16px rgba(31,56,88,.045); }.customs-toolbar .el-input { width:min(520px, 100%); }.customs-toolbar :deep(.el-input__wrapper) { min-height:42px; border-radius:10px; box-shadow:0 0 0 1px #d9e3ef inset; }.customs-toolbar span { color:#7d8da2; font-size:12px; }.customs-card { min-height:320px; padding:4px; overflow:hidden; border:1px solid #dce4ef; border-radius:16px; background:#fff; box-shadow:0 5px 16px rgba(31,56,88,.045); }.customs-card :deep(.el-table) { --el-table-header-bg-color:#f4f7fb; --el-table-row-hover-bg-color:#eaf2ff; --el-table-border-color:#edf1f6; color:#53647a; }.customs-card :deep(.el-table th.el-table__cell) { padding:13px 16px; color:#607089; font-size:12px; font-weight:750; }.customs-card :deep(.el-table td.el-table__cell) { height:58px; padding:13px 16px; font-size:13px; }.customs-card :deep(.el-table__row:nth-child(even)) { background:#f8fbff; }.state-error { display:flex; min-height:260px; flex-direction:column; align-items:center; justify-content:center; gap:10px; color:#b42318; }.state-error p { margin:0; }
+.customs-page { display: grid; gap: var(--client-section-gap); }
+.customs-card { overflow: hidden; border: 1px solid var(--client-border); border-radius: var(--client-radius); background: #fff; }
+.state-error { display: flex; min-height: 84px; align-items: center; justify-content: center; gap: 12px; padding: 14px; color: #b42318; }
 </style>
@@ -705,7 +705,9 @@ test('supports the frozen customs document workflow and customer-safe downloads'
  assert.match(customsApiSource, /MAX_CUSTOMS_FILE_SIZE = 50 \* 1024 \* 1024/)
  assert.match(customsApiSource, /data: \{ inboundIds, expectedVersion: document\.source\.version \}/)
  assert.match(customsApiSource, /requestId: error\.requestId/)
-  assert.match(customsDialogSource, /报关开始后仅可查看和下载，不提供退回或解锁/)
+  assert.match(customsDialogSource, /客户原始资料已冻结，仍可确认或打回待确认的报关行回执/)
+  assert.match(customsDialogSource, /v-if="detail.status === 'COMPLETED'"[^>]*><strong>报关已完成/)
+  assert.match(customsDialogSource, /真实报关完税文件已齐全/)
  assert.match(customsDialogSource, /item\.finalDocument/)
  assert.match(customsDialogSource, /资料版本历史/)
  assert.match(customsDialogSource, /尚未上传退税报关资料/)
@@ -70,7 +70,7 @@ async function placeOrder(channelCode: string, channelName: string) {
    },
  })
 }
-watch(originWarehouseId, () => { void loadChannels() }); onMounted(() => { void loadBase() })
+watch(originWarehouseId, (value, previous) => { if (!value || previous === '') return; void loadChannels() }); onMounted(() => { void loadBase() })
 </script>

 <template>
@@ -1,6 +1,8 @@
 import assert from 'node:assert/strict'
 import { readFileSync } from 'node:fs'
 import test from 'node:test'
+import { runInNewContext } from 'node:vm'
+import ts from 'typescript'

 const firstLeg = readFileSync(new URL('./FirstLegOrdersView.vue', import.meta.url), 'utf8')
 const quickOrder = readFileSync(new URL('./QuickOrderView.vue', import.meta.url), 'utf8')
@@ -18,7 +20,22 @@ test('uses business identifiers and names without visible internal-ID fallbacks'
  assert.doesNotMatch(quickOrder, />\{\{ result\.orderNo/)
  assert.doesNotMatch(customs, /detail\.planNo \|\| detail\.loadingPlanId/)
  assert.doesNotMatch(overseas, /overseasWarehouseName \|\| (?:item|candidate)\.overseasWarehouseId/)
-  assert.doesNotMatch(overseas, /row\(\[[^\]]*(?:item\.overseasWarehouseId|item\.operatingWarehouseId)/)
+  // Warehouse IDs may be inputs to a resolver, but must never be raw cells.
+  assert.doesNotMatch(overseas, /row\(\[[^\]]*[,[]\s*item\.(?:overseasWarehouseId|operatingWarehouseId)\s*[,\]]/)
+})
+
+test('warehouse labels never fall back to unknown internal IDs', () => {
+  const source = overseas.slice(overseas.indexOf('function warehouseDisplay('), overseas.indexOf('function statusLabel('))
+  const javascript = ts.transpileModule(source, { compilerOptions: { target: ts.ScriptTarget.ES2022 } }).outputText
+  const display = runInNewContext(`${javascript}; warehouseDisplay`, {
+    operationWarehouses: { value: [{ id: '1234567890123456789', warehouseCode: 'LAX', warehouseName: '洛杉矶仓' }] },
+    fbaWarehouses: { value: [] }, warehouseLabel: (warehouse) => warehouse.warehouseName,
+  })
+  assert.equal(display('1234567890123456789'), '洛杉矶仓')
+  assert.equal(display('LAX'), '洛杉矶仓')
+  assert.equal(display('9999999999999999999'), '—')
+  assert.equal(display('1234567890123456789,9999999999999999999'), '洛杉矶仓、—')
+  assert.equal(display(undefined), '—')
 })

 test('keeps internal IDs only as non-rendered routing, selection, and request values', () => {
@@ -1,4 +1,4 @@
-import { overseasApiRequest } from '@/api/overseasHttp'
+import { apiRequest } from '@/api/http'

 export interface PageResult<T> {
  records: T[]
@@ -133,7 +133,7 @@ export interface DeliveryTransferPayload {
 }

 export function listDeliveryOrders(params: DeliveryQuery) {
-  return overseasApiRequest<PageResult<DeliveryRow>>({
+  return apiRequest<PageResult<DeliveryRow>>({
    method: 'GET',
    url: '/merchant/v1/last-leg/delivery-orders',
    params,
@@ -141,7 +141,7 @@ export function listDeliveryOrders(params: DeliveryQuery) {
 }

 export function getDeliveryOrder(deliveryNo: string) {
-  return overseasApiRequest<DeliveryOrderDetailResponse>({
+  return apiRequest<DeliveryOrderDetailResponse>({
    method: 'GET',
    url: `/merchant/v1/last-leg/delivery-orders/${encodeURIComponent(deliveryNo)}`,
    params: { page: 1, size: 200 },
@@ -154,7 +154,7 @@ export function getDeliveryOrder(deliveryNo: string) {

 export function createDeliveryOrder(payload: DeliveryTransferPayload) {
  const { dispatchNo, ...request } = payload
-  return overseasApiRequest<DeliveryTransferResult>({
+  return apiRequest<DeliveryTransferResult>({
    method: 'POST',
    url: '/merchant/v1/last-leg/delivery-orders',
    params: { dispatchNo },
@@ -1,4 +1,4 @@
-import { overseasApiRequest } from '@/api/overseasHttp'
+import { apiRequest } from '@/api/http'

 export interface PageResult<T> { records: T[]; page: number; size: number; total: number; pages: number }
 export interface InboundPlanQuery {
@@ -66,10 +66,10 @@ export interface InboundPlanDetail {
 }

 export async function listInboundPlans(params: InboundPlanQuery) {
-  const result = await overseasApiRequest<PageResult<InboundPlanSummary>>({ method: 'GET', url: '/merchant/v1/last-leg/inbound-plans', params })
+  const result = await apiRequest<PageResult<InboundPlanSummary>>({ method: 'GET', url: '/merchant/v1/last-leg/inbound-plans', params })
  return { ...result, page: Number(result.page), size: Number(result.size), total: Number(result.total), pages: Number(result.pages) }
 }

 export function getInboundPlan(planNo: string) {
-  return overseasApiRequest<InboundPlanDetail>({ method: 'GET', url: `/merchant/v1/last-leg/inbound-plans/${encodeURIComponent(planNo)}` })
+  return apiRequest<InboundPlanDetail>({ method: 'GET', url: `/merchant/v1/last-leg/inbound-plans/${encodeURIComponent(planNo)}` })
 }
@@ -24,9 +24,9 @@ test('uses only authenticated merchant delivery endpoints without customer scope
  assert.match(apiSource, /method: 'POST'[\s\S]*url: '\/merchant\/v1\/last-leg\/delivery-orders'/)
  assert.match(apiSource, /const \{ dispatchNo, \.\.\.request \} = payload/)
  assert.match(apiSource, /params: \{ dispatchNo \}/)
-  assert.match(apiSource, /overseasApiRequest<DeliveryOrderDetailResponse>/)
+  assert.match(apiSource, /apiRequest<DeliveryOrderDetailResponse>/)
  assert.match(apiSource, /\.then\(\(\{ order, skus, fees \}\) => \(\{[\s\S]*\.\.\.order,[\s\S]*fees,[\s\S]*items: skus/)
-  assert.match(apiSource, /overseasApiRequest<DeliveryTransferResult>/)
+  assert.match(apiSource, /apiRequest<DeliveryTransferResult>/)
  assert.doesNotMatch(apiSource, /customerId|tenantId|Record<string, unknown>|mock|fallback/i)
 })

@@ -6,7 +6,7 @@ import { overseasWarehouseLabel } from './inboundPlanDisplay.ts'
 const api = readFileSync(new URL('./api/inboundPlans.ts', import.meta.url), 'utf8')
 const routes = readFileSync(new URL('./routes.ts', import.meta.url), 'utf8')
 const view = readFileSync(new URL('./views/InboundOrdersView.vue', import.meta.url), 'utf8')
-const overseasHttp = readFileSync(new URL('../../api/overseasHttp.ts', import.meta.url), 'utf8')
+const overseasHttp = readFileSync(new URL('../../api/http.ts', import.meta.url), 'utf8')

 test('activates the customer-scoped overseas inbound list and detail', () => {
  assert.match(routes, /path: 'orders\/inbound'[\s\S]*?release: 'active'[\s\S]*?permission: 'merchant:warehouse:inbound:list'/)
@@ -48,9 +48,9 @@ test('renders a dash when either formal receiving warehouse field is absent', ()
 })

 test('preserves overseas API diagnostic metadata without rendering it as a business identifier', () => {
-  assert.match(overseasHttp, /response\.data\.traceId/)
-  assert.match(overseasHttp, /response\.data\.requestId/)
-  assert.match(overseasHttp, /body\.traceId, body\.requestId/)
+  assert.match(overseasHttp, /envelope\.traceId/)
+  assert.match(overseasHttp, /envelope\.requestId/)
+  assert.match(overseasHttp, /body\.traceId/)
  assert.doesNotMatch(view, /requestId|traceId/)
 })

@@ -1,4 +1,4 @@
-import { overseasApiRequest } from '@/api/overseasHttp'
+import { apiRequest } from '@/api/http'
 import type { PageResult } from './warehouseServices'

 export interface ReturnInventoryItem {
@@ -19,7 +19,7 @@ export interface ReturnInventoryCartonSummary {
 }

 export function listReturnInventoryCartons(params: Record<string, unknown>) {
-  return overseasApiRequest<PageResult<ReturnInventoryCartonSummary>>({ method: 'GET', url: '/merchant/v1/last-leg/return-inventory/cartons', params })
+  return apiRequest<PageResult<ReturnInventoryCartonSummary>>({ method: 'GET', url: '/merchant/v1/last-leg/return-inventory/cartons', params })
 }

 export interface ReturnInventoryCartonDetail {
@@ -33,19 +33,19 @@ export interface ReturnInventoryLabel {
 }

 export function listReturnInventory(params: Record<string, unknown>) {
-  return overseasApiRequest<PageResult<ReturnInventoryItem>>({ method: 'GET', url: '/merchant/v1/last-leg/return-inventory', params })
+  return apiRequest<PageResult<ReturnInventoryItem>>({ method: 'GET', url: '/merchant/v1/last-leg/return-inventory', params })
 }

 export function listReturnInventorySummary(params: Record<string, unknown>) {
-  return overseasApiRequest<PageResult<ReturnInventorySummaryItem>>({ method: 'GET', url: '/merchant/v1/last-leg/return-inventory/summary', params })
+  return apiRequest<PageResult<ReturnInventorySummaryItem>>({ method: 'GET', url: '/merchant/v1/last-leg/return-inventory/summary', params })
 }

 export function getReturnInventoryCarton(cartonMark: string) {
-  return overseasApiRequest<ReturnInventoryCartonDetail>({ method: 'GET', url: `/merchant/v1/last-leg/return-inventory/cartons/${encodeURIComponent(cartonMark)}` })
+  return apiRequest<ReturnInventoryCartonDetail>({ method: 'GET', url: `/merchant/v1/last-leg/return-inventory/cartons/${encodeURIComponent(cartonMark)}` })
 }

 export function getReturnInventoryLabel(cartonMark: string) {
-  return overseasApiRequest<ReturnInventoryLabel>({ method: 'GET', url: `/merchant/v1/last-leg/return-inventory/cartons/${encodeURIComponent(cartonMark)}/label` })
+  return apiRequest<ReturnInventoryLabel>({ method: 'GET', url: `/merchant/v1/last-leg/return-inventory/cartons/${encodeURIComponent(cartonMark)}/label` })
 }

 export interface ReturnPackingPreview {
@@ -55,14 +55,14 @@ export interface ReturnPackingPreview {
 }

 export function getReturnPackingPreview(returnNo?: string) {
-  return overseasApiRequest<ReturnPackingPreview>({ method: 'GET', url: '/pda/v1/last-leg/return-inventory/packing/orders', params: { returnNo: returnNo || undefined } })
+  return apiRequest<ReturnPackingPreview>({ method: 'GET', url: '/pda/v1/last-leg/return-inventory/packing/orders', params: { returnNo: returnNo || undefined } })
 }

 export function mergeReturnInventory(payload: {
  returnNos: string[]; items: Array<{ skuCode: string; quantity: number }>
  length: number; width: number; height: number; weight: number; idempotencyKey: string
 }) {
-  return overseasApiRequest<{ cartonMark: string; skuCode: string; totalQuantity: number; label: ReturnInventoryLabel }>({
+  return apiRequest<{ cartonMark: string; skuCode: string; totalQuantity: number; label: ReturnInventoryLabel }>({
    method: 'POST', url: '/pda/v1/last-leg/return-inventory/cartons/merge', data: payload,
  })
 }
@@ -1,4 +1,4 @@
-import { overseasApiRequest, overseasBlobRequest } from '@/api/overseasHttp'
+import { apiRequest, apiBlobRequest } from '@/api/http'
 import type { PageResult } from './warehouseServices'

 export interface ReturnOrderSummary {
@@ -24,16 +24,16 @@ export interface ReturnOrderCreate {
 }

 export function listReturnOrders(params: Record<string, unknown>) {
-  return overseasApiRequest<PageResult<ReturnOrderSummary>>({ method: 'GET', url: '/merchant/v1/last-leg/return-orders', params })
+  return apiRequest<PageResult<ReturnOrderSummary>>({ method: 'GET', url: '/merchant/v1/last-leg/return-orders', params })
 }
 export function getReturnOrder(returnNo: string) {
-  return overseasApiRequest<ReturnOrderDetail>({ method: 'GET', url: `/merchant/v1/last-leg/return-orders/${encodeURIComponent(returnNo)}` })
+  return apiRequest<ReturnOrderDetail>({ method: 'GET', url: `/merchant/v1/last-leg/return-orders/${encodeURIComponent(returnNo)}` })
 }
 export function createReturnOrder(payload: ReturnOrderCreate) {
-  return overseasApiRequest<ReturnOrderDetail>({ method: 'POST', url: '/merchant/v1/last-leg/return-orders', data: payload })
+  return apiRequest<ReturnOrderDetail>({ method: 'POST', url: '/merchant/v1/last-leg/return-orders', data: payload })
 }
 export function updateReturnOrder(returnNo: string, payload: ReturnOrderCreate) {
-  return overseasApiRequest<ReturnOrderDetail>({ method: 'PUT', url: `/merchant/v1/last-leg/return-orders/${encodeURIComponent(returnNo)}`, data: payload })
+  return apiRequest<ReturnOrderDetail>({ method: 'PUT', url: `/merchant/v1/last-leg/return-orders/${encodeURIComponent(returnNo)}`, data: payload })
 }
 export interface ReturnRelabelCreate {
  fileScope: 'CARTON_TOTAL' | 'SKU_TOTAL'; destinationFbaWarehouseId: string; destinationFbaWarehouseCode: string; cartonRemark?: string; idempotencyKey: string
@@ -41,12 +41,12 @@ export interface ReturnRelabelCreate {
 }
 export interface ReturnRelabelCreated { relabelNo: string; relabelApplicationId: string; returnNo: string; skuCodes: string[]; status: string }
 export function createReturnRelabel(returnNo: string, payload: ReturnRelabelCreate) {
-  return overseasApiRequest<ReturnRelabelCreated>({ method: 'POST', url: `/merchant/v1/last-leg/return-orders/${encodeURIComponent(returnNo)}/relabel`, data: payload })
+  return apiRequest<ReturnRelabelCreated>({ method: 'POST', url: `/merchant/v1/last-leg/return-orders/${encodeURIComponent(returnNo)}/relabel`, data: payload })
 }
 export function uploadReturnRelabelFile(relabelNo: string, scope: 'CARTON_TOTAL' | 'SKU_TOTAL', file: File) {
  const data = new FormData(); data.append('file', file)
-  return overseasApiRequest<unknown>({ method: 'POST', url: `/merchant/v1/last-leg/relabel-applications/${encodeURIComponent(relabelNo)}/files`, params: { scope }, data, headers: { 'Content-Type': 'multipart/form-data' } })
+  return apiRequest<unknown>({ method: 'POST', url: `/merchant/v1/last-leg/relabel-applications/${encodeURIComponent(relabelNo)}/files`, params: { scope }, data, headers: { 'Content-Type': 'multipart/form-data' } })
 }
 export function downloadReturnPhoto(returnNo: string, fileId: string | number) {
-  return overseasBlobRequest({ method: 'GET', url: `/merchant/v1/last-leg/return-orders/${encodeURIComponent(returnNo)}/photos/files/${encodeURIComponent(String(fileId))}/download` })
+  return apiBlobRequest({ method: 'GET', url: `/merchant/v1/last-leg/return-orders/${encodeURIComponent(returnNo)}/photos/files/${encodeURIComponent(String(fileId))}/download` })
 }
@@ -1,4 +1,4 @@
-import { overseasApiRequest, overseasBlobRequest } from '@/api/overseasHttp'
+import { apiRequest, apiBlobRequest } from '@/api/http'
 import { createIdempotencyKey } from '@/utils/idempotencyKey'

 export type RelabelDeliveryMethod = 'TRUCK' | 'EXPRESS' | 'TRUCK_PICKUP' | 'EXPRESS_PICKUP'
@@ -55,78 +55,78 @@ export interface RelabelCreate {
 }

 export function listRelabelHistoricalOrders(operationWarehouseId: string, keyword?: string) {
-  return overseasApiRequest<HistoricalOrderSummary[]>({ method: 'GET', url: '/merchant/v1/last-leg/relabel-applications/historical-orders', params: { operationWarehouseId, keyword: keyword || undefined } })
+  return apiRequest<HistoricalOrderSummary[]>({ method: 'GET', url: '/merchant/v1/last-leg/relabel-applications/historical-orders', params: { operationWarehouseId, keyword: keyword || undefined } })
 }
 export function listTransfers(params: Record<string, unknown>) {
-  return overseasApiRequest<PageResult<TransferSummary>>({ method: 'GET', url: '/merchant/v1/last-leg/warehouse-transfers', params })
+  return apiRequest<PageResult<TransferSummary>>({ method: 'GET', url: '/merchant/v1/last-leg/warehouse-transfers', params })
 }
 export function getTransfer(transferNo: string) {
-  return overseasApiRequest<Record<string, unknown>>({ method: 'GET', url: `/merchant/v1/last-leg/warehouse-transfers/${encodeURIComponent(transferNo)}` })
+  return apiRequest<Record<string, unknown>>({ method: 'GET', url: `/merchant/v1/last-leg/warehouse-transfers/${encodeURIComponent(transferNo)}` })
 }
 export function createTransfer(payload: TransferCreate) {
-  return overseasApiRequest<Record<string, unknown>>({ method: 'POST', url: '/merchant/v1/last-leg/warehouse-transfers', data: payload })
+  return apiRequest<Record<string, unknown>>({ method: 'POST', url: '/merchant/v1/last-leg/warehouse-transfers', data: payload })
 }
 export function updateTransfer(transferNo: string, payload: TransferCreate) {
-  return overseasApiRequest<Record<string, unknown>>({ method: 'POST', url: `/merchant/v1/last-leg/warehouse-transfers/${encodeURIComponent(transferNo)}/save-draft`, data: payload })
+  return apiRequest<Record<string, unknown>>({ method: 'POST', url: `/merchant/v1/last-leg/warehouse-transfers/${encodeURIComponent(transferNo)}/save-draft`, data: payload })
 }
 export function submitTransfer(transferNo: string) {
-  return overseasApiRequest<Record<string, unknown>>({ method: 'POST', url: `/merchant/v1/last-leg/warehouse-transfers/${encodeURIComponent(transferNo)}/submit` })
+  return apiRequest<Record<string, unknown>>({ method: 'POST', url: `/merchant/v1/last-leg/warehouse-transfers/${encodeURIComponent(transferNo)}/submit` })
 }
 export function listRelabels(params: Record<string, unknown>) {
-  return overseasApiRequest<PageResult<RelabelSummary>>({ method: 'GET', url: '/merchant/v1/last-leg/relabel-applications', params })
+  return apiRequest<PageResult<RelabelSummary>>({ method: 'GET', url: '/merchant/v1/last-leg/relabel-applications', params })
 }
 export function getRelabel(relabelNo: string) {
-  return overseasApiRequest<RelabelDetail>({ method: 'GET', url: `/merchant/v1/last-leg/relabel-applications/${encodeURIComponent(relabelNo)}` })
+  return apiRequest<RelabelDetail>({ method: 'GET', url: `/merchant/v1/last-leg/relabel-applications/${encodeURIComponent(relabelNo)}` })
 }
 export function confirmTransferMeasurement(transferNo: string, remark?: string) {
-  return overseasApiRequest<Record<string, unknown>>({ method: 'POST', url: `/merchant/v1/last-leg/warehouse-transfers/${encodeURIComponent(transferNo)}/confirm-measurement`, data: { idempotencyKey: createIdempotencyKey(), remark } })
+  return apiRequest<Record<string, unknown>>({ method: 'POST', url: `/merchant/v1/last-leg/warehouse-transfers/${encodeURIComponent(transferNo)}/confirm-measurement`, data: { idempotencyKey: createIdempotencyKey(), remark } })
 }
 export interface TransferCartonLabel { transferNo: string; cartons: Array<{ cartonMark: string; customerCartonMark?: string; cartonIndex: number; totalCartons: number; status: string }>; printableHtml: string }
 export function getTransferCartonLabel(transferNo: string) {
-  return overseasApiRequest<TransferCartonLabel>({ method: 'GET', url: `/merchant/v1/last-leg/warehouse-transfers/${encodeURIComponent(transferNo)}/carton-label` })
+  return apiRequest<TransferCartonLabel>({ method: 'GET', url: `/merchant/v1/last-leg/warehouse-transfers/${encodeURIComponent(transferNo)}/carton-label` })
 }
 export function downloadTransferMeasurementPhoto(transferNo: string, fileId: string | number) {
-  return overseasBlobRequest({ method: 'GET', url: `/merchant/v1/last-leg/warehouse-transfers/${encodeURIComponent(transferNo)}/measurement-photos/files/${encodeURIComponent(fileId)}/download` })
+  return apiBlobRequest({ method: 'GET', url: `/merchant/v1/last-leg/warehouse-transfers/${encodeURIComponent(transferNo)}/measurement-photos/files/${encodeURIComponent(fileId)}/download` })
 }

 export function listRelabelInventoryCandidates(operationWarehouseId: string, inboundCode?: string) {
-  return overseasApiRequest<RelabelInventoryCandidate[]>({
+  return apiRequest<RelabelInventoryCandidate[]>({
    method: 'GET', url: '/merchant/v1/last-leg/relabel-applications/inventory-candidates',
    params: { operationWarehouseId, inboundCode: inboundCode || undefined },
  })
 }
 export function createRelabel(payload: RelabelCreate) {
-  return overseasApiRequest<RelabelDetail>({ method: 'POST', url: '/merchant/v1/last-leg/relabel-applications', data: payload })
+  return apiRequest<RelabelDetail>({ method: 'POST', url: '/merchant/v1/last-leg/relabel-applications', data: payload })
 }
 export function resubmitRelabel(relabelNo: string, payload: { labelDeadline: string; contactName: string; contactPhone: string; remark?: string; idempotencyKey: string }) {
-  return overseasApiRequest<RelabelDetail>({ method: 'PUT', url: `/merchant/v1/last-leg/relabel-applications/${encodeURIComponent(relabelNo)}/resubmit`, data: payload })
+  return apiRequest<RelabelDetail>({ method: 'PUT', url: `/merchant/v1/last-leg/relabel-applications/${encodeURIComponent(relabelNo)}/resubmit`, data: payload })
 }
 export function uploadRelabelShippingLabel(relabelNo: string, file: File) {
  const data = new FormData(); data.append('file', file)
-  return overseasApiRequest<RelabelDetail>({ method: 'POST', url: `/merchant/v1/last-leg/relabel-applications/${encodeURIComponent(relabelNo)}/shipping-label`, data, headers: { 'Content-Type': 'multipart/form-data' } })
+  return apiRequest<RelabelDetail>({ method: 'POST', url: `/merchant/v1/last-leg/relabel-applications/${encodeURIComponent(relabelNo)}/shipping-label`, data, headers: { 'Content-Type': 'multipart/form-data' } })
 }
 export function uploadRelabelFile(relabelNo: string, scope: 'CARTON_TOTAL' | 'SKU_TOTAL' | 'ITEM', file: File, itemId?: string) {
  const data = new FormData(); data.append('file', file)
-  return overseasApiRequest<RelabelDetail>({ method: 'POST', url: `/merchant/v1/last-leg/relabel-applications/${encodeURIComponent(relabelNo)}/files`, params: { scope, itemId }, data, headers: { 'Content-Type': 'multipart/form-data' } })
+  return apiRequest<RelabelDetail>({ method: 'POST', url: `/merchant/v1/last-leg/relabel-applications/${encodeURIComponent(relabelNo)}/files`, params: { scope, itemId }, data, headers: { 'Content-Type': 'multipart/form-data' } })
 }
 export function confirmRelabelCompletion(relabelNo: string, remark?: string) {
-  return overseasApiRequest<RelabelDetail>({ method: 'POST', url: `/merchant/v1/last-leg/relabel-applications/${encodeURIComponent(relabelNo)}/confirm-completion`, data: { idempotencyKey: createIdempotencyKey(), remark } })
+  return apiRequest<RelabelDetail>({ method: 'POST', url: `/merchant/v1/last-leg/relabel-applications/${encodeURIComponent(relabelNo)}/confirm-completion`, data: { idempotencyKey: createIdempotencyKey(), remark } })
 }
 export function downloadRelabelCompletionPhoto(relabelNo: string, fileId: string) {
-  return overseasBlobRequest({ method: 'GET', url: `/merchant/v1/last-leg/relabel-applications/${encodeURIComponent(relabelNo)}/completion-photos/${encodeURIComponent(fileId)}/download` })
+  return apiBlobRequest({ method: 'GET', url: `/merchant/v1/last-leg/relabel-applications/${encodeURIComponent(relabelNo)}/completion-photos/${encodeURIComponent(fileId)}/download` })
 }
 export function listDiscards(params: Record<string, unknown>) {
-  return overseasApiRequest<PageResult<DiscardSummary>>({ method: 'GET', url: '/merchant/v1/last-leg/cargo-discards', params })
+  return apiRequest<PageResult<DiscardSummary>>({ method: 'GET', url: '/merchant/v1/last-leg/cargo-discards', params })
 }
 export function getDiscard(discardNo: string) {
-  return overseasApiRequest<Record<string, unknown>>({ method: 'GET', url: `/merchant/v1/last-leg/cargo-discards/${encodeURIComponent(discardNo)}` })
+  return apiRequest<Record<string, unknown>>({ method: 'GET', url: `/merchant/v1/last-leg/cargo-discards/${encodeURIComponent(discardNo)}` })
 }
 export function listDiscardCandidates(inboundCode?: string) {
-  return overseasApiRequest<DiscardCandidate[]>({ method: 'GET', url: '/merchant/v1/last-leg/cargo-discards/inventory-candidates', params: { inboundCode: inboundCode || undefined } })
+  return apiRequest<DiscardCandidate[]>({ method: 'GET', url: '/merchant/v1/last-leg/cargo-discards/inventory-candidates', params: { inboundCode: inboundCode || undefined } })
 }
 export function createDiscard(payload: { items: Array<{ orderId?: string; returnCartonId?: string; skuCode: string; discardPackages: number }>; idempotencyKey: string; remark?: string }) {
-  return overseasApiRequest<Record<string, unknown>>({ method: 'POST', url: '/merchant/v1/last-leg/cargo-discards', data: payload })
+  return apiRequest<Record<string, unknown>>({ method: 'POST', url: '/merchant/v1/last-leg/cargo-discards', data: payload })
 }
 export function cancelDiscard(discardNo: string) {
-  return overseasApiRequest<Record<string, unknown>>({ method: 'POST', url: `/merchant/v1/last-leg/cargo-discards/${encodeURIComponent(discardNo)}/cancel` })
+  return apiRequest<Record<string, unknown>>({ method: 'POST', url: `/merchant/v1/last-leg/cargo-discards/${encodeURIComponent(discardNo)}/cancel` })
 }
@@ -7,7 +7,7 @@ const api = readFileSync(new URL('../api/returnOrders.ts', import.meta.url), 'ut

 test('退货签收照片通过客户鉴权下载接口加载并释放对象 URL', () => {
  assert.match(api, /\/return-orders\/\$\{encodeURIComponent\(returnNo\)\}\/photos\/files\/\$\{encodeURIComponent\(String\(fileId\)\)\}\/download/)
-  assert.match(api, /overseasBlobRequest/)
+  assert.match(api, /apiBlobRequest/)
  assert.match(view, /URL\.createObjectURL\(await downloadReturnPhoto\(detailReturnNo\.value, photo\.fileId\)\)/)
  assert.match(view, /URL\.revokeObjectURL\(url\)/)
  assert.match(view, /onBeforeUnmount\(clearPhotoUrls\)/)
@@ -76,7 +76,7 @@ test('退货签收详情使用独立路由和紧凑连续页面', () => {

 test('待审核退货可编辑，完成入库后从独立新增页发起贴标', () => {
  assert.match(view, /row\.status === 'PENDING_REVIEW'.*key: 'edit'/)
-  assert.match(view, /await updateReturnOrder\(editingReturnNo\.value, payload\)/)
+  assert.match(view, /await \(editingReturnNo\.value \? updateReturnOrder\(editingReturnNo\.value, payload\) : createReturnOrder\(payload\)\)/)
  assert.match(view, /order\.status === 'COMPLETED' && order\.needRelabel === true/)
  assert.match(view, /name: 'overseas-labeling-create'/)
  assert.match(view, /query: \{ returnNo: order\.returnNo, warehouseId: String\(order\.overseasWarehouseId\) \}/)
@@ -810,7 +810,7 @@ function warehouseDisplay(value?: string) {
  if (!value) return '—'
  return value.split(',').map((code) => {
    const warehouse = [...operationWarehouses.value, ...fbaWarehouses.value].find((item) => String(item.id) === code || item.warehouseCode === code)
-    return warehouse ? warehouseLabel(warehouse) : code
+    return warehouse ? warehouseLabel(warehouse) : '—'
  }).join('、')
 }
 function statusLabel(value: string) {
@@ -213,7 +213,7 @@ test('客户可在换标列表或详情确认完工且照片使用二进制下
  assert.match(view, /confirmRelabelFromList\(item\['0'\]\)/)
  assert.match(view, /selectedRelabelDetail\?\.application\.status === 'CUSTOMER_CONFIRM_PENDING'/)
  assert.match(view, /@click="confirmSelectedRelabel">确认换标完成/)
-  assert.match(api, /overseasBlobRequest/)
+  assert.match(api, /apiBlobRequest/)
 })

 test('客户详情进入页面后直接回显完工照片并支持大图预览', () => {