refactor(api): 更新 API调用以使用新的请求工具- 将所有 API 调用中的 request-legacy 替换为 request

- 优化部分 API 调用的参数传递方式
- 统一导入 ApiResult 和 PageResult 类型的路径

REQUEST_USAGE.md

@@ -0,0 +1,83 @@
+# Request 工具使用说明
+
+## 概述
+
+`src/utils/request.ts` 已经适配了后台生成的 API 代码格式，支持两种使用方式：
+
+## 1. 标准方式（适配后台生成代码）
+
+后台生成的代码使用 `request.get<ApiResult>` 格式，返回完整的 `ApiResult` 响应：
+
+```typescript
+// 后台生成的代码格式
+export async function pageCmsNavigation(params: CmsNavigationParam) {
+  const res = await request.get<ApiResult<PageResult<CmsNavigation>>>(
+    '/cms/cms-navigation/page',
+    params
+  );
+  if (res.code === 0) {
+    return res.data;
+  }
+  return Promise.reject(new Error(res.message));
+}
+```
+
+## 2. 便捷方式（自动提取数据）
+
+如果你想要自动提取 `data` 字段，可以使用 `getData` 系列方法：
+
+```typescript
+import request from '@/utils/request';
+
+// 自动提取 data 字段
+const data = await request.getData<CmsNavigation[]>('/cms/cms-navigation');
+
+// 等价于
+const res = await request.get<ApiResult<CmsNavigation[]>>('/cms/cms-navigation');
+const data = res.data;
+```
+
+## 可用方法
+
+### 标准方法（返回完整 ApiResult）
+- `request.get<T>(url, params?, config?)`
+- `request.post<T>(url, data?, config?)`
+- `request.put<T>(url, data?, config?)`
+- `request.del<T>(url, data?, config?)`
+- `request.patch<T>(url, data?, config?)`
+
+### 便捷方法（自动提取 data）
+- `request.getData<T>(url, params?, config?)`
+- `request.postData<T>(url, data?, config?)`
+- `request.putData<T>(url, data?, config?)`
+- `request.delData<T>(url, data?, config?)`
+
+## 配置选项
+
+```typescript
+interface RequestConfig {
+  url: string;
+  method?: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH';
+  data?: any;
+  header?: Record<string, string>;
+  timeout?: number;
+  retry?: number;
+  showLoading?: boolean;
+  showError?: boolean;
+  returnRaw?: boolean; // 内部使用，控制返回格式
+}
+```
+
+## 错误处理
+
+所有请求都会自动处理：
+- 网络错误
+- 超时错误
+- 认证错误（自动清除登录信息并跳转）
+- 业务错误（显示错误提示）
+
+## 注意事项
+
+1. **后台生成的代码无需修改**，直接使用 `request.get<ApiResult>` 格式
+2. **新写的代码**可以选择使用 `getData` 系列方法来简化代码
+3. 所有方法都支持自动重试、错误处理、认证等功能

src/api/bszx/bszxBm/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { BszxBm, BszxBmParam } from './model';
 

src/api/bszx/bszxClass/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { BszxClass, BszxClassParam } from './model';
 

src/api/bszx/bszxEra/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { BszxEra, BszxEraParam } from './model';
 

src/api/bszx/bszxGrade/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { BszxGrade, BszxGradeParam } from './model';
 

src/api/bszx/bszxPay/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api';
 import type {BszxPay, BszxPayParam} from "@/api/bszx/bszxPay/model";
 import type {BszxBm,BszxBmParam} from "@/api/bszx/bszxBm/model";

src/api/cms/cmsAd/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { CmsAd, CmsAdParam } from './model';
 

src/api/cms/cmsAdRecord/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { CmsAdRecord, CmsAdRecordParam } from './model';
 

src/api/cms/cmsArticle/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type {ApiResult, PageResult} from '@/api/index';
 import type {CmsArticle, CmsArticleParam} from './model';
 

src/api/cms/cmsArticleCategory/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { CmsArticleCategory, CmsArticleCategoryParam } from './model';
 

src/api/cms/cmsArticleComment/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { CmsArticleComment, CmsArticleCommentParam } from './model';
 

src/api/cms/cmsArticleContent/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { CmsArticleContent, CmsArticleContentParam } from './model';
 

src/api/cms/cmsArticleCount/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { CmsArticleCount, CmsArticleCountParam } from './model';
 

src/api/cms/cmsArticleLike/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { CmsArticleLike, CmsArticleLikeParam } from './model';
 

src/api/cms/cmsComponents/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { CmsComponents, CmsComponentsParam } from './model';
 

src/api/cms/cmsDesign/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { CmsDesign, CmsDesignParam } from './model';
 

src/api/cms/cmsDesignRecord/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { CmsDesignRecord, CmsDesignRecordParam } from './model';
 

src/api/cms/cmsDocs/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { CmsDocs, CmsDocsParam } from './model';
 

src/api/cms/cmsDocsBook/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { CmsDocsBook, CmsDocsBookParam } from './model';
 

src/api/cms/cmsDocsContent/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { CmsDocsContent, CmsDocsContentParam } from './model';
 

src/api/cms/cmsDomain/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { CmsDomain, CmsDomainParam } from './model';
 import {SERVER_API_URL} from "@/utils/server";

src/api/cms/cmsForm/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { CmsForm, CmsFormParam } from './model';
 

src/api/cms/cmsFormRecord/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { CmsFormRecord, CmsFormRecordParam } from './model';
 

src/api/cms/cmsLang/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { CmsLang, CmsLangParam } from './model';
 

src/api/cms/cmsLangLog/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { CmsLangLog, CmsLangLogParam } from './model';
 

src/api/cms/cmsLink/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { CmsLink, CmsLinkParam } from './model';
 

src/api/cms/cmsModel/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { CmsModel, CmsModelParam } from './model';
 

src/api/cms/cmsMp/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { CmsMp, CmsMpParam } from './model';
 

src/api/cms/cmsMpAd/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { CmsMpAd, CmsMpAdParam } from './model';
 

src/api/cms/cmsMpField/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { CmsMpField, CmsMpFieldParam } from './model';
 

src/api/cms/cmsMpMenu/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { CmsMpMenu, CmsMpMenuParam } from './model';
 

src/api/cms/cmsMpPages/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { CmsMpPages, CmsMpPagesParam } from './model';
 

src/api/cms/cmsNavigation/index.ts

@@ -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 { CmsNavigation, CmsNavigationParam } from './model';
 
 /**
@@ -8,9 +8,7 @@ import type { CmsNavigation, CmsNavigationParam } from './model';
 export async function pageCmsNavigation(params: CmsNavigationParam) {
   const res = await request.get<ApiResult<PageResult<CmsNavigation>>>(
     '/cms/cms-navigation/page',
-    {
     params
-    }
   );
   if (res.code === 0) {
     return res.data;
@@ -38,9 +36,7 @@ export async function listCmsNavigation(params?: CmsNavigationParam) {
 export async function treeNavigation(params?: CmsNavigationParam) {
   const res = await request.get<ApiResult<CmsNavigation[]>>(
     '/cms/cms-navigation/tree',
-    {
     params
-    }
   );
   if (res.code === 0 && res.data) {
     return res.data;
@@ -94,9 +90,7 @@ export async function removeCmsNavigation(id?: number) {
 export async function removeBatchCmsNavigation(data: (number | undefined)[]) {
   const res = await request.del<ApiResult<unknown>>(
     '/cms/cms-navigation/batch',
-    {
     data
-    }
   );
   if (res.code === 0) {
     return res.message;
@@ -120,9 +114,7 @@ export async function getCmsNavigation(id: number) {
 export async function getNavigationByPath(params: CmsNavigationParam) {
   const res = await request.get<ApiResult<CmsNavigation>>(
       '/cms/cms-navigation/getNavigationByPath',
-      {
       params
-      }
   );
   if (res.code === 0 && res.data) {
     return res.data;

src/api/cms/cmsOrder/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { CmsOrder, CmsOrderParam } from './model';
 

src/api/cms/cmsSpec/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { CmsSpec, CmsSpecParam } from './model';
 

src/api/cms/cmsSpecValue/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { CmsSpecValue, CmsSpecValueParam } from './model';
 

src/api/cms/cmsWebsite/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { CmsWebsite, CmsWebsiteParam } from './model';
 

src/api/cms/cmsWebsiteField/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type {CmsWebsiteField, CmsWebsiteFieldParam, Config} from './model';
 

src/api/cms/link/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { Link, LinkParam } from './model';
 

src/api/cms/mpOfficialMenu/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { MpOfficialMenu, MpOfficialMenuParam } from './model';
 

src/api/layout/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult } from '@/api/index';
 import type { User } from '@/api/system/user/model';
 import type { UpdatePasswordParam } from './model';

src/api/passport/login/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult } from '@/api';
 import type {
   LoginParam,

src/api/shop/shopArticle/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopArticle, ShopArticleParam } from './model';
 

src/api/shop/shopCommissionRole/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopCommissionRole, ShopCommissionRoleParam } from './model';
 

src/api/shop/shopCoupon/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopCoupon, ShopCouponParam } from './model';
 

src/api/shop/shopDealerCapital/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopDealerCapital, ShopDealerCapitalParam } from './model';
 

src/api/shop/shopDealerOrder/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopDealerOrder, ShopDealerOrderParam } from './model';
 

src/api/shop/shopDealerReferee/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopDealerReferee, ShopDealerRefereeParam } from './model';
 

src/api/shop/shopDealerSetting/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopDealerSetting, ShopDealerSettingParam } from './model';
 

src/api/shop/shopDealerUser/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopDealerUser, ShopDealerUserParam } from './model';
 

src/api/shop/shopDealerWithdraw/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopDealerWithdraw, ShopDealerWithdrawParam } from './model';
 

src/api/shop/shopExpress/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopExpress, ShopExpressParam } from './model';
 

src/api/shop/shopExpressTemplate/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopExpressTemplate, ShopExpressTemplateParam } from './model';
 

src/api/shop/shopExpressTemplateDetail/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopExpressTemplateDetail, ShopExpressTemplateDetailParam } from './model';
 

src/api/shop/shopGift/index.ts

@@ -1,6 +1,6 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
-import type { ShopGift, ShopGiftParam, GiftRedeemParam, GiftUseParam } from './model';
+import {ShopGift, ShopGiftParam, GiftRedeemParam, GiftUseParam, QRCodeParam} from './model';
 
 /**
  * 分页查询礼品卡
@@ -196,12 +196,12 @@ export async function exportShopGift(ids?: number[]) {
 }
 
 /**
- * 生成礼品卡核销码
+ * 生成礼品卡核销码(可用)
  */
-export async function generateVerificationCode(giftId: number) {
-  const res = await request.post<ApiResult<{ verificationCode: string; expireTime: string }>>(
-    '/shop/shop-gift/generate-verification-code',
-    { giftId }
+export async function generateVerificationCode(data: QRCodeParam) {
+  const res = await request.post<ApiResult<unknown>>(
+    '/qr-code/create-encrypted-qr-code',
+    data
   );
   if (res.code === 0) {
     return res.data;
@@ -243,3 +243,18 @@ export async function completeVerification(params: {
   }
   return Promise.reject(new Error(res.message));
 }
+
+/**
+ * 解密二维码数据
+ */
+export async function decryptQrData(params: { token: string; encryptedData: string }) {
+  const res = await request.post<ApiResult<string>>(
+    '/qr-code/decrypt-qr-data',
+    params
+  );
+  if (res.code === 0) {
+    return res.data;
+  }
+  return Promise.reject(new Error(res.message));
+}
+

src/api/shop/shopGift/model/index.ts

@@ -30,6 +30,8 @@ export interface ShopGift {
   validDays?: number;
   // 操作人
   operatorUserId?: number;
+  // 操作人名称
+  operatorUserName?: string;
   // 是否展示
   isShow?: string;
   // 状态 (0未使用 1已使用 2已过期 3已失效)
@@ -84,7 +86,7 @@ export interface ShopGiftParam extends PageParam {
   // 是否过期筛选
   isExpired?: boolean;
   // 排序字段
-  sortBy?: 'createTime' | 'expireTime' | 'faceValue' | 'useTime';
+  sortBy?: 'createTime' | 'expireTime' | 'faceValue' | 'takeTime';
   // 排序方向
   sortOrder?: 'asc' | 'desc';
 }
@@ -104,9 +106,22 @@ export interface GiftRedeemParam {
  */
 export interface GiftUseParam {
   // 礼品卡ID
-  giftId: number;
+  giftId?: number;
   // 使用地址/门店
   useLocation?: string;
   // 使用备注
   useNote?: string;
 }
+
+export interface QRCodeParam {
+  // 二维码数据
+  data?: string;
+  // 二维码尺寸
+  width?: number;
+  // 二维码高度
+  height?: number;
+  // 二维码过期时间
+  expireMinutes?: number;
+  // 业务类型
+  businessType?: string;
+}

src/api/shop/shopGoods/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopGoods, ShopGoodsParam } from './model';
 

src/api/shop/shopGoodsCategory/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopGoodsCategory, ShopGoodsCategoryParam } from './model';
 

src/api/shop/shopGoodsRoleCommission/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import { ShopGoodsRoleCommission, ShopGoodsRoleCommissionParam } from '@/api/shop/shopGoodsRoleCommission/model';
 

src/api/shop/shopGoodsSku/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import { ShopGoodsSpec } from '@/api/shop/shopGoodsSpec/model';
 import { ShopGoodsSku, ShopGoodsSkuParam } from '@/api/shop/shopGoodsSku/model';

src/api/shop/shopGoodsSpec/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopGoodsSpec, ShopGoodsSpecParam } from './model';
 

src/api/shop/shopMerchant/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopMerchant, ShopMerchantParam } from './model';
 

src/api/shop/shopMerchantAccount/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopMerchantAccount, ShopMerchantAccountParam } from './model';
 

src/api/shop/shopMerchantApply/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopMerchantApply, ShopMerchantApplyParam } from './model';
 

src/api/shop/shopMerchantCount/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopMerchantCount, ShopMerchantCountParam } from './model';
 

src/api/shop/shopMerchantType/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopMerchantType, ShopMerchantTypeParam } from './model';
 

src/api/shop/shopOrder/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopOrder, ShopOrderParam, OrderCreateRequest } from './model';
 

src/api/shop/shopOrderGoods/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopOrderGoods, ShopOrderGoodsParam } from './model';
 

src/api/shop/shopSpec/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import { ShopSpec, ShopSpecParam } from '@/api/shop/shopSpec/model';
 

src/api/shop/shopSpecValue/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopSpecValue, ShopSpecValueParam } from './model';
 

src/api/shop/shopUserAddress/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopUserAddress, ShopUserAddressParam } from './model';
 

src/api/shop/shopUserCoupon/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopUserCoupon, ShopUserCouponParam } from './model';
 

src/api/shop/shopUserCoupon/model/index.ts

@@ -43,7 +43,7 @@ export interface ShopUserCoupon {
   // 剩余小时数（后端计算）
   hoursRemaining?: number;
   // 使用时间
-  useTime?: string;
+  takeTime?: string;
   // 使用订单ID
   orderId?: string;
   // 使用订单号

src/api/shop/shopUserReferee/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ShopUserReferee, ShopUserRefereeParam } from './model';
 

src/api/system/access-key/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult } from '@/api/index';
 import type { AccessKey, AccessKeyParam } from './model';
 import { PageResult } from '@/api/index';

src/api/system/cache/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult } from '@/api/index';
 import type { Cache, CacheParam } from './model';
 import {SERVER_API_URL} from "@/utils/server";

src/api/system/chat/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type {
   ChatConversation,

src/api/system/chatConversation/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ChatConversation, ChatConversationParam } from './model';
 

src/api/system/chatMessage/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { ChatMessage, ChatMessageParam } from './model';
 import {SERVER_API_URL} from "@/utils/server";

src/api/system/company/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult } from '@/api/index';
 import type { Company, CompanyParam } from './model';
 import { PageResult } from '@/api/index';

src/api/system/companyComment/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type {ApiResult, PageResult} from '@/api';
 import type {CompanyComment, CompanyCommentParam} from './model';
 import {SERVER_API_URL} from "@/utils/server";

src/api/system/companyContent/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api';
 import type { CompanyContent, CompanyContentParam } from './model';
 import {SERVER_API_URL} from "@/utils/server";

src/api/system/companyGit/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { CompanyGit, CompanyGitParam } from './model';
 import { SERVER_API_URL } from '@/config/index';

src/api/system/companyParameter/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { CompanyParameter, CompanyParameterParam } from './model';
 import {SERVER_API_URL} from '@/config/index';

src/api/system/companyUrl/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { CompanyUrl, CompanyUrlParam } from './model';
 import {SERVER_API_URL} from '@/config/index';

src/api/system/dict-data/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { DictData, DictDataParam } from './model';
 import {SERVER_API_URL} from "@/utils/server";

src/api/system/dict/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult } from '@/api/index';
 import type { Dict, DictParam } from './model';
 import {SERVER_API_URL} from "@/utils/server";

src/api/system/dictionary-data/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { DictionaryData, DictionaryDataParam } from './model';
 import {SERVER_API_URL} from "@/utils/server";

src/api/system/dictionary/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult } from '@/api/index';
 import type { Dictionary, DictionaryParam } from './model';
 import {SERVER_API_URL} from "@/utils/server";

src/api/system/environment/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { Environment, EnvironmentParam } from './model/index';
 import {SERVER_API_URL} from "@/utils/server";

src/api/system/file/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import Taro from '@tarojs/taro'
 import dayjs from 'dayjs';
 import crypto from 'crypto-js';

src/api/system/login-record/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { LoginRecord, LoginRecordParam } from './model';
 import {SERVER_API_URL} from "@/utils/server";

src/api/system/menu/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult } from '@/api/index';
 import type { Menu, MenuParam } from './model';
 import {SERVER_API_URL} from "@/utils/server";

src/api/system/modules/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { Modules, ModulesParam } from './model';
 import {SERVER_API_URL} from "@/utils/server";

src/api/system/operation-record/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { OperationRecord, OperationRecordParam } from './model';
 import {SERVER_API_URL} from "@/utils/server";

src/api/system/order/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { Order, OrderParam } from './model';
 

src/api/system/orderGoods/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { OrderGoods, OrderGoodsParam } from './model';
 

src/api/system/organization/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { Organization, OrganizationParam } from './model';
 import {SERVER_API_URL} from "@/utils/server";

src/api/system/parameter/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api/index';
 import type { Parameter, ParameterParam } from './model';
 import {SERVER_API_URL} from "@/utils/server";

src/api/system/payment/index.ts

@@ -1,4 +1,4 @@
-import request from '@/utils/request-legacy';
+import request from '@/utils/request';
 import type {ApiResult, PageResult} from '@/api/index';
 import type {Payment, PaymentParam} from './model';
 import type {ShopOrder} from '@/api/shop/shopOrder/model';