refactor(api): 更新 API调用以使用 request-legacy- 将多个 API 文件中的 request 引用更新为 request-legacy
- 修改了部分 API调用的错误处理方式 - 更新了部分函数参数名称
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { BszxClass, BszxClassParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { BszxEra, BszxEraParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { BszxGrade, BszxGradeParam } from './model';
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import request from '@/utils/request';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api';
|
||||
import type {BszxPay, BszxPayParam} from "@/api/bszx/bszxPay/model";
|
||||
import type {BszxBm,BszxBmParam} from "@/api/bszx/bszxBm/model";
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { CmsArticleCategory, CmsArticleCategoryParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { CmsArticleComment, CmsArticleCommentParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { CmsArticleContent, CmsArticleContentParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { CmsArticleCount, CmsArticleCountParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { CmsArticleLike, CmsArticleLikeParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { CmsComponents, CmsComponentsParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { CmsDesign, CmsDesignParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { CmsDesignRecord, CmsDesignRecordParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { CmsDocs, CmsDocsParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { CmsDocsContent, CmsDocsContentParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { CmsDomain, CmsDomainParam } from './model';
|
||||
import {SERVER_API_URL} from "@/utils/server";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { CmsForm, CmsFormParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { CmsFormRecord, CmsFormRecordParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { CmsLang, CmsLangParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { CmsLangLog, CmsLangLogParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { CmsLink, CmsLinkParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { CmsMp, CmsMpParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { CmsMpField, CmsMpFieldParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { CmsMpMenu, CmsMpMenuParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { CmsMpPages, CmsMpPagesParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { CmsWebsite, CmsWebsiteParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type {CmsWebsiteField, CmsWebsiteFieldParam, Config} from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { Link, LinkParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { MpOfficialMenu, MpOfficialMenuParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { ShopCommissionRole, ShopCommissionRoleParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { ShopCoupon, ShopCouponParam } from './model';
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import request from '@/utils/request';
|
||||
import type { ApiResult, PageResult } from '@/api';
|
||||
import type { ShopDealerApply, ShopDealerApplyParam } from './model';
|
||||
|
||||
/**
|
||||
@@ -34,28 +34,82 @@ export async function listShopDealerApply(params?: ShopDealerApplyParam) {
|
||||
* 添加分销商申请记录表
|
||||
*/
|
||||
export async function addShopDealerApply(data: ShopDealerApply) {
|
||||
const res = await request.post<ApiResult<unknown>>(
|
||||
'/shop/shop-dealer-apply',
|
||||
data
|
||||
);
|
||||
if (res.code === 0) {
|
||||
return res.message;
|
||||
try {
|
||||
const res = await request.post<ApiResult<unknown>>(
|
||||
'/shop/shop-dealer-apply',
|
||||
data
|
||||
);
|
||||
if (res.code === 0) {
|
||||
return res.message || '提交成功';
|
||||
}
|
||||
// 直接抛出包含服务器错误信息的错误
|
||||
const error = new Error(res.message || '提交失败');
|
||||
(error as any).code = res.code;
|
||||
(error as any).data = res.data;
|
||||
throw error;
|
||||
} catch (error: any) {
|
||||
// 如果已经是我们处理过的错误,直接抛出
|
||||
if (error.message && error.code !== undefined) {
|
||||
throw error;
|
||||
}
|
||||
|
||||
// 处理网络错误或其他异常
|
||||
console.error('添加分销商申请失败:', error);
|
||||
|
||||
// 尝试从响应中提取错误信息
|
||||
if (error.response?.data) {
|
||||
const responseData = error.response.data;
|
||||
if (responseData.message) {
|
||||
const newError = new Error(responseData.message);
|
||||
(newError as any).code = responseData.code;
|
||||
throw newError;
|
||||
}
|
||||
}
|
||||
|
||||
// 默认错误处理
|
||||
throw new Error(error.message || '网络错误,请重试');
|
||||
}
|
||||
return Promise.reject(new Error(res.message));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改分销商申请记录表
|
||||
*/
|
||||
export async function updateShopDealerApply(data: ShopDealerApply) {
|
||||
const res = await request.put<ApiResult<unknown>>(
|
||||
'/shop/shop-dealer-apply',
|
||||
data
|
||||
);
|
||||
if (res.code === 0) {
|
||||
return res.message;
|
||||
try {
|
||||
const res = await request.put<ApiResult<unknown>>(
|
||||
'/shop/shop-dealer-apply',
|
||||
data
|
||||
);
|
||||
if (res.code === 0) {
|
||||
return res.message || '修改成功';
|
||||
}
|
||||
// 直接抛出包含服务器错误信息的错误
|
||||
const error = new Error(res.message || '修改失败');
|
||||
(error as any).code = res.code;
|
||||
(error as any).data = res.data;
|
||||
throw error;
|
||||
} catch (error: any) {
|
||||
// 如果已经是我们处理过的错误,直接抛出
|
||||
if (error.message && error.code !== undefined) {
|
||||
throw error;
|
||||
}
|
||||
|
||||
// 处理网络错误或其他异常
|
||||
console.error('修改分销商申请失败:', error);
|
||||
|
||||
// 尝试从响应中提取错误信息
|
||||
if (error.response?.data) {
|
||||
const responseData = error.response.data;
|
||||
if (responseData.message) {
|
||||
const newError = new Error(responseData.message);
|
||||
(newError as any).code = responseData.code;
|
||||
throw newError;
|
||||
}
|
||||
}
|
||||
|
||||
// 默认错误处理
|
||||
throw new Error(error.message || '网络错误,请重试');
|
||||
}
|
||||
return Promise.reject(new Error(res.message));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { ShopDealerCapital, ShopDealerCapitalParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { ShopDealerReferee, ShopDealerRefereeParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { ShopDealerSetting, ShopDealerSettingParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { ShopDealerUser, ShopDealerUserParam } from './model';
|
||||
|
||||
@@ -88,11 +88,11 @@ export async function removeBatchShopDealerUser(data: (number | undefined)[]) {
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据id查询分销商用户记录表
|
||||
* 根据userId查询分销商用户记录表
|
||||
*/
|
||||
export async function getShopDealerUser(id: number) {
|
||||
export async function getShopDealerUser(userId: number) {
|
||||
const res = await request.get<ApiResult<ShopDealerUser>>(
|
||||
'/shop/shop-dealer-user/' + id
|
||||
'/shop/shop-dealer-user/' + userId
|
||||
);
|
||||
if (res.code === 0 && res.data) {
|
||||
return res.data;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { ShopDealerWithdraw, ShopDealerWithdrawParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { ShopExpress, ShopExpressParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { ShopExpressTemplate, ShopExpressTemplateParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { ShopExpressTemplateDetail, ShopExpressTemplateDetailParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import { ShopGoodsRoleCommission, ShopGoodsRoleCommissionParam } from '@/api/shop/shopGoodsRoleCommission/model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { ShopMerchantAccount, ShopMerchantAccountParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { ShopMerchantApply, ShopMerchantApplyParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { ShopMerchantCount, ShopMerchantCountParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { ShopMerchantType, ShopMerchantTypeParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { ShopOrderGoods, ShopOrderGoodsParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult } from '@/api/index';
|
||||
import type { AccessKey, AccessKeyParam } from './model';
|
||||
import { PageResult } from '@/api/index';
|
||||
|
||||
2
src/api/system/cache/index.ts
vendored
2
src/api/system/cache/index.ts
vendored
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult } from '@/api/index';
|
||||
import type { Cache, CacheParam } from './model';
|
||||
import {SERVER_API_URL} from "@/utils/server";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type {
|
||||
ChatConversation,
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { ChatConversation, ChatConversationParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { ChatMessage, ChatMessageParam } from './model';
|
||||
import {SERVER_API_URL} from "@/utils/server";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type {ApiResult, PageResult} from '@/api';
|
||||
import type {CompanyComment, CompanyCommentParam} from './model';
|
||||
import {SERVER_API_URL} from "@/utils/server";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { CompanyUrl, CompanyUrlParam } from './model';
|
||||
import {SERVER_API_URL} from '@/config/index';
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { Order, OrderParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { OrderGoods, OrderGoodsParam } from './model';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { Setting, SettingParam } from './model';
|
||||
import {SERVER_API_URL} from "@/utils/server";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { UserCollection, UserCollectionParam } from './model';
|
||||
import {SERVER_API_URL} from "@/utils/server";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult } from '@/api/index';
|
||||
import type { UserRole, UserRoleParam } from './model';
|
||||
import {SERVER_API_URL} from "@/utils/server";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { Version, VersionParam } from './model';
|
||||
import type { Menu } from '../menu/model';
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { UserBalanceLog, UserBalanceLogParam } from './model';
|
||||
import {SERVER_API_URL} from "@/utils/server";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import request from '@/utils/request';
|
||||
import request from '@/utils/request-legacy';
|
||||
import type { ApiResult, PageResult } from '@/api/index';
|
||||
import type { UserPointsLog, UserPointsLogParam, UserPointsStats } from './model';
|
||||
import {SERVER_API_URL} from "@/utils/server";
|
||||
|
||||
Reference in New Issue
Block a user