-
+
+
{user.name || user.open_id}
-
- {user.open_id}
+
+ {user.user_id || user.open_id}
diff --git a/frontend/src/hooks/useApi.ts b/frontend/src/hooks/useApi.ts
index 1a66abb..da67fca 100644
--- a/frontend/src/hooks/useApi.ts
+++ b/frontend/src/hooks/useApi.ts
@@ -111,27 +111,40 @@ export function useChangePassword() {
// ==================== Friends Hooks ====================
-export function useFriends() {
+export function useFriends(options?: { enabled?: boolean }) {
return useQuery({
queryKey: ['friends'],
queryFn: friendApi.list,
staleTime: shortStaleTime,
+ enabled: options?.enabled !== false,
});
}
-export function useIncomingFriendRequests() {
+export function useIncomingFriendRequests(options?: { enabled?: boolean }) {
return useQuery({
queryKey: ['friends', 'requests', 'incoming'],
queryFn: friendApi.incoming,
staleTime: shortStaleTime,
+ enabled: options?.enabled !== false,
});
}
-export function useOutgoingFriendRequests() {
+export function useOutgoingFriendRequests(options?: { enabled?: boolean }) {
return useQuery({
queryKey: ['friends', 'requests', 'outgoing'],
queryFn: friendApi.outgoing,
staleTime: shortStaleTime,
+ enabled: options?.enabled !== false,
+ });
+}
+
+/** 仅请求待处理好友数量，用于角标（不拉完整列表） */
+export function useIncomingFriendRequestCount(options?: { enabled?: boolean }) {
+ return useQuery({
+ queryKey: ['friends', 'requests', 'incoming', 'count'],
+ queryFn: () => friendApi.incomingCount(),
+ staleTime: shortStaleTime,
+ enabled: options?.enabled !== false,
});
}
@@ -192,11 +205,12 @@ export function useSearchUsers(q: string, limit?: number) {
// ==================== Category Hooks ====================
-export function useCategories() {
+export function useCategories(options?: { enabled?: boolean }) {
return useQuery({
queryKey: ['categories'],
queryFn: categoryApi.list,
staleTime: staticStaleTime,
+ enabled: options?.enabled !== false,
});
}
@@ -266,7 +280,7 @@ export function useProductWithPrices(id: number) {
});
}
-export function useProductSearch(q: string, params?: { page?: number; category_id?: number; min_price?: number; max_price?: number; sort_by?: string }) {
+export function useProductSearch(q: string, params?: { page?: number; category_id?: number; user_id?: string; min_price?: number; max_price?: number; sort_by?: string }) {
const debouncedQuery = useDebouncedValue(q, 300);
return useQuery({
queryKey: ['products', 'search', debouncedQuery, params],
@@ -553,12 +567,13 @@ export function useReviewExtensionRequest() {
// ==================== Favorites Hooks ====================
-export function useFavorites(params?: { tag_id?: number; page?: number }) {
+export function useFavorites(params?: { tag_id?: number; page?: number }, options?: { enabled?: boolean }) {
return useQuery({
queryKey: ['favorites', params],
queryFn: () => favoriteApi.list(params),
staleTime: shortStaleTime,
placeholderData: keepPreviousData,
+ enabled: options?.enabled !== false,
});
}
@@ -711,12 +726,13 @@ export function useAllPriceMonitors(page?: number) {
// ==================== Notification Hooks ====================
-export function useNotifications(params?: { is_read?: boolean; type?: string; start?: string; end?: string; page?: number }) {
+export function useNotifications(params?: { is_read?: boolean; type?: string; start?: string; end?: string; page?: number }, options?: { enabled?: boolean }) {
return useQuery({
queryKey: ['notifications', params],
queryFn: () => notificationApi.list(params),
staleTime: shortStaleTime,
placeholderData: keepPreviousData,
+ enabled: options?.enabled !== false,
});
}
@@ -730,11 +746,12 @@ export function useGlobalSearch(q: string, limit = 10) {
});
}
-export function useUnreadNotificationCount() {
+export function useUnreadNotificationCount(options?: { enabled?: boolean }) {
return useQuery({
queryKey: ['notifications', 'unread-count'],
queryFn: notificationApi.unreadCount,
staleTime: shortStaleTime,
+ enabled: options?.enabled !== false,
});
}
@@ -760,11 +777,12 @@ export function useMarkAllNotificationsAsRead() {
});
}
-export function useNotificationPreferences() {
+export function useNotificationPreferences(options?: { enabled?: boolean }) {
return useQuery({
queryKey: ['notifications', 'preferences'],
queryFn: notificationApi.getPreferences,
staleTime: shortStaleTime,
+ enabled: options?.enabled !== false,
});
}
@@ -902,10 +920,11 @@ export function useUpdateAdminProductImages() {
// ==================== My Products Hooks ====================
-export function useMyProducts(status?: string) {
+export function useMyProducts(status?: string, options?: { enabled?: boolean }) {
return useQuery({
queryKey: ['products', 'my', status],
queryFn: () => productApi.myProducts(status),
staleTime: shortStaleTime,
+ enabled: options?.enabled !== false,
});
}
diff --git a/frontend/src/lib/api/friends.ts b/frontend/src/lib/api/friends.ts
index 79e9d22..5ccb5cc 100644
--- a/frontend/src/lib/api/friends.ts
+++ b/frontend/src/lib/api/friends.ts
@@ -4,6 +4,7 @@ import type { Friend, FriendRequest, UserBrief } from "../types";
export const friendApi = {
list: () => api.get
("/friends/").then((r) => r.data),
incoming: () => api.get("/friends/requests/incoming").then((r) => r.data),
+ incomingCount: () => api.get<{ count: number }>("/friends/requests/incoming/count").then((r) => r.data),
outgoing: () => api.get("/friends/requests/outgoing").then((r) => r.data),
sendRequest: (data: { receiver_id: number }) =>
api.post("/friends/requests", data).then((r) => r.data),
diff --git a/frontend/src/lib/api/products.ts b/frontend/src/lib/api/products.ts
index 3048096..6bf2473 100644
--- a/frontend/src/lib/api/products.ts
+++ b/frontend/src/lib/api/products.ts
@@ -20,7 +20,7 @@ export const productApi = {
},
get: (id: number) => api.get(`/products/${id}`).then((r) => r.data),
getWithPrices: (id: number) => api.get(`/products/${id}/with-prices`).then((r) => r.data),
- search: (params: { q: string; page?: number; category_id?: number; min_price?: number; max_price?: number; sort_by?: string }) =>
+ search: (params: { q: string; page?: number; category_id?: number; user_id?: string; min_price?: number; max_price?: number; sort_by?: string }) =>
api.get>(
"/products/search/",
{ params, timeout: searchTimeout }
diff --git a/frontend/src/lib/types.ts b/frontend/src/lib/types.ts
index 62fcc05..838d52a 100644
--- a/frontend/src/lib/types.ts
+++ b/frontend/src/lib/types.ts
@@ -1,6 +1,8 @@
export interface User {
id: number;
open_id: string;
+ /** 可分享的用户ID，用于好友搜索、商品搜索等 */
+ user_id: string | null;
name: string | null;
email: string | null;
avatar: string | null;
@@ -14,6 +16,8 @@ export interface User {
export interface UserBrief {
id: number;
open_id: string;
+ /** 可分享的用户ID */
+ user_id: string | null;
name: string | null;
email: string | null;
avatar: string | null;