feat: 迭代

apps/merchant-admin/src/api/auth.ts

@@ -1,25 +1,25 @@
 import request from '@/utils/request';
 
 export function sendSellerCode(phone: string) {
-  return request.post('/seller/auth/send-code', { phone });
+  return request.post('/api/merchant/auth/send-code', { phone });
 }
 
 export function loginByCode(phone: string, code: string) {
-  return request.post('/seller/auth/login', { phone, code });
+  return request.post('/api/merchant/auth/login', { phone, code });
 }
 
 export function loginByPassword(phone: string, password: string) {
-  return request.post('/seller/auth/login', { phone, password });
+  return request.post('/api/merchant/auth/login', { phone, password });
 }
 
 export function getSellerProfile() {
-  return request.get('/seller/auth/profile');
+  return request.get('/api/merchant/auth/profile');
 }
 
 export function getMerchantInfo() {
-  return request.get('/seller/merchant/mine');
+  return request.get('/api/merchant/profile/mine');
 }
 
 export function updateMerchantProfile(data: any) {
-  return request.put('/seller/merchant/update', data);
+  return request.put('/api/merchant/profile/update', data);
 }

apps/merchant-admin/src/api/finance.ts

@@ -2,44 +2,44 @@ import request from '@/utils/request';
 
 // 账户相关
 export function getMerchantAccount() {
-  return request.get('/merchant/finance/account');
+  return request.get('/api/merchant/finance/account');
 }
 
 // 交易流水相关
 export function getMerchantTransactions(params: any) {
-  return request.get('/merchant/finance/transactions', { params });
+  return request.get('/api/merchant/finance/transactions', { params });
 }
 
 export function getTransactionDetail(id: number) {
-  return request.get(`/merchant/finance/transactions/${id}`);
+  return request.get(`/api/merchant/finance/transactions/${id}`);
 }
 
 // 提现相关
 export function getMerchantWithdrawals(params: any) {
-  return request.get('/merchant/finance/withdrawals', { params });
+  return request.get('/api/merchant/finance/withdrawals', { params });
 }
 
 export function getWithdrawalDetail(id: number) {
-  return request.get(`/merchant/finance/withdrawals/${id}`);
+  return request.get(`/api/merchant/finance/withdrawals/${id}`);
 }
 
 export function applyWithdrawal(data: { amount: number; bankAccount: string; bankName: string; accountName: string }) {
-  return request.post('/merchant/finance/withdrawals', data);
+  return request.post('/api/merchant/finance/withdrawals', data);
 }
 
 export function cancelWithdrawal(id: number) {
-  return request.put(`/merchant/finance/withdrawals/${id}/cancel`);
+  return request.put(`/api/merchant/finance/withdrawals/${id}/cancel`);
 }
 
 // 结算相关
 export function getMerchantSettlements(params: any) {
-  return request.get('/merchant/finance/settlements', { params });
+  return request.get('/api/merchant/finance/settlements', { params });
 }
 
 export function getSettlementDetail(id: number) {
-  return request.get(`/merchant/finance/settlements/${id}`);
+  return request.get(`/api/merchant/finance/settlements/${id}`);
 }
 
 export function getSettlementItems(id: number, params: any) {
-  return request.get(`/merchant/finance/settlements/${id}/items`, { params });
+  return request.get(`/api/merchant/finance/settlements/${id}/items`, { params });
 }

apps/merchant-admin/src/api/order.ts

@@ -1,31 +1,31 @@
 import request from '@/utils/request';
 
 export function getMerchantOrders(params: any) {
-  return request.get('/seller/orders', { params });
+  return request.get('/api/merchant/orders', { params });
 }
 
 export function getOrderDetail(id: number) {
-  return request.get(`/seller/orders/${id}`);
+  return request.get(`/api/merchant/orders/${id}`);
 }
 
 export function confirmOrder(id: number) {
-  return request.put(`/seller/orders/${id}/confirm`);
+  return request.put(`/api/merchant/orders/${id}/confirm`);
 }
 
 export function rejectOrder(id: number, reason: string) {
-  return request.put(`/seller/orders/${id}/reject`, { reason });
+  return request.put(`/api/merchant/orders/${id}/reject`, { reason });
 }
 
 export function checkinOrder(id: number) {
-  return request.put(`/seller/orders/${id}/checkin`);
+  return request.put(`/api/merchant/orders/${id}/checkin`);
 }
 
 export function checkoutOrder(id: number) {
-  return request.put(`/seller/orders/${id}/checkout`);
+  return request.put(`/api/merchant/orders/${id}/checkout`);
 }
 
 export function exportOrders(params: any) {
-  return request.get('/seller/orders/export', {
+  return request.get('/api/merchant/orders/export', {
     params,
     responseType: 'blob'
   });

apps/merchant-admin/src/api/review.ts

@@ -41,5 +41,5 @@ export interface ReviewListResponse {
 }
 
 export function getReviews(params: ReviewListParams): Promise<ReviewListResponse> {
-  return request.get('/seller/reviews', { params });
+  return request.get('/api/merchant/reviews', { params });
 }

apps/merchant-admin/src/api/room-calendar.ts

@@ -1,7 +1,7 @@
 import request from '@/utils/request';
 
 export function getRoomCalendar(roomId: number, startDate: string, endDate: string) {
-  return request.get(`/seller/room-calendar/${roomId}`, {
+  return request.get(`/api/merchant/room-calendar/${roomId}`, {
     params: { startDate, endDate },
   });
 }
@@ -14,7 +14,7 @@ export function batchUpdateCalendar(data: {
   stock?: number;
   status?: string;
 }) {
-  return request.put('/seller/room-calendar/batch', data);
+  return request.put('/api/merchant/room-calendar/batch', data);
 }
 
 export function singleDayUpdate(data: {
@@ -24,5 +24,5 @@ export function singleDayUpdate(data: {
   stock?: number;
   status?: string;
 }) {
-  return request.put('/seller/room-calendar/single', data);
+  return request.put('/api/merchant/room-calendar/single', data);
 }

apps/merchant-admin/src/api/room.ts

@@ -1,21 +1,21 @@
 import request from '@/utils/request';
 
 export function getMerchantRooms(params: any) {
-  return request.get('/seller/rooms', { params });
+  return request.get('/api/merchant/rooms', { params });
 }
 
 export function getMerchantRoom(id: number) {
-  return request.get(`/seller/rooms/${id}`);
+  return request.get(`/api/merchant/rooms/${id}`);
 }
 
 export function createRoom(data: any) {
-  return request.post('/seller/rooms', data);
+  return request.post('/api/merchant/rooms', data);
 }
 
 export function updateRoom(id: number, data: any) {
-  return request.put(`/seller/rooms/${id}`, data);
+  return request.put(`/api/merchant/rooms/${id}`, data);
 }
 
 export function removeRoom(id: number) {
-  return request.delete(`/seller/rooms/${id}`);
+  return request.delete(`/api/merchant/rooms/${id}`);
 }

apps/merchant-admin/src/api/statistics.ts

@@ -2,10 +2,10 @@ import request from '@/utils/request';
 
 // 获取商家统计数据
 export function getMerchantStatistics() {
-  return request.get('/seller/statistics/overview');
+  return request.get('/api/merchant/statistics/overview');
 }
 
 // 获取收入趋势
 export function getIncomeTrend(params: { type: 'day' | 'week' | 'month' }) {
-  return request.get('/seller/statistics/income-trend', { params });
+  return request.get('/api/merchant/statistics/income-trend', { params });
 }

apps/merchant-admin/src/hooks/useTableData.ts

@@ -52,7 +52,7 @@ export function useTableData<T = any>(
     } finally {
       setLoading(false);
     }
-  }, [fetchFn, params]);
+  }, [params]);
 
   useEffect(() => {
     if (autoLoad) {

apps/merchant-admin/src/utils/request.ts

@@ -1,7 +1,7 @@
 import axios from 'axios';
 
 const request = axios.create({
-  baseURL: '/api',
+  baseURL: '',
   timeout: 15000,
 });
 
@@ -32,8 +32,10 @@ request.interceptors.response.use(
       localStorage.removeItem('seller_token');
       localStorage.removeItem('seller_info');
       window.location.href = '/login';
+      return Promise.reject(new Error('登录已过期'));
     }
-    return Promise.reject(error);
+    const message = error.response?.data?.message || error.message || '网络请求失败';
+    return Promise.reject(new Error(message));
   },
 );