chore: 合并前端修复并调整 Docker 镜像源

2026-05-21 12:26:45 +08:00
parent 5474d77799
commit e3518c791f
27 changed files with 54 additions and 72 deletions
@@ -1,8 +1,8 @@
-import { computed, ref, type Ref, type ComputedRef } from 'vue'
+import { computed, ref, type ComputedRef } from 'vue'

 import { POLL_INTERVAL_MS, POLL_FAILURE_LIMIT } from './sessionConstants'

-export interface UseSessionPollingOptions<T> {
+export interface UseSessionPollingOptions {
  /** Whether there is an active session – used as a guard inside the poll loop. */
  hasSession: ComputedRef<boolean>
  /** Called on each poll tick (typically refreshSessionSummary). */
@@ -13,7 +13,7 @@ export interface UseSessionPollingOptions<T> {
  pollWarningPrefix: string
 }

-export function useSessionPolling(options: UseSessionPollingOptions<unknown>) {
+export function useSessionPolling(options: UseSessionPollingOptions) {
  const { hasSession, onPollTick, pollWarningPrefix } = options

  const pollWarningMessage = ref('')
@@ -102,7 +102,7 @@ export interface UseSessionPresentationOptions {
 }

 export function useSessionRoleFacts(options: UseSessionPresentationOptions) {
-  const { activityInfo, statusLabel, roleFactDefaults } = options
+  const { activityInfo, roleFactDefaults } = options

  const roleFacts = computed<FactItem[]>(() => [
    {
@@ -168,17 +168,17 @@ export function useSessionResultFacts(options: UseSessionResultFactsOptions) {
 // ---------------------------------------------------------------------------

 export function buildRedeemBlockedReason(options: {
-  detail: ComputedRef<unknown | null>
-  hasSession: ComputedRef<boolean>
-  loginTypeLabel: ComputedRef<string>
-  redeemLoading: ComputedRef<boolean>
-  roleReady: ComputedRef<boolean>
-  roleConfirmed: ComputedRef<boolean>
-  sessionNotice: ComputedRef<string>
+  detail: Ref<unknown | null>
+  hasSession: Ref<boolean>
+  loginTypeLabel: Ref<string>
+  redeemLoading: Ref<boolean>
+  roleReady: Ref<boolean>
+  roleConfirmed: Ref<boolean>
+  sessionNotice: Ref<string>
  context: 'claim' | 'admin'
  /** Claim-specific fields */
-  tokenStatus?: ComputedRef<string>
-  requiresSupportReview?: ComputedRef<boolean>
+  tokenStatus?: Ref<string>
+  requiresSupportReview?: Ref<boolean>
 }): string {
  const {
    detail,
@@ -1,4 +1,4 @@
-import { computed, ref, watch, type Ref, type ComputedRef } from 'vue'
+import { computed, ref, watch, type ComputedRef } from 'vue'

 /**
 * Shared QR code display logic: renders the base64 QR image, tracks its
@@ -22,7 +22,6 @@ import { notifyTencentActionError } from './tencent/session-errors'
 import {
  useSessionPolling,
  useSessionQrDisplay,
-  useSessionRoleFacts,
  useSessionResultFacts,
  buildRedeemBlockedReason,
  resolveTaskStatusLabel,
@@ -92,7 +91,7 @@ export function useAdminManualRedeemPage() {
  } = useSessionPolling({
    hasSession: computed(() => Boolean(task.value?.taskId && hasSession.value)),
    shouldKeepPolling: computed(() => shouldKeepPolling(detail.value)),
-    onPollTick: () => refreshSessionSummary({ silent: true }),
+    onPollTick: async () => { await refreshSessionSummary({ silent: true }) },
    pollWarningPrefix: '人工兑换状态刷新失败',
  })

@@ -122,11 +121,6 @@ export function useAdminManualRedeemPage() {
    () => `请让客户使用${loginTypeLabel.value}扫码，并在手机上确认登录`,
  )

-  const { roleFacts } = useSessionRoleFacts({
-    activityInfo,
-    statusLabel,
-    roleFactDefaults: { nickname: '等待客户登录' },
-  })

  const proofValue = computed(() => manualRequest.value?.proofValue || order.value?.platformOrderId || '-')

@@ -230,9 +224,6 @@ export function useAdminManualRedeemPage() {
  })

  // ── Helpers ────────────────────────────────────────────────────────
-  function applyLoginTypeFromDetail(nextDetail: AdminManualRedeemDetail) {
-    loginType.value = syncLoginTypeFromDetail(nextDetail, loginType.value)
-  }

  function restartPollingIfNeeded(nextDetail = detail.value) {
    resetPolling()
@@ -17,7 +17,6 @@ import { notifyTencentActionError } from './tencent/session-errors'
 import {
  useSessionPolling,
  useSessionQrDisplay,
-  useSessionRoleFacts,
  useSessionResultFacts,
  buildRedeemBlockedReason,
  resolveTaskStatusLabel,
@@ -59,7 +58,7 @@ export function useClaimPage(token: string) {
  } = useSessionPolling({
    hasSession,
    shouldKeepPolling: computed(() => shouldKeepPolling(detail.value)),
-    onPollTick: () => refreshSessionSummary({ silent: true }),
+    onPollTick: async () => { await refreshSessionSummary({ silent: true }) },
    pollWarningPrefix: '领取状态刷新失败',
  })

@@ -88,11 +87,6 @@ export function useClaimPage(token: string) {
    () => `请使用${loginTypeLabel.value}扫描二维码，并在手机上确认登录`,
  )

-  const { roleFacts } = useSessionRoleFacts({
-    activityInfo,
-    statusLabel,
-    roleFactDefaults: { nickname: '等待扫码登录' },
-  })

  // Claim pages show 4 role facts, but original only had 3 (no area).
  // Override roleFacts to match original exactly:
@@ -1,4 +1,4 @@
-import type { AdminFulfillmentBindingConfigItem, AdminObservedProductItem } from '@/types/admin'
+import type { AdminObservedProductItem } from '@/types/admin'

 export type EditableBinding = {
  id: string
@@ -3,7 +3,6 @@ import { reactive, ref } from 'vue'
 import { lookupAdminFulfillmentBindingOrder } from '@/services/admin'
 import type { AdminFulfillmentLookupItem, AdminFulfillmentLookupResult } from '@/types/admin'

-import type { ImportableProductCandidate } from './types'
 import type { useFulfillmentBindings } from './useFulfillmentBindings'

 export function useFulfillmentBindingsLookup(
@@ -68,7 +68,7 @@ const emit = defineEmits<{
        </div>
        <div class="section-action-group">
          <el-button round @click="emit('expandAll')">全部展开</el-button>
-          <el-checkbox :model-value="enabled" @update:model-value="emit('update:enabled', $event)"
+          <el-checkbox :model-value="enabled" @update:model-value="emit('update:enabled', Boolean($event))"
            >启用整条配置</el-checkbox
          >
          <el-button round @click="emit('collapseReady')">收起已完成</el-button>
@@ -528,6 +528,7 @@ export function useKuaishouCloudConfig() {
    // consume shops
    getKuaishouConsumeShopOptions,
    findKuaishouConsumeShop,
+    getDefaultKuaishouConsumeShop,
    formatKuaishouConsumeShopOption,
    handleKuaishouConsumeShopSelected,
    // collapse
@@ -1,6 +1,6 @@
-import { computed, nextTick, reactive, ref } from 'vue'
+import { computed, reactive, ref } from 'vue'

-import { showError, showSuccess } from '@/lib/feedback'
+import { showSuccess } from '@/lib/feedback'
 import { fetchAdminNinetyoneOrders } from '@/services/admin'
 import type { AdminNinetyoneOrderItem } from '@/types/admin'

@@ -39,7 +39,7 @@ export function useKuaishouCloudNinetyone(
  function createItemFromNinetyoneOrder(item: AdminNinetyoneOrderItem): EditableItem {
    const productNo = String(item.productNo || '').trim()
    const productName = String(item.productName || productNo).trim()
-    const defaultShop = config.getDefaultKuaishouConsumeShop ? config.findKuaishouConsumeShop() : null
+    const defaultShop = config.getDefaultKuaishouConsumeShop()
    const shopOpts = config.getKuaishouConsumeShopOptions()
    const shop = defaultShop || (shopOpts.length > 0 ? shopOpts[0] : null)
    return {
@@ -32,7 +32,6 @@ const {
  singleDisplayValue,
  bulkText,
  skuSuggestionsLoading,
-  inventorySkuSuggestions,
  entrySkuSuggestions,
  // actions
  loadInventoryItems,
@@ -50,7 +49,6 @@ const {
  formatInventoryStatus,
  getGroupSuggestion,
  // utils
-  hasAdminRole,
  formatAdminDateTime,
 } = useAdminInventory()
 </script>
@@ -6,8 +6,6 @@ import {
  fetchAdminInventoryItems,
  fetchAdminInventorySkuSuggestions,
  importAdminInventoryItems,
-  invalidateAdminInventoryItem,
-  releaseAdminInventoryItem,
 } from '@/services/admin'
 import type {
  AdminInventoryItemListItem,
@@ -190,6 +190,7 @@ const taskDetailLink = computed(() =>
      :copy-screenshot="copyScreenshot"
      :download-screenshot="downloadScreenshot"
      :open-preview="() => (screenshotPreviewVisible = true)"
+      :screenshot-empty-title="screenshotEmptyTitle"
    />

    <TencentResultPanel
@@ -9,6 +9,7 @@ type Props = {
  copyScreenshot: () => void
  downloadScreenshot: () => void
  openPreview: () => void
+  screenshotEmptyTitle?: string
 }

 defineProps<Props>()
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 type TaskDetail = {
  taskNo?: string
-  taskId?: string
+  taskId?: string | number
  status?: string
 }

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { EditableKuaishouEticketShop } from '../composables/types'
+import type { EditableKuaishouEticketShop } from '../../composables/types'
 import type {
  AdminKuaishouEticketConsumeResult,
  AdminKuaishouEticketDetailResult,
@@ -195,7 +195,7 @@ function mapEditableShop(item: AdminAgisoShopConfigItem): EditableShop {
    id: crypto.randomUUID(),
    shopId: item.shopId,
    shopName: item.shopName,
-    accessToken: item.accessToken,
+    accessToken: item.AccessToken,
    enabled: item.enabled !== false,
    messageTemplate: item.messageTemplate,
    autoDeliveryMessageTemplate: item.autoDeliveryMessageTemplate,
@@ -1,4 +1,4 @@
-import { ref, computed, type Ref } from 'vue'
+import { ref, computed } from 'vue'
 import { showError, showSuccess } from '@/lib/feedback'
 import {
  consumeAdminKuaishouEticket,
@@ -10,6 +10,7 @@ import type {
  AdminKuaishouEticketConsumeResult,
  AdminKuaishouEticketDetailResult,
  AdminKuaishouEticketShopInfoResult,
+  AdminKuaishouEticketShopConfigItem,
  AdminKuaishouEticketSourceConfig,
 } from '@/types/admin'
 import type { EditableKuaishouEticketShop } from './types'
@@ -68,11 +69,11 @@ export function useAdminKuaishouEticketPlatform() {
    filePath: string
    source: {
      baseUrl?: string
-      shops: AdminKuaishouEticketShopInfoResult['shop'][]
+      shops: AdminKuaishouEticketShopConfigItem[]
    }
  }) {
    kuaishouEticketFilePath.value = data.filePath
-    shopManager.setShopsFromConfig(data.source.shops as any)
+    shopManager.setShopsFromConfig(data.source.shops)
    kuaishouEticketForm.value = {
      baseUrl: data.source.baseUrl || 'https://s.kwaixiaodian.com',
      selectedShopId: '',
@@ -106,7 +107,7 @@ export function useAdminKuaishouEticketPlatform() {
  }

  function addKuaishouEticketShop() {
-    const { newSelectedId } = shopManager.addKuaishouEticketShop(kuaishouEticketForm.value.selectedShopId)
+    const { newSelectedId } = shopManager.addKuaishouEticketShop()
    setKuaishouEticketDebugShop(newSelectedId)
  }

@@ -1,12 +1,12 @@
 import { ref } from 'vue'
-import type { EditableKuaishouEticketShop } from '../types'
+import type { EditableKuaishouEticketShop } from './types'
 import type { AdminKuaishouEticketShopConfigItem } from '@/types/admin'

 export function useKuaishouEticketShopManager() {
  const kuaishouEticketShops = ref<EditableKuaishouEticketShop[]>([])
  const expandedKuaishouEticketShopIds = ref<string[]>([])

-  function addKuaishouEticketShop(selectedShopId: string) {
+  function addKuaishouEticketShop() {
    const shop = createEmptyKuaishouEticketShop()
    kuaishouEticketShops.value.unshift(shop)
    return { shop, newSelectedId: shop.id }
@@ -1,18 +1,11 @@
 import { computed, onBeforeUnmount, ref } from 'vue'
 import { useRoute } from 'vue-router'

-import { showError, showSuccess } from '@/lib/feedback'
+import { showConfirm, showError, showSuccess } from '@/lib/feedback'
 import {
-  closeAdminTask,
  completeAdminTaskManualDispatch,
  fetchAdminTaskScreenshot,
  fetchAdminTaskDetail,
-  markAdminTaskManualReview,
-  redeemAdminTaskAssisted,
-  regenerateAdminTaskClaimLink,
-  releaseAdminTaskInventoryBinding,
-  retryAdminTask,
-  confirmAdminTaskAssistedRole,
 } from '@/services/admin'
 import type { AdminTaskActionResponse, AdminTaskDetail } from '@/types/admin'
 import { hasAdminRole } from '@/utils/admin-auth'
@@ -52,7 +45,7 @@ export function useAdminTaskDetail() {

  const claimLinkInvalid = computed(() => {
    const tokenStatus = String(detail.value?.claimToken?.status || '').trim()
-    return Boolean(detail.value?.claimToken?.claimUrl) && tokenStatus && tokenStatus !== 'active'
+    return Boolean(detail.value?.claimToken?.claimUrl) && tokenStatus !== '' && tokenStatus !== 'active'
  })

  const screenshotSectionTitle = computed(() => {
@@ -1,6 +1,6 @@
 # Dev Dockerfile — single-stage, root, VNC/X11 + Playwright
 # For production, see backend.Dockerfile (multi-stage build)
-FROM node:22-bookworm
+FROM docker.m.daocloud.io/library/node:22-bookworm

 ARG DEBIAN_MIRROR=mirrors.cloud.tencent.com
 ARG NPM_REGISTRY=https://registry.npmmirror.com
@@ -7,7 +7,7 @@
 # ============================================================================

 # --------------------------- Builder Stage -----------------------------------
-FROM node:22-bookworm AS builder
+FROM docker.m.daocloud.io/library/node:22-bookworm AS builder

 ARG DEBIAN_MIRROR=mirrors.cloud.tencent.com
 ARG NPM_REGISTRY=https://registry.npmmirror.com
@@ -48,7 +48,7 @@ RUN --mount=type=cache,target=/ms-playwright-cache,sharing=locked \
 COPY apps/backend/ ./

 # --------------------------- Runtime Stage -----------------------------------
-FROM node:22-bookworm-slim AS runtime
+FROM docker.m.daocloud.io/library/node:22-bookworm-slim AS runtime

 # HTTP mirrors — see builder note about OrbStack TLS
 ENV DEBIAN_FRONTEND=noninteractive
@@ -1,4 +1,4 @@
-FROM caddy:2-alpine
+FROM docker.m.daocloud.io/library/caddy:2-alpine

 ENV TZ=Asia/Shanghai

@@ -1,4 +1,4 @@
-FROM node:22-bookworm AS builder
+FROM docker.m.daocloud.io/library/node:22-bookworm AS builder

 ARG NPM_REGISTRY=https://registry.npmmirror.com

@@ -14,7 +14,7 @@ RUN --mount=type=cache,target=/root/.npm,sharing=locked \
 COPY apps/frontend/ ./
 RUN npm run build

-FROM caddy:2-alpine
+FROM docker.m.daocloud.io/library/caddy:2-alpine

 ENV TZ=Asia/Shanghai

@@ -1,4 +1,4 @@
-FROM python:3.11-slim-bookworm
+FROM docker.m.daocloud.io/library/python:3.11-slim-bookworm

 ARG DEBIAN_MIRROR=mirrors.cloud.tencent.com
 ARG PIP_INDEX_URL=https://mirrors.cloud.tencent.com/pypi/simple
@@ -1,6 +1,6 @@
 services:
  postgres:
-    image: postgres:16-bookworm
+    image: docker.m.daocloud.io/library/postgres:16-bookworm
    restart: unless-stopped
    environment:
      TZ: ${TZ:-Asia/Shanghai}
@@ -90,7 +90,7 @@ services:
      - "${TENCENT_BROWSER_NOVNC_PORT:-6080}:6080"

  frontend:
-    image: node:22-bookworm-slim
+    image: docker.m.daocloud.io/library/node:22-bookworm-slim
    working_dir: /app
    restart: unless-stopped
    command: >-
@@ -107,7 +107,7 @@ services:
      - frontend_node_modules:/app/node_modules

  web:
-    image: caddy:2-alpine
+    image: docker.m.daocloud.io/library/caddy:2-alpine
    restart: unless-stopped
    depends_on:
      backend:
@@ -1,6 +1,6 @@
 services:
  postgres:
-    image: postgres:16-bookworm
+    image: docker.m.daocloud.io/library/postgres:16-bookworm
    restart: unless-stopped
    environment:
      TZ: ${TZ:-Asia/Shanghai}
@@ -8,7 +8,11 @@ services:
      POSTGRES_USER: ${POSTGRES_USER:-postgres}
      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-postgres}
    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-postgres} -d ${POSTGRES_DB:-order_site}"]
+      test:
+        [
+          "CMD-SHELL",
+          "pg_isready -U ${POSTGRES_USER:-postgres} -d ${POSTGRES_DB:-order_site}",
+        ]
      interval: 5s
      timeout: 5s
      retries: 20
@@ -42,7 +46,8 @@ services:
      ocr-worker:
        condition: service_healthy
    healthcheck:
-      test: ["CMD-SHELL", "curl -fsS http://127.0.0.1:3000/health/ready || exit 1"]
+      test:
+        ["CMD-SHELL", "curl -fsS http://127.0.0.1:3000/health/ready || exit 1"]
      interval: 5s
      timeout: 5s
      retries: 20