diff --git a/frontend/src/features/admin/api/adminAuth.ts b/frontend/src/features/admin/api/adminAuth.ts index d247f65..b71741d 100644 --- a/frontend/src/features/admin/api/adminAuth.ts +++ b/frontend/src/features/admin/api/adminAuth.ts @@ -2,7 +2,7 @@ import axios from 'axios' import { apiClient } from '@/shared/api/client' import type { ApiResponse } from '@/shared/types/types' -import { getRefreshToken, setAuthTokens } from '@/utils/authStorage' +import { getRefreshToken, setAuthTokens } from '@/shared/utils/authStorage' import type { UserStatus } from '@/shared/types/status' export interface AdminRole { diff --git a/frontend/src/features/admin/index.ts b/frontend/src/features/admin/index.ts index f13a825..e1e6546 100644 --- a/frontend/src/features/admin/index.ts +++ b/frontend/src/features/admin/index.ts @@ -8,15 +8,27 @@ export * from './api/systemConfigs' export * from './composables/useAdminTable' export * from './composables/useAdminPaginatedTable' -// adminAuth 和 adminRoles 都导出 AdminRole,需要显式导出避免冲突 -export { loginAdmin, logoutAdmin, fetchCurrentAdmin, type AdminUser } from './api/adminAuth' +// adminAuth 导出(不包括 AdminRole,避免与 adminRoles 冲突) +export { + fetchAdminCaptcha, + loginAdmin, + logoutAdmin, + refreshAdminAccessToken, + getAdminInfo, + type AdminUser, + type AdminTokenPair, + type AdminLoginData, + type AdminCaptcha +} from './api/adminAuth' + +// adminRoles 导出 export { fetchRoles, fetchRole, createRole, updateRole, deleteRole, - fetchAllPermissions, + fetchPermissions, type AdminRole, type Permission } from './api/adminRoles' diff --git a/frontend/src/features/listings/composables/__tests__/useHomeFilters.spec.ts b/frontend/src/features/listings/composables/__tests__/useHomeFilters.spec.ts index 4762f8e..66f2c61 100644 --- a/frontend/src/features/listings/composables/__tests__/useHomeFilters.spec.ts +++ b/frontend/src/features/listings/composables/__tests__/useHomeFilters.spec.ts @@ -1,7 +1,7 @@ import { describe, it, expect } from 'vitest' import { useHomeFilters } from '@/features/listings/composables/useHomeFilters' import { ref } from 'vue' -import { emptyListingPublishOptions } from '@/api/listingOptions' +import { emptyListingPublishOptions } from '@/features/listings/api/listingOptions' describe('useHomeFilters', () => { it('应该初始化空的筛选器', () => { diff --git a/frontend/src/features/seller/composables/usePublishDraft.ts b/frontend/src/features/seller/composables/usePublishDraft.ts index a71a540..b159460 100644 --- a/frontend/src/features/seller/composables/usePublishDraft.ts +++ b/frontend/src/features/seller/composables/usePublishDraft.ts @@ -1,4 +1,4 @@ -import type { ChargeMode, QuantityKey, ScreenshotKey } from '@/api/listingOptions' +import type { ChargeMode, QuantityKey, ScreenshotKey } from '@/features/listings/api/listingOptions' import type { PublishDraft, PublishForm } from '@/types/publish' export function defaultPublishForm(): PublishForm { diff --git a/frontend/src/features/seller/composables/usePublishForm.ts b/frontend/src/features/seller/composables/usePublishForm.ts index da01765..b4c2204 100644 --- a/frontend/src/features/seller/composables/usePublishForm.ts +++ b/frontend/src/features/seller/composables/usePublishForm.ts @@ -11,8 +11,8 @@ import { type ListingPublishOptions, type PublishSalePriceConfig, type ScreenshotKey, -} from '@/api/listingOptions' -import { createListing } from '@/api/listings' +} from '@/features/listings/api/listingOptions' +import { createListing } from '@/features/listings/api/listings' import { usePricingCalculator } from '@/composables/usePricingCalculator' import { buildPublishDraft, diff --git a/frontend/src/features/wallet/api/wallet.ts b/frontend/src/features/wallet/api/wallet.ts index a89ddeb..a66bac1 100644 --- a/frontend/src/features/wallet/api/wallet.ts +++ b/frontend/src/features/wallet/api/wallet.ts @@ -2,7 +2,7 @@ import { apiClient } from '@/shared/api/client' import type { ApiResponse, PaginatedResult } from '@/shared/types/types' import type { BalanceType, LedgerDirection, WalletStatus } from '@/shared/types/status' -import type { PaymentOrder } from '@/api/orders' +import type { PaymentOrder } from '@/features/orders/api/orders' export interface WalletAccount { user_id: number