yml/order_site
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复一些的过时测试 优化readme

Browse Source
This commit is contained in:
yml
2026-05-21 13:16:07 +08:00
parent 5474d77799
commit 25671078d6
38 changed files with 331 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/backend/src/services/admin/platform-config/cloudtentacles.test.js
+7
View File
@@ -30,6 +30,7 @@ test('resolveAdminCloudtentaclesCredentialPayload merges payload and saved sourc
},
),
{
sourceKey: 'default',
baseUrl: 'https://override.example.com',
username: 'saved-user',
password: 'saved-pass',
@@ -60,6 +61,7 @@ test('resolveAdminCloudtentaclesSessionPayload merges payload source and persist
},
),
{
sourceKey: 'default',
baseUrl: 'https://saved.example.com',
token: 'payload-token',
deviceId: 'saved-device',
@@ -111,6 +113,7 @@ test('buildAdminCloudtentaclesSessionSummary masks token and reports permission
},
),
{
sourceKey: 'default',
tokenMasked: 'abcdef****567890',
permissionCount: 2,
permissions: ['asset', 'sku'],
@@ -138,6 +141,7 @@ test('buildAdminCloudtentaclesLoginResult assembles login response payload', ()
},
),
{
sourceKey: 'default',
baseUrl: 'https://cloud.example.com',
username: 'test-user',
phoneMasked: '138****5678',
@@ -145,6 +149,7 @@ test('buildAdminCloudtentaclesLoginResult assembles login response payload', ()
responseMessage: 'success',
token: 'abcdef1234567890',
session: {
sourceKey: 'default',
tokenMasked: 'abcdef****567890',
permissionCount: 1,
permissions: ['asset'],
@@ -170,9 +175,11 @@ test('buildAdminCloudtentaclesValidateResult assembles validate response payload
{},
),
{
sourceKey: 'default',
baseUrl: 'https://cloud.example.com',
loggedInAt: '2026-05-04T12:00:00.000Z',
session: {
sourceKey: 'default',
tokenMasked: 'abcdef****567890',
permissionCount: 2,
permissions: ['asset', 'sku'],
apps/backend/src/services/admin/platform-config/context.test.js
+1
View File
@@ -88,6 +88,7 @@ test('resolveCloudtentaclesAdminContext merges payload source and persisted sess
)
assert.deepEqual(context, {
sourceKey: 'default',
baseUrl: 'https://saved.example.com',
token: 'token-1',
deviceId: 'device-saved',
apps/backend/src/services/admin/platform-config/writes.test.js
+2
View File
@@ -113,6 +113,8 @@ test('normalizeAdminCloudtentaclesSourceConfigPayload applies defaults', () => {
deviceType: '2',
}),
{
key: 'default',
label: '',
enabled: false,
baseUrl: 'https://123.207.217.176',
username: 'user',
apps/backend/src/services/order/kuaishou-cloud-fulfillment-config-service.test.js
+1
View File
@@ -36,6 +36,7 @@ test('mapKuaishouCloudFulfillmentItemsToBindings maps 91kaquan rules', () => {
configId: '',
cloudtentacles: {
cloudSourceKey: 'default',
cloudSourceKeyFallbacks: [],
skuId: 28,
skuName: '',
vnKey: '1',
apps/frontend/package-lock.json
Generated
+40 -16
View File
@@ -1598,6 +1598,18 @@
"acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
}
},
"node_modules/agent-base": {
"version": "6.0.2",
"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
"integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
"license": "MIT",
"dependencies": {
"debug": "4"
},
"engines": {
"node": ">= 6.0.0"
}
},
"node_modules/ajv": {
"version": "6.15.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.15.0.tgz",
@@ -1659,13 +1671,14 @@
"license": "MIT"
},
"node_modules/axios": {
"version": "1.14.0",
"resolved": "https://registry.npmjs.org/axios/-/axios-1.14.0.tgz",
"integrity": "sha512-3Y8yrqLSwjuzpXuZ0oIYZ/XGgLwUIBU3uLvbcpb0pidD9ctpShJd43KSlEEkVQg6DS0G9NKyzOvBfUtDKEyHvQ==",
"version": "1.16.1",
"resolved": "https://registry.npmjs.org/axios/-/axios-1.16.1.tgz",
"integrity": "sha512-caYkukvroVPO8KrzuJEb50Hm07KwfBZPEC3VeFHTsqWHvKTsy54hjJz9BS/cdaypROE2rH6xvm9mHX4fgWkr3A==",
"license": "MIT",
"dependencies": {
"follow-redirects": "^1.15.11",
"follow-redirects": "^1.16.0",
"form-data": "^4.0.5",
"https-proxy-agent": "^5.0.1",
"proxy-from-env": "^2.1.0"
}
},
@@ -1829,7 +1842,6 @@
"version": "4.4.3",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
"integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
"dev": true,
"license": "MIT",
"dependencies": {
"ms": "^2.1.3"
@@ -2378,9 +2390,9 @@
"license": "ISC"
},
"node_modules/follow-redirects": {
"version": "1.15.11",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz",
"integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==",
"version": "1.16.0",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.16.0.tgz",
"integrity": "sha512-y5rN/uOsadFT/JfYwhxRS5R7Qce+g3zG97+JrtFZlC9klX/W5hD7iiLzScI4nZqUS7DNUdhPgw4xI8W2LuXlUw==",
"funding": [
{
"type": "individual",
@@ -2560,6 +2572,19 @@
"node": ">= 0.4"
}
},
"node_modules/https-proxy-agent": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
"integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
"license": "MIT",
"dependencies": {
"agent-base": "6",
"debug": "4"
},
"engines": {
"node": ">= 6"
}
},
"node_modules/ignore": {
"version": "5.3.2",
"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
@@ -3089,7 +3114,6 @@
"version": "2.1.3",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
"dev": true,
"license": "MIT"
},
"node_modules/muggle-string": {
@@ -3100,9 +3124,9 @@
"license": "MIT"
},
"node_modules/nanoid": {
"version": "3.3.11",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
"integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
"version": "3.3.12",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.12.tgz",
"integrity": "sha512-ZB9RH/39qpq5Vu6Y+NmUaFhQR6pp+M2Xt76XBnEwDaGcVAqhlvxrl3B2bKS5D3NH3QR76v3aSrKaF/Kiy7lEtQ==",
"funding": [
{
"type": "github",
@@ -3290,9 +3314,9 @@
}
},
"node_modules/postcss": {
"version": "8.5.8",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.8.tgz",
"integrity": "sha512-OW/rX8O/jXnm82Ey1k44pObPtdblfiuWnrd8X7GJ7emImCOstunGbXUpp7HdBrFQX6rJzn3sPT397Wp5aCwCHg==",
"version": "8.5.15",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.15.tgz",
"integrity": "sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A==",
"funding": [
{
"type": "opencollective",
@@ -3309,7 +3333,7 @@
],
"license": "MIT",
"dependencies": {
"nanoid": "^3.3.11",
"nanoid": "^3.3.12",
"picocolors": "^1.1.1",
"source-map-js": "^1.2.1"
},
apps/frontend/src/composables/shared/useSessionPolling.ts
+4 -4
View File
@@ -1,19 +1,19 @@
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). */
onPollTick: () => Promise<void>
onPollTick: () => Promise<unknown>
/** Optional: determines whether polling should continue. Defaults to checking hasSession. */
shouldKeepPolling?: ComputedRef<boolean>
/** Context-specific warning message prefix when polling fails repeatedly. */
pollWarningPrefix: string
}
export function useSessionPolling(options: UseSessionPollingOptions<unknown>) {
export function useSessionPolling(options: UseSessionPollingOptions) {
const { hasSession, onPollTick, pollWarningPrefix } = options
const pollWarningMessage = ref('')
apps/frontend/src/composables/shared/useSessionPresentation.ts
+12 -10
View File
@@ -5,6 +5,8 @@ import type { TencentLoginType } from '@/types/tencent/session'
import { DEFAULT_LOGIN_TYPE } from './sessionConstants'
type ReadableRef<T> = Pick<Ref<T>, 'value'>
// ---------------------------------------------------------------------------
// syncLoginTypeFromDetail
// ---------------------------------------------------------------------------
@@ -102,7 +104,7 @@ export interface UseSessionPresentationOptions {
}
export function useSessionRoleFacts(options: UseSessionPresentationOptions) {
const { activityInfo, statusLabel, roleFactDefaults } = options
const { activityInfo, roleFactDefaults } = options
const roleFacts = computed<FactItem[]>(() => [
{
@@ -168,17 +170,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: ReadableRef<unknown | null>
hasSession: ReadableRef<boolean>
loginTypeLabel: ReadableRef<string>
redeemLoading: ReadableRef<boolean>
roleReady: ReadableRef<boolean>
roleConfirmed: ReadableRef<boolean>
sessionNotice: ReadableRef<string>
context: 'claim' | 'admin'
/** Claim-specific fields */
tokenStatus?: ComputedRef<string>
requiresSupportReview?: ComputedRef<boolean>
tokenStatus?: ReadableRef<string>
requiresSupportReview?: ReadableRef<boolean>
}): string {
const {
detail,
apps/frontend/src/composables/shared/useSessionQrDisplay.ts
+1 -1
View File
@@ -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
apps/frontend/src/composables/useAdminManualRedeemPage.ts
+1 -5
View File
@@ -122,7 +122,7 @@ export function useAdminManualRedeemPage() {
() => `请让客户使用${loginTypeLabel.value}扫码，并在手机上确认登录`,
)
const { roleFacts } = useSessionRoleFacts({
useSessionRoleFacts({
activityInfo,
statusLabel,
roleFactDefaults: { nickname: '等待客户登录' },
@@ -230,10 +230,6 @@ export function useAdminManualRedeemPage() {
})
// ── Helpers ────────────────────────────────────────────────────────
function applyLoginTypeFromDetail(nextDetail: AdminManualRedeemDetail) {
loginType.value = syncLoginTypeFromDetail(nextDetail, loginType.value)
}
function restartPollingIfNeeded(nextDetail = detail.value) {
resetPolling()
apps/frontend/src/composables/useClaimPage.ts
+1 -1
View File
@@ -88,7 +88,7 @@ export function useClaimPage(token: string) {
() => `请使用${loginTypeLabel.value}扫描二维码，并在手机上确认登录`,
)
const { roleFacts } = useSessionRoleFacts({
useSessionRoleFacts({
activityInfo,
statusLabel,
roleFactDefaults: { nickname: '等待扫码登录' },
apps/frontend/src/services/admin/platform-config/cloudtentacles.ts
-2
View File
@@ -1,8 +1,6 @@
import { apiDelete, apiGet, apiPost } from '@/lib/http'
import type {
AdminCloudtentaclesLoginTestResult,
AdminCloudtentaclesPersistedSession,
AdminCloudtentaclesSessionsMap,
AdminCloudtentaclesSkuListResult,
AdminCloudtentaclesSendSmsResult,
AdminCloudtentaclesSourceConfigResponse,
apps/frontend/src/types/admin/index.ts
+1
View File
@@ -81,6 +81,7 @@ export type {
AdminCloudtentaclesSessionsMap,
AdminCloudtentaclesSourceConfig,
AdminCloudtentaclesPersistedSession,
AdminCloudtentaclesSessionItem,
AdminCloudtentaclesSendSmsResult,
AdminCloudtentaclesSessionSummary,
AdminCloudtentaclesLoginTestResult,
apps/frontend/src/types/admin/platform-config/cloudtentacles.ts
+2
View File
@@ -26,6 +26,8 @@ export interface AdminCloudtentaclesPersistedSession {
hasToken: boolean
}
export type AdminCloudtentaclesSessionItem = AdminCloudtentaclesPersistedSession
export interface AdminCloudtentaclesSessionsMap {
[sourceKey: string]: AdminCloudtentaclesPersistedSession
}
apps/frontend/src/types/admin/platform-config/index.ts
+1
View File
@@ -39,6 +39,7 @@ export type {
AdminCloudtentaclesSessionsMap,
AdminCloudtentaclesSourceConfig,
AdminCloudtentaclesPersistedSession,
AdminCloudtentaclesSessionItem,
AdminCloudtentaclesSendSmsResult,
AdminCloudtentaclesSessionSummary,
AdminCloudtentaclesLoginTestResult,
apps/frontend/src/views/admin/fulfillment/bindings/composables/types.ts
+1 -1
View File
@@ -1,4 +1,4 @@
import type { AdminFulfillmentBindingConfigItem, AdminObservedProductItem } from '@/types/admin'
import type { AdminObservedProductItem } from '@/types/admin'
export type EditableBinding = {
id: string
apps/frontend/src/views/admin/fulfillment/bindings/composables/useFulfillmentBindingsLookup.ts
-1
View File
@@ -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(
apps/frontend/src/views/admin/fulfillment/kuaishou-cloud/components/AdminKuaishouCloudNinetyoneSection.vue
+1 -1
View File
@@ -1,7 +1,7 @@
<script setup lang="ts">
import type { AdminNinetyoneOrderItem } from '@/types/admin'
const props = defineProps<{
defineProps<{
ninetyoneLookupLoading: boolean
ninetyoneLookupErrorMessage: string
ninetyoneLookupResults: AdminNinetyoneOrderItem[]
apps/frontend/src/views/admin/fulfillment/kuaishou-cloud/components/AdminKuaishouCloudRuleSection.vue
+5 -2
View File
@@ -68,9 +68,12 @@ 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
<el-checkbox
:model-value="enabled"
@update:model-value="emit('update:enabled', Boolean($event))"
>
启用整条配置
</el-checkbox>
<el-button round @click="emit('collapseReady')">收起已完成</el-button>
<el-button round :loading="cloudSkuCatalogLoading" @click="emit('refreshCloudSku')"
>刷新 cloud SKU</el-button
apps/frontend/src/views/admin/fulfillment/kuaishou-cloud/composables/useKuaishouCloudConfig.ts
+1
View File
@@ -528,6 +528,7 @@ export function useKuaishouCloudConfig() {
// consume shops
getKuaishouConsumeShopOptions,
findKuaishouConsumeShop,
getDefaultKuaishouConsumeShop,
formatKuaishouConsumeShopOption,
handleKuaishouConsumeShopSelected,
// collapse
apps/frontend/src/views/admin/fulfillment/kuaishou-cloud/composables/useKuaishouCloudNinetyone.ts
+3 -5
View File
@@ -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,9 +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 shopOpts = config.getKuaishouConsumeShopOptions()
const shop = defaultShop || (shopOpts.length > 0 ? shopOpts[0] : null)
const shop = config.getDefaultKuaishouConsumeShop()
return {
localId: crypto.randomUUID(),
id: '',
apps/frontend/src/views/admin/inventory/AdminInventoryView.vue
-3
View File
@@ -32,7 +32,6 @@ const {
singleDisplayValue,
bulkText,
skuSuggestionsLoading,
inventorySkuSuggestions,
entrySkuSuggestions,
// actions
loadInventoryItems,
@@ -49,8 +48,6 @@ const {
getSkuNamingHint,
formatInventoryStatus,
getGroupSuggestion,
// utils
hasAdminRole,
formatAdminDateTime,
} = useAdminInventory()
</script>
apps/frontend/src/views/admin/inventory/composables/useAdminInventory.ts
-4
View File
@@ -6,15 +6,12 @@ import {
fetchAdminInventoryItems,
fetchAdminInventorySkuSuggestions,
importAdminInventoryItems,
invalidateAdminInventoryItem,
releaseAdminInventoryItem,
} from '@/services/admin'
import type {
AdminInventoryItemListItem,
AdminInventorySkuSuggestion,
AdminPagination,
} from '@/types/admin'
import { hasAdminRole } from '@/utils/admin-auth'
import { formatAdminDateTime } from '@/utils/admin-time'
import {
adminInventoryCredentialTypeOptions,
@@ -425,7 +422,6 @@ export function useAdminInventory() {
formatInventoryStatus,
getGroupSuggestion,
// utils
hasAdminRole,
formatAdminDateTime,
adminInventoryCredentialTypeOptions,
adminInventoryStatusOptions,
apps/frontend/src/views/admin/manual-redeem/AdminManualRedeemView.vue
+1
View File
@@ -184,6 +184,7 @@ const taskDetailLink = computed(() =>
:review-card-title="reviewCardTitle"
:review-ready="reviewReady"
:result-ready="resultReady"
:screenshot-empty-title="screenshotEmptyTitle"
:screenshot-empty-message="screenshotEmptyMessage"
:screenshot-url="screenshotUrl"
:screenshot-loading="screenshotLoading"
apps/frontend/src/views/admin/manual-redeem/components/AdminManualRedeemReviewCard.vue
+1
View File
@@ -3,6 +3,7 @@ type Props = {
reviewCardTitle: string
reviewReady: boolean
resultReady: boolean
screenshotEmptyTitle: string
screenshotEmptyMessage: string
screenshotUrl: string
screenshotLoading: boolean
apps/frontend/src/views/admin/manual-redeem/components/AdminManualRedeemSummaryCard.vue
+1 -1
View File
@@ -1,7 +1,7 @@
<script setup lang="ts">
type TaskDetail = {
taskNo?: string
taskId?: string
taskId?: string | number
status?: string
}
apps/frontend/src/views/admin/platform-shops/components/cloudtentacles/AdminCloudtentaclesConfigCard.vue
+1 -1
View File
@@ -50,7 +50,7 @@ type Props = {
removeSource: (sourceKey: string) => void
}
const props = defineProps<Props>()
defineProps<Props>()
</script>
<template>
apps/frontend/src/views/admin/platform-shops/components/cloudtentacles/AdminCloudtentaclesInfoCard.vue
+2 -2
View File
@@ -1,8 +1,8 @@
<script setup lang="ts">
import type {
AdminCloudtentaclesPersistedSession,
AdminCloudtentaclesSessionItem,
AdminCloudtentaclesSessionsMap,
AdminCloudtentaclesSourceItem,
} from '@/types/admin'
import { formatAdminDateTime } from '@/utils/admin-time'
@@ -15,7 +15,7 @@ type Props = {
selectedSourceKey: string
}
const props = defineProps<Props>()
defineProps<Props>()
</script>
<template>
apps/frontend/src/views/admin/platform-shops/components/cloudtentacles/AdminPlatformCloudtentaclesSection.vue
+1 -1
View File
@@ -3,8 +3,8 @@ import type {
AdminCloudtentaclesLoginTestResult,
AdminCloudtentaclesPersistedSession,
AdminCloudtentaclesSendSmsResult,
AdminCloudtentaclesSessionItem,
AdminCloudtentaclesSessionsMap,
AdminCloudtentaclesSourceItem,
AdminCloudtentaclesValidateSessionResult,
} from '@/types/admin'
import AdminCloudtentaclesInfoCard from './AdminCloudtentaclesInfoCard.vue'
apps/frontend/src/views/admin/platform-shops/components/kuaishou-eticket/AdminPlatformKuaishouEticketSection.vue
+1 -1
View File
@@ -1,5 +1,5 @@
<script setup lang="ts">
import type { EditableKuaishouEticketShop } from '../composables/types'
import type { EditableKuaishouEticketShop } from '../../composables/types'
import type {
AdminKuaishouEticketConsumeResult,
AdminKuaishouEticketDetailResult,
apps/frontend/src/views/admin/platform-shops/composables/useAdminAgisoPlatform.ts
+1 -1
View File
@@ -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,
apps/frontend/src/views/admin/platform-shops/composables/useAdminKuaishouEticketPlatform.ts
+4 -7
View File
@@ -1,4 +1,4 @@
import { ref, computed, type Ref } from 'vue'
import { ref, computed } from 'vue'
import { showError, showSuccess } from '@/lib/feedback'
import {
consumeAdminKuaishouEticket,
@@ -66,13 +66,10 @@ export function useAdminKuaishouEticketPlatform() {
function hydrateKuaishouEticketConfig(data: {
filePath: string
source: {
baseUrl?: string
shops: AdminKuaishouEticketShopInfoResult['shop'][]
}
source: AdminKuaishouEticketSourceConfig
}) {
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 +103,7 @@ export function useAdminKuaishouEticketPlatform() {
}
function addKuaishouEticketShop() {
const { newSelectedId } = shopManager.addKuaishouEticketShop(kuaishouEticketForm.value.selectedShopId)
const { newSelectedId } = shopManager.addKuaishouEticketShop()
setKuaishouEticketDebugShop(newSelectedId)
}
apps/frontend/src/views/admin/platform-shops/composables/useKuaishouEticketShopManager.ts
+2 -2
View File
@@ -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 }
apps/frontend/src/views/admin/tasks/AdminTasksView.vue
+2 -2
View File
@@ -12,7 +12,7 @@ import {
regenerateAdminTaskClaimLink,
retryAdminTask,
} from "@/services/admin";
import type { AdminTaskActionResponse, AdminTaskListItem } from "@/types/admin";
import type { AdminTaskListItem } from "@/types/admin";
import { hasAdminRole } from "@/utils/admin-auth";
import {
formatBindingRoleSummary,
@@ -379,7 +379,7 @@ function resetFilters() {
action: async () => {
const response = await retryAdminTask(row.taskId);
if (response.data.claimUrl)
lastClaimUrl.value = response.data.claimUrl;
lastClaimUrl = response.data.claimUrl;
},
successMessage: '任务已重试',
confirmText: `确认重试任务 ${row.taskNo} 吗？`,
apps/frontend/src/views/admin/tasks/components/AdminTaskActionBar.vue
+1 -1
View File
@@ -8,7 +8,7 @@ interface Props {
canCloseTasks: boolean
}
const props = defineProps<Props>()
defineProps<Props>()
const emit = defineEmits<{
retry: []
apps/frontend/src/views/admin/tasks/composables/useAdminTaskDetail.ts
+6 -9
View File
@@ -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,11 @@ 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(() => {
apps/frontend/src/views/admin/tasks/composables/useAdminTaskKuaishouCloud.ts
+2 -2
View File
@@ -6,7 +6,7 @@ import {
refreshAdminTaskKuaishouCloudRoleInfo,
returnNumberAdminTaskKuaishouCloudFulfillment,
} from '@/services/admin'
import type { AdminTaskDetail } from '@/types/admin'
import type { AdminTaskActionResponse, AdminTaskDetail } from '@/types/admin'
import { formatKuaishouRoleInfoLabel } from '@/utils/admin-display'
import { formatAdminDateTime } from '@/utils/admin-time'
@@ -15,7 +15,7 @@ import type { ChecklistItem, RoleInfoEntry, SummaryCard } from './types'
export function useAdminTaskKuaishouCloud(
detail: Ref<AdminTaskDetail | null>,
runAction: (
action: () => Promise<{ data: any }>,
action: () => Promise<{ data: AdminTaskActionResponse }>,
successMessage: string,
confirmText: string,
) => Promise<void>,
apps/frontend/src/views/claim/kuaishou-cloud/KuaishouCloudClaimView.vue
+2 -2
View File
@@ -61,7 +61,7 @@ const claim = useKuaishouCloudClaim(() => props.token)
:refreshing-role="claim.refreshingRole.value"
:confirming-role="claim.confirmingRole.value"
:flow="claim.flow.value"
:format-date-time="claim.formatDateTime"
:format-date-time="claim.formatAdminDateTime"
@open-bind-url="claim.openBindUrl($event)"
@refresh-role="claim.refreshRole()"
@confirm-role="claim.confirmRole()"
@@ -85,7 +85,7 @@ const claim = useKuaishouCloudClaim(() => props.token)
:order-item="claim.orderItem.value"
:role-name="claim.roleName.value"
:role-id="claim.roleId.value"
:format-date-time="claim.formatDateTime"
:format-date-time="claim.formatAdminDateTime"
/>
</template>