diff --git a/config/env.ts b/config/env.ts index c92883b..44ddb26 100644 --- a/config/env.ts +++ b/config/env.ts @@ -2,7 +2,7 @@ export const ENV_CONFIG = { // 开发环境 development: { - API_BASE_URL: 'https://cms-api.websoft.top/api', + API_BASE_URL: 'http://127.0.0.1:9200/api', APP_NAME: '开发环境', DEBUG: 'true', }, diff --git a/src/admin/article/add.tsx b/src/admin/article/add.tsx index 0d85f74..493b1d3 100644 --- a/src/admin/article/add.tsx +++ b/src/admin/article/add.tsx @@ -314,7 +314,7 @@ const AddShopArticle = () => { {/* 提交按钮 */} - } /> + submitSucceed} icon={} /> ); diff --git a/src/api/bszx/bszxClass/index.ts b/src/api/bszx/bszxClass/index.ts index 92ea520..a637208 100644 --- a/src/api/bszx/bszxClass/index.ts +++ b/src/api/bszx/bszxClass/index.ts @@ -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'; diff --git a/src/api/bszx/bszxEra/index.ts b/src/api/bszx/bszxEra/index.ts index a1f9375..7c923c0 100644 --- a/src/api/bszx/bszxEra/index.ts +++ b/src/api/bszx/bszxEra/index.ts @@ -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'; diff --git a/src/api/bszx/bszxGrade/index.ts b/src/api/bszx/bszxGrade/index.ts index d0cb799..edfd8d4 100644 --- a/src/api/bszx/bszxGrade/index.ts +++ b/src/api/bszx/bszxGrade/index.ts @@ -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'; diff --git a/src/api/bszx/bszxPay/index.ts b/src/api/bszx/bszxPay/index.ts index 989d96d..cecfa1b 100644 --- a/src/api/bszx/bszxPay/index.ts +++ b/src/api/bszx/bszxPay/index.ts @@ -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"; diff --git a/src/api/cms/cmsArticleCategory/index.ts b/src/api/cms/cmsArticleCategory/index.ts index 3a3a2b8..77d722b 100644 --- a/src/api/cms/cmsArticleCategory/index.ts +++ b/src/api/cms/cmsArticleCategory/index.ts @@ -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'; diff --git a/src/api/cms/cmsArticleComment/index.ts b/src/api/cms/cmsArticleComment/index.ts index c7ef29b..fdb4fa5 100644 --- a/src/api/cms/cmsArticleComment/index.ts +++ b/src/api/cms/cmsArticleComment/index.ts @@ -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'; diff --git a/src/api/cms/cmsArticleContent/index.ts b/src/api/cms/cmsArticleContent/index.ts index 2966bb3..fe04fad 100644 --- a/src/api/cms/cmsArticleContent/index.ts +++ b/src/api/cms/cmsArticleContent/index.ts @@ -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'; diff --git a/src/api/cms/cmsArticleCount/index.ts b/src/api/cms/cmsArticleCount/index.ts index fd09945..67abc18 100644 --- a/src/api/cms/cmsArticleCount/index.ts +++ b/src/api/cms/cmsArticleCount/index.ts @@ -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'; diff --git a/src/api/cms/cmsArticleLike/index.ts b/src/api/cms/cmsArticleLike/index.ts index c7aa59a..96035f0 100644 --- a/src/api/cms/cmsArticleLike/index.ts +++ b/src/api/cms/cmsArticleLike/index.ts @@ -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'; diff --git a/src/api/cms/cmsComponents/index.ts b/src/api/cms/cmsComponents/index.ts index 54f42b5..7fdfcad 100644 --- a/src/api/cms/cmsComponents/index.ts +++ b/src/api/cms/cmsComponents/index.ts @@ -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'; diff --git a/src/api/cms/cmsDesign/index.ts b/src/api/cms/cmsDesign/index.ts index aa71758..2343e69 100644 --- a/src/api/cms/cmsDesign/index.ts +++ b/src/api/cms/cmsDesign/index.ts @@ -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'; diff --git a/src/api/cms/cmsDesignRecord/index.ts b/src/api/cms/cmsDesignRecord/index.ts index 8a41a2c..adcdb7d 100644 --- a/src/api/cms/cmsDesignRecord/index.ts +++ b/src/api/cms/cmsDesignRecord/index.ts @@ -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'; diff --git a/src/api/cms/cmsDocs/index.ts b/src/api/cms/cmsDocs/index.ts index b7bb7ef..7c73ad7 100644 --- a/src/api/cms/cmsDocs/index.ts +++ b/src/api/cms/cmsDocs/index.ts @@ -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'; diff --git a/src/api/cms/cmsDocsContent/index.ts b/src/api/cms/cmsDocsContent/index.ts index d4332b9..dc1d2ad 100644 --- a/src/api/cms/cmsDocsContent/index.ts +++ b/src/api/cms/cmsDocsContent/index.ts @@ -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'; diff --git a/src/api/cms/cmsDomain/index.ts b/src/api/cms/cmsDomain/index.ts index acb8acb..b5f19b9 100644 --- a/src/api/cms/cmsDomain/index.ts +++ b/src/api/cms/cmsDomain/index.ts @@ -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"; diff --git a/src/api/cms/cmsForm/index.ts b/src/api/cms/cmsForm/index.ts index 6098911..1a18887 100644 --- a/src/api/cms/cmsForm/index.ts +++ b/src/api/cms/cmsForm/index.ts @@ -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'; diff --git a/src/api/cms/cmsFormRecord/index.ts b/src/api/cms/cmsFormRecord/index.ts index 01e432b..ddef455 100644 --- a/src/api/cms/cmsFormRecord/index.ts +++ b/src/api/cms/cmsFormRecord/index.ts @@ -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'; diff --git a/src/api/cms/cmsLang/index.ts b/src/api/cms/cmsLang/index.ts index f70aca5..a5fe580 100644 --- a/src/api/cms/cmsLang/index.ts +++ b/src/api/cms/cmsLang/index.ts @@ -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'; diff --git a/src/api/cms/cmsLangLog/index.ts b/src/api/cms/cmsLangLog/index.ts index 2c25a83..bb895cc 100644 --- a/src/api/cms/cmsLangLog/index.ts +++ b/src/api/cms/cmsLangLog/index.ts @@ -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'; diff --git a/src/api/cms/cmsLink/index.ts b/src/api/cms/cmsLink/index.ts index 192ddaa..8812545 100644 --- a/src/api/cms/cmsLink/index.ts +++ b/src/api/cms/cmsLink/index.ts @@ -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'; diff --git a/src/api/cms/cmsMp/index.ts b/src/api/cms/cmsMp/index.ts index c17df7e..cce9f5c 100644 --- a/src/api/cms/cmsMp/index.ts +++ b/src/api/cms/cmsMp/index.ts @@ -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'; diff --git a/src/api/cms/cmsMpField/index.ts b/src/api/cms/cmsMpField/index.ts index ee35909..80f77b3 100644 --- a/src/api/cms/cmsMpField/index.ts +++ b/src/api/cms/cmsMpField/index.ts @@ -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'; diff --git a/src/api/cms/cmsMpMenu/index.ts b/src/api/cms/cmsMpMenu/index.ts index 5b61d0c..cad908f 100644 --- a/src/api/cms/cmsMpMenu/index.ts +++ b/src/api/cms/cmsMpMenu/index.ts @@ -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'; diff --git a/src/api/cms/cmsMpPages/index.ts b/src/api/cms/cmsMpPages/index.ts index 0b85908..32b28dc 100644 --- a/src/api/cms/cmsMpPages/index.ts +++ b/src/api/cms/cmsMpPages/index.ts @@ -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'; diff --git a/src/api/cms/cmsWebsite/index.ts b/src/api/cms/cmsWebsite/index.ts index 279e957..54d4c67 100644 --- a/src/api/cms/cmsWebsite/index.ts +++ b/src/api/cms/cmsWebsite/index.ts @@ -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'; diff --git a/src/api/cms/cmsWebsiteField/index.ts b/src/api/cms/cmsWebsiteField/index.ts index a302056..7168387 100644 --- a/src/api/cms/cmsWebsiteField/index.ts +++ b/src/api/cms/cmsWebsiteField/index.ts @@ -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'; diff --git a/src/api/cms/link/index.ts b/src/api/cms/link/index.ts index abb0b41..89097d7 100644 --- a/src/api/cms/link/index.ts +++ b/src/api/cms/link/index.ts @@ -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'; diff --git a/src/api/cms/mpOfficialMenu/index.ts b/src/api/cms/mpOfficialMenu/index.ts index 116d5ec..5adeff6 100644 --- a/src/api/cms/mpOfficialMenu/index.ts +++ b/src/api/cms/mpOfficialMenu/index.ts @@ -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'; diff --git a/src/api/shop/shopCommissionRole/index.ts b/src/api/shop/shopCommissionRole/index.ts index e019af0..0850438 100644 --- a/src/api/shop/shopCommissionRole/index.ts +++ b/src/api/shop/shopCommissionRole/index.ts @@ -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'; diff --git a/src/api/shop/shopCoupon/index.ts b/src/api/shop/shopCoupon/index.ts index afe35be..2fbfcab 100644 --- a/src/api/shop/shopCoupon/index.ts +++ b/src/api/shop/shopCoupon/index.ts @@ -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'; diff --git a/src/api/shop/shopDealerApply/index.ts b/src/api/shop/shopDealerApply/index.ts index c490e19..c974214 100644 --- a/src/api/shop/shopDealerApply/index.ts +++ b/src/api/shop/shopDealerApply/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 { 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>( - '/shop/shop-dealer-apply', - data - ); - if (res.code === 0) { - return res.message; + try { + const res = await request.post>( + '/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>( - '/shop/shop-dealer-apply', - data - ); - if (res.code === 0) { - return res.message; + try { + const res = await request.put>( + '/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)); } /** diff --git a/src/api/shop/shopDealerCapital/index.ts b/src/api/shop/shopDealerCapital/index.ts index 4a4d54c..1015aaf 100644 --- a/src/api/shop/shopDealerCapital/index.ts +++ b/src/api/shop/shopDealerCapital/index.ts @@ -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'; diff --git a/src/api/shop/shopDealerReferee/index.ts b/src/api/shop/shopDealerReferee/index.ts index ce69218..d2a93e9 100644 --- a/src/api/shop/shopDealerReferee/index.ts +++ b/src/api/shop/shopDealerReferee/index.ts @@ -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'; diff --git a/src/api/shop/shopDealerSetting/index.ts b/src/api/shop/shopDealerSetting/index.ts index 2a7b20a..cd98c34 100644 --- a/src/api/shop/shopDealerSetting/index.ts +++ b/src/api/shop/shopDealerSetting/index.ts @@ -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'; diff --git a/src/api/shop/shopDealerUser/index.ts b/src/api/shop/shopDealerUser/index.ts index a33c078..4c18d0c 100644 --- a/src/api/shop/shopDealerUser/index.ts +++ b/src/api/shop/shopDealerUser/index.ts @@ -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>( - '/shop/shop-dealer-user/' + id + '/shop/shop-dealer-user/' + userId ); if (res.code === 0 && res.data) { return res.data; diff --git a/src/api/shop/shopDealerWithdraw/index.ts b/src/api/shop/shopDealerWithdraw/index.ts index 0429d78..1df7545 100644 --- a/src/api/shop/shopDealerWithdraw/index.ts +++ b/src/api/shop/shopDealerWithdraw/index.ts @@ -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'; diff --git a/src/api/shop/shopExpress/index.ts b/src/api/shop/shopExpress/index.ts index 385aeed..b607277 100644 --- a/src/api/shop/shopExpress/index.ts +++ b/src/api/shop/shopExpress/index.ts @@ -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'; diff --git a/src/api/shop/shopExpressTemplate/index.ts b/src/api/shop/shopExpressTemplate/index.ts index 4e00b8f..d52e870 100644 --- a/src/api/shop/shopExpressTemplate/index.ts +++ b/src/api/shop/shopExpressTemplate/index.ts @@ -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'; diff --git a/src/api/shop/shopExpressTemplateDetail/index.ts b/src/api/shop/shopExpressTemplateDetail/index.ts index 7afd870..a34cfab 100644 --- a/src/api/shop/shopExpressTemplateDetail/index.ts +++ b/src/api/shop/shopExpressTemplateDetail/index.ts @@ -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'; diff --git a/src/api/shop/shopGoodsRoleCommission/index.ts b/src/api/shop/shopGoodsRoleCommission/index.ts index 160cb3a..69a1a84 100644 --- a/src/api/shop/shopGoodsRoleCommission/index.ts +++ b/src/api/shop/shopGoodsRoleCommission/index.ts @@ -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'; diff --git a/src/api/shop/shopMerchantAccount/index.ts b/src/api/shop/shopMerchantAccount/index.ts index 8c5d6cb..fec305c 100644 --- a/src/api/shop/shopMerchantAccount/index.ts +++ b/src/api/shop/shopMerchantAccount/index.ts @@ -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'; diff --git a/src/api/shop/shopMerchantApply/index.ts b/src/api/shop/shopMerchantApply/index.ts index 663a5f6..464d092 100644 --- a/src/api/shop/shopMerchantApply/index.ts +++ b/src/api/shop/shopMerchantApply/index.ts @@ -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'; diff --git a/src/api/shop/shopMerchantCount/index.ts b/src/api/shop/shopMerchantCount/index.ts index 1f5ce2c..869648a 100644 --- a/src/api/shop/shopMerchantCount/index.ts +++ b/src/api/shop/shopMerchantCount/index.ts @@ -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'; diff --git a/src/api/shop/shopMerchantType/index.ts b/src/api/shop/shopMerchantType/index.ts index f8bec65..850f488 100644 --- a/src/api/shop/shopMerchantType/index.ts +++ b/src/api/shop/shopMerchantType/index.ts @@ -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'; diff --git a/src/api/shop/shopOrderGoods/index.ts b/src/api/shop/shopOrderGoods/index.ts index 4c74d18..9c900ce 100644 --- a/src/api/shop/shopOrderGoods/index.ts +++ b/src/api/shop/shopOrderGoods/index.ts @@ -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'; diff --git a/src/api/system/access-key/index.ts b/src/api/system/access-key/index.ts index b77baa2..f419375 100644 --- a/src/api/system/access-key/index.ts +++ b/src/api/system/access-key/index.ts @@ -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'; diff --git a/src/api/system/cache/index.ts b/src/api/system/cache/index.ts index 4fc45bf..bbdc4eb 100644 --- a/src/api/system/cache/index.ts +++ b/src/api/system/cache/index.ts @@ -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"; diff --git a/src/api/system/chat/index.ts b/src/api/system/chat/index.ts index e1681c8..6037368 100644 --- a/src/api/system/chat/index.ts +++ b/src/api/system/chat/index.ts @@ -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, diff --git a/src/api/system/chatConversation/index.ts b/src/api/system/chatConversation/index.ts index f39fcc0..b40e9cb 100644 --- a/src/api/system/chatConversation/index.ts +++ b/src/api/system/chatConversation/index.ts @@ -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'; diff --git a/src/api/system/chatMessage/index.ts b/src/api/system/chatMessage/index.ts index 70a8bee..dec47ca 100644 --- a/src/api/system/chatMessage/index.ts +++ b/src/api/system/chatMessage/index.ts @@ -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"; diff --git a/src/api/system/companyComment/index.ts b/src/api/system/companyComment/index.ts index 5b2cf41..5ae0933 100644 --- a/src/api/system/companyComment/index.ts +++ b/src/api/system/companyComment/index.ts @@ -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"; diff --git a/src/api/system/companyUrl/index.ts b/src/api/system/companyUrl/index.ts index 054a3f9..7585dbe 100644 --- a/src/api/system/companyUrl/index.ts +++ b/src/api/system/companyUrl/index.ts @@ -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'; diff --git a/src/api/system/order/index.ts b/src/api/system/order/index.ts index 31f1453..d527655 100644 --- a/src/api/system/order/index.ts +++ b/src/api/system/order/index.ts @@ -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'; diff --git a/src/api/system/orderGoods/index.ts b/src/api/system/orderGoods/index.ts index 578b825..aba5cea 100644 --- a/src/api/system/orderGoods/index.ts +++ b/src/api/system/orderGoods/index.ts @@ -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'; diff --git a/src/api/system/setting/index.ts b/src/api/system/setting/index.ts index aa027b5..e1e371d 100644 --- a/src/api/system/setting/index.ts +++ b/src/api/system/setting/index.ts @@ -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"; diff --git a/src/api/system/user-collection/index.ts b/src/api/system/user-collection/index.ts index 4aee152..4fdc118 100644 --- a/src/api/system/user-collection/index.ts +++ b/src/api/system/user-collection/index.ts @@ -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"; diff --git a/src/api/system/userRole/index.ts b/src/api/system/userRole/index.ts index 3dfa2e1..1a3f451 100644 --- a/src/api/system/userRole/index.ts +++ b/src/api/system/userRole/index.ts @@ -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"; diff --git a/src/api/system/version/index.ts b/src/api/system/version/index.ts index 8b272bd..9925af0 100644 --- a/src/api/system/version/index.ts +++ b/src/api/system/version/index.ts @@ -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'; diff --git a/src/api/user/balance-log/index.ts b/src/api/user/balance-log/index.ts index 2a9f23f..319f143 100644 --- a/src/api/user/balance-log/index.ts +++ b/src/api/user/balance-log/index.ts @@ -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"; diff --git a/src/api/user/points/index.ts b/src/api/user/points/index.ts index 0c64751..abf4961 100644 --- a/src/api/user/points/index.ts +++ b/src/api/user/points/index.ts @@ -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"; diff --git a/src/app.config.ts b/src/app.config.ts index 0feffcd..6fbba22 100644 --- a/src/app.config.ts +++ b/src/app.config.ts @@ -54,7 +54,8 @@ export default defineAppConfig({ "withdraw/index", "orders/index", "team/index", - "qrcode/index" + "qrcode/index", + "info" ] }, { diff --git a/src/dealer/apply/add.config.ts b/src/dealer/apply/add.config.ts index 682bd9c..8c40d08 100644 --- a/src/dealer/apply/add.config.ts +++ b/src/dealer/apply/add.config.ts @@ -1,4 +1,4 @@ export default definePageConfig({ - navigationBarTitleText: '注册成为经销商', + navigationBarTitleText: '注册成为VIP', navigationBarTextStyle: 'black' }) diff --git a/src/dealer/apply/add.tsx b/src/dealer/apply/add.tsx index 3aaddf0..cbabb50 100644 --- a/src/dealer/apply/add.tsx +++ b/src/dealer/apply/add.tsx @@ -36,7 +36,7 @@ const AddUserAddress = () => { const reload = async () => { // 判断用户是否登录 - if(!user?.userId){ + if (!user?.userId) { return false; } // 查询当前用户ID是否已有申请记录 @@ -154,17 +154,17 @@ const AddUserAddress = () => { extra={ {getApplyStatusText(FormData.applyStatus)} } /> {FormData.applyStatus === 20 && ( - + )} {FormData.applyStatus === 30 && ( - + )} )} @@ -173,7 +173,7 @@ const AddUserAddress = () => { {/* 底部浮动按钮 */} {(!isEditMode || FormData.applyStatus === 10 || FormData.applyStatus === 30) && ( } + icon={} text={isEditMode ? '保存修改' : '提交申请'} disabled={FormData.applyStatus === 10} onClick={handleFixedButtonClick} diff --git a/src/dealer/info.tsx b/src/dealer/info.tsx new file mode 100644 index 0000000..fc3bfca --- /dev/null +++ b/src/dealer/info.tsx @@ -0,0 +1,157 @@ +import React from 'react' +import { View, Text } from '@tarojs/components' +import { Button, Cell, CellGroup, Tag } from '@nutui/nutui-react-taro' +import { useDealerUser } from '@/hooks/useDealerUser' +import Taro from '@tarojs/taro' + +const DealerInfo: React.FC = () => { + const { + dealerUser, + loading, + error, + refresh, + } = useDealerUser() + + // 跳转到申请页面 + const navigateToApply = () => { + Taro.navigateTo({ + url: '/pages/dealer/apply/add' + }) + } + + if (error) { + return ( + + + {error} + + + + ) + } + + return ( + + {/* 页面标题 */} + + + 经销商信息 + + + + {!dealerUser ? ( + // 非经销商状态 + + + 您还不是经销商 + + 成为经销商后可享受专属价格和佣金收益 + + + + + ) : ( + // 经销商信息展示 + + {/* 状态卡片 */} + + + 经销商状态 + + {dealerUser.realName} + + + + {/* 基本信息 */} + + + + + + + + {/* 操作按钮 */} + + + + + + {/* 经销商权益 */} + + 经销商权益 + + + • 享受经销商专属价格 + + + • 获得推广佣金收益 + + + • 优先获得新品信息 + + + • 专属客服支持 + + + + + {/* 佣金统计 */} + + 佣金统计 + + + 0 + 今日佣金 + + + 0 + 本月佣金 + + + 0 + 累计佣金 + + + + + )} + + {/* 刷新按钮 */} + + + 点击刷新数据 + + + + ) +} + +export default DealerInfo diff --git a/src/hooks/useDealerApply.ts b/src/hooks/useDealerApply.ts new file mode 100644 index 0000000..be0c7c5 --- /dev/null +++ b/src/hooks/useDealerApply.ts @@ -0,0 +1,81 @@ +import {useState, useEffect, useCallback} from 'react' +import Taro from '@tarojs/taro' +import {getShopDealerApply} from '@/api/shop/shopDealerApply' +import type {ShopDealerApply} from '@/api/shop/shopDealerApply/model' + +// Hook 返回值接口 +export interface UseDealerApplyReturn { + // 经销商用户信息 + dealerApply: ShopDealerApply | null + // 加载状态 + loading: boolean + // 错误信息 + error: string | null + // 刷新数据 + refresh: () => Promise +} + + +/** + * 经销商用户 Hook - 简化版本 + * 只查询经销商用户信息和判断是否存在 + */ +export const useDealerApply = (): UseDealerApplyReturn => { + const [dealerApply, setDealerApply] = useState(null) + const [loading, setLoading] = useState(false) + const [error, setError] = useState(null) + + const userId = Taro.getStorageSync('UserId'); + + // 获取经销商用户数据 + const fetchDealerData = useCallback(async () => { + + if (!userId) { + console.log('🔍 用户未登录,提前返回') + setDealerApply(null) + return + } + + try { + setLoading(true) + setError(null) + + // 查询当前用户的经销商信息 + const dealer = await getShopDealerApply(userId) + + if (dealer) { + setDealerApply(dealer) + } else { + setDealerApply(null) + } + } catch (err) { + const errorMessage = err instanceof Error ? err.message : '获取经销商信息失败' + setError(errorMessage) + setDealerApply(null) + } finally { + setLoading(false) + } + }, [userId]) + + // 刷新数据 + const refresh = useCallback(async () => { + await fetchDealerData() + }, [fetchDealerData]) + + // 初始化加载数据 + useEffect(() => { + if (userId) { + console.log('🔍 调用 fetchDealerData') + fetchDealerData() + } else { + console.log('🔍 用户ID不存在,不调用 fetchDealerData') + } + }, [fetchDealerData, userId]) + + return { + dealerApply, + loading, + error, + refresh + } +} diff --git a/src/hooks/useDealerUser.ts b/src/hooks/useDealerUser.ts new file mode 100644 index 0000000..062777d --- /dev/null +++ b/src/hooks/useDealerUser.ts @@ -0,0 +1,81 @@ +import {useState, useEffect, useCallback} from 'react' +import Taro from '@tarojs/taro' +import {getShopDealerUser} from '@/api/shop/shopDealerUser' +import type {ShopDealerUser} from '@/api/shop/shopDealerUser/model' + +// Hook 返回值接口 +export interface UseDealerUserReturn { + // 经销商用户信息 + dealerUser: ShopDealerUser | null + // 加载状态 + loading: boolean + // 错误信息 + error: string | null + // 刷新数据 + refresh: () => Promise +} + + +/** + * 经销商用户 Hook - 简化版本 + * 只查询经销商用户信息和判断是否存在 + */ +export const useDealerUser = (): UseDealerUserReturn => { + const [dealerUser, setDealerUser] = useState(null) + const [loading, setLoading] = useState(false) + const [error, setError] = useState(null) + + const userId = Taro.getStorageSync('UserId'); + + // 获取经销商用户数据 + const fetchDealerData = useCallback(async () => { + + if (!userId) { + console.log('🔍 用户未登录,提前返回') + setDealerUser(null) + return + } + + try { + setLoading(true) + setError(null) + + // 查询当前用户的经销商信息 + const dealer = await getShopDealerUser(userId) + + if (dealer) { + setDealerUser(dealer) + } else { + setDealerUser(null) + } + } catch (err) { + const errorMessage = err instanceof Error ? err.message : '获取经销商信息失败' + setError(errorMessage) + setDealerUser(null) + } finally { + setLoading(false) + } + }, [userId]) + + // 刷新数据 + const refresh = useCallback(async () => { + await fetchDealerData() + }, [fetchDealerData]) + + // 初始化加载数据 + useEffect(() => { + if (userId) { + console.log('🔍 调用 fetchDealerData') + fetchDealerData() + } else { + console.log('🔍 用户ID不存在,不调用 fetchDealerData') + } + }, [fetchDealerData, userId]) + + return { + dealerUser, + loading, + error, + refresh + } +} diff --git a/src/hooks/useUserData.ts b/src/hooks/useUserData.ts index 6fa2966..33a1bef 100644 --- a/src/hooks/useUserData.ts +++ b/src/hooks/useUserData.ts @@ -2,6 +2,8 @@ import { useState, useEffect, useCallback } from 'react' import {pageShopUserCoupon} from "@/api/shop/shopUserCoupon"; import {pageShopGift} from "@/api/shop/shopGift"; import {useUser} from "@/hooks/useUser"; +import Taro from '@tarojs/taro' +import {getUserInfo} from "@/api/layout"; interface UserData { balance: number @@ -22,12 +24,11 @@ interface UseUserDataReturn { loading: boolean error: string | null refresh: () => Promise - updateBalance: (newBalance: string) => void + updateBalance: (newBalance: number) => void updatePoints: (newPoints: number) => void } export const useUserData = (): UseUserDataReturn => { - const {user} = useUser() const [data, setData] = useState(null) const [loading, setLoading] = useState(true) const [error, setError] = useState(null) @@ -39,14 +40,15 @@ export const useUserData = (): UseUserDataReturn => { setError(null) // 并发请求所有数据 - const [couponsRes, giftCardsRes] = await Promise.all([ - pageShopUserCoupon({ page: 1, limit: 1, userId: user?.userId}), - pageShopGift({ page: 1, limit: 1, userId: user?.userId, status: 0}) + const [userDataRes, couponsRes, giftCardsRes] = await Promise.all([ + getUserInfo(), + pageShopUserCoupon({ page: 1, limit: 1, userId: Taro.getStorageSync('UserId'), status: 0}), + pageShopGift({ page: 1, limit: 1, userId: Taro.getStorageSync('UserId'), status: 0}) ]) const newData: UserData = { - balance: user?.balance || 0.00, - points: user?.points || 0, + balance: userDataRes?.balance || 0.00, + points: userDataRes?.points || 0, coupons: couponsRes?.count || 0, giftCards: giftCardsRes?.count || 0, orders: { @@ -71,6 +73,16 @@ export const useUserData = (): UseUserDataReturn => { await fetchUserData() }, [fetchUserData]) + // 更新余额(本地更新,避免频繁请求) + const updateBalance = useCallback((newBalance: number) => { + setData(prev => prev ? { ...prev, balance: newBalance } : null) + }, []) + + // 更新积分 + const updatePoints = useCallback((newPoints: number) => { + setData(prev => prev ? { ...prev, points: newPoints } : null) + }, []) + // 初始化加载 useEffect(() => { fetchUserData().then() @@ -80,7 +92,9 @@ export const useUserData = (): UseUserDataReturn => { data, loading, error, - refresh: fetchUserData + refresh, + updateBalance, + updatePoints } } @@ -104,7 +118,7 @@ export const useUserBasicData = () => { }, []) useEffect(() => { - fetchBasicData() + fetchBasicData().then() }, [fetchBasicData]) return { diff --git a/src/pages/user/components/IsDealer.tsx b/src/pages/user/components/IsDealer.tsx index d0288d4..2019988 100644 --- a/src/pages/user/components/IsDealer.tsx +++ b/src/pages/user/components/IsDealer.tsx @@ -1,45 +1,17 @@ import {Cell} from '@nutui/nutui-react-taro' import navTo from "@/utils/common"; -import Taro from '@tarojs/taro' import {View, Text} from '@tarojs/components' import {ArrowRight, Reward, Setting} from '@nutui/icons-react-taro' import {useUser} from '@/hooks/useUser' -import {useEffect, useState} from "react"; -import {pageShopDealerUser} from "@/api/shop/shopDealerUser"; +import {useEffect} from "react"; +import {useDealerUser} from "@/hooks/useDealerUser"; const UserCell = () => { const {isSuperAdmin} = useUser(); - const [isDealer, setIsDealer] = useState(false) - - const reload = async () => { - const userId = Taro.getStorageSync('UserId') - - console.log('当前用户ID:', userId) - - const params = { - userId: Number(userId), - page: 1, - limit: 1 - } - - console.log('查询分销商参数:', params) - - try { - const res = await pageShopDealerUser(params) - console.log('分销商查询结果:', res) - if (res?.count && res?.count > 0) { - setIsDealer(true) - } else { - setIsDealer(false) - } - } catch (error) { - console.error('查询分销商信息失败:', error) - setIsDealer(false) - } - } + const {dealerUser} = useDealerUser() useEffect(() => { - reload().then() + }, []) /** @@ -70,7 +42,7 @@ const UserCell = () => { /** * 分销中心 */ - if (isDealer) { + if (dealerUser) { return ( <> @@ -82,8 +54,9 @@ const UserCell = () => { title={ navTo('/dealer/index', true)}> - 分销中心 - 门店核销 + 分销中心 + {/*门店核销*/} } extra={} @@ -94,7 +67,7 @@ const UserCell = () => { } /** - * 分销中心 + * 普通用户 */ return ( <> diff --git a/src/user/address/add.tsx b/src/user/address/add.tsx index 49dac33..014f765 100644 --- a/src/user/address/add.tsx +++ b/src/user/address/add.tsx @@ -365,7 +365,7 @@ const AddUserAddress = () => { /> {/* 底部浮动按钮 */} - + submitSucceed} /> ); }; diff --git a/src/user/gift/add.tsx b/src/user/gift/add.tsx index 0d85f74..493b1d3 100644 --- a/src/user/gift/add.tsx +++ b/src/user/gift/add.tsx @@ -314,7 +314,7 @@ const AddShopArticle = () => { {/* 提交按钮 */} - } /> + submitSucceed} icon={} /> ); diff --git a/tsconfig.json b/tsconfig.json index 392a3a3..dd4c2af 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,7 +1,8 @@ { "compilerOptions": { - "target": "es2017", - "module": "commonjs", + "target": "es2018", + "module": "esnext", + "lib": ["es2018", "dom", "dom.iterable"], "removeComments": false, "preserveConstEnums": true, "moduleResolution": "node", @@ -9,6 +10,7 @@ "strict": true, "noImplicitAny": true, "allowSyntheticDefaultImports": true, + "esModuleInterop": true, "outDir": "lib", "noUnusedLocals": true, "noUnusedParameters": true,