合并远端前端修复

apps/frontend/src/composables/useAdminManualRedeemPage.ts

@@ -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,12 +121,6 @@ export function useAdminManualRedeemPage() {
     () => `请让客户使用${loginTypeLabel.value}扫码，并在手机上确认登录`,
   )
 
-  useSessionRoleFacts({
-    activityInfo,
-    statusLabel,
-    roleFactDefaults: { nickname: '等待客户登录' },
-  })
-
   const proofValue = computed(() => manualRequest.value?.proofValue || order.value?.platformOrderId || '-')
 
   const { resultFacts } = useSessionResultFacts({

apps/frontend/src/composables/useClaimPage.ts

@@ -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,12 +87,6 @@ export function useClaimPage(token: string) {
     () => `请使用${loginTypeLabel.value}扫描二维码，并在手机上确认登录`,
   )
 
-  useSessionRoleFacts({
-    activityInfo,
-    statusLabel,
-    roleFactDefaults: { nickname: '等待扫码登录' },
-  })
-
   // Claim pages show 4 role facts, but original only had 3 (no area).
   // Override roleFacts to match original exactly:
   const claimRoleFacts = computed(() => [

apps/frontend/src/views/admin/fulfillment/kuaishou-cloud/composables/useKuaishouCloudNinetyone.ts

@@ -39,7 +39,9 @@ export function useKuaishouCloudNinetyone(
   function createItemFromNinetyoneOrder(item: AdminNinetyoneOrderItem): EditableItem {
     const productNo = String(item.productNo || '').trim()
     const productName = String(item.productName || productNo).trim()
-    const shop = config.getDefaultKuaishouConsumeShop()
+    const defaultShop = config.getDefaultKuaishouConsumeShop()
+    const shopOpts = config.getKuaishouConsumeShopOptions()
+    const shop = defaultShop || (shopOpts.length > 0 ? shopOpts[0] : null)
     return {
       localId: crypto.randomUUID(),
       id: '',

apps/frontend/src/views/admin/inventory/AdminInventoryView.vue

@@ -48,6 +48,7 @@ const {
   getSkuNamingHint,
   formatInventoryStatus,
   getGroupSuggestion,
+  // utils
   formatAdminDateTime,
 } = useAdminInventory()
 </script>