diff --git a/frontend/src/features/announcement/api/announcements.ts b/frontend/src/features/announcement/api/announcements.ts index 3435271..b4fde3a 100644 --- a/frontend/src/features/announcement/api/announcements.ts +++ b/frontend/src/features/announcement/api/announcements.ts @@ -1,4 +1,5 @@ -import { apiRequest } from '@/utils/apiRequest' +import { apiClient } from '@/shared/api/client' +import type { ApiResponse } from '@/shared/types/types' export interface Announcement { id: number @@ -29,14 +30,11 @@ export interface PaginatedResult { } export async function fetchAnnouncements(params: AnnouncementListParams = {}): Promise> { - return apiRequest>('/api/announcements', { - method: 'GET', - params, - }) + const { data } = await apiClient.get>>('/announcements', { params }) + return data.data } export async function fetchAnnouncementDetail(id: number): Promise { - return apiRequest(`/api/announcements/${id}`, { - method: 'GET', - }) + const { data } = await apiClient.get>(`/announcements/${id}`) + return data.data } diff --git a/frontend/src/features/announcement/views/AnnouncementDetailView.vue b/frontend/src/features/announcement/views/AnnouncementDetailView.vue index 4139cae..d6439c5 100644 --- a/frontend/src/features/announcement/views/AnnouncementDetailView.vue +++ b/frontend/src/features/announcement/views/AnnouncementDetailView.vue @@ -68,11 +68,11 @@ function getCategoryLabel(category: string) { size="small" class="category-tag" :style="{ - borderColor: getCategoryInfo(announcement.category).color, - color: getCategoryInfo(announcement.category).color + borderColor: getCategoryInfo(announcement.category)?.color || '#94a3b8', + color: getCategoryInfo(announcement.category)?.color || '#94a3b8' }" > - + {{ getCategoryLabel(announcement.category) }} 置顶 diff --git a/frontend/src/features/announcement/views/AnnouncementsView.vue b/frontend/src/features/announcement/views/AnnouncementsView.vue index 32d6bd6..d6196f4 100644 --- a/frontend/src/features/announcement/views/AnnouncementsView.vue +++ b/frontend/src/features/announcement/views/AnnouncementsView.vue @@ -110,13 +110,13 @@ function getCategoryLabel(category: string) {
- + {{ getCategoryLabel(item.category) }} 置顶