diff --git a/src/api/cms/cmsWebsiteField/model/index.ts b/src/api/cms/cmsWebsiteField/model/index.ts index dc104f6..d4cf4a9 100644 --- a/src/api/cms/cmsWebsiteField/model/index.ts +++ b/src/api/cms/cmsWebsiteField/model/index.ts @@ -56,4 +56,5 @@ export interface Config { loginTitle?: string; sysLogo?: string; NoticeBar?: string; + apiUrl?: string; } diff --git a/src/app.ts b/src/app.ts index 83dac88..af82678 100644 --- a/src/app.ts +++ b/src/app.ts @@ -98,6 +98,10 @@ function App(props: { children: any; }) { if(data.theme && !Taro.getStorageSync('user_theme')){ Taro.setStorageSync('user_theme', data.theme) } + // 自定义接口 + if(data.apiUrl && process.env.NODE_ENV !== 'development'){ + Taro.setStorageSync('ApiUrl', data.apiUrl) + } }) } diff --git a/src/dealer/capital/index.tsx b/src/dealer/capital/index.tsx index ade2842..62f629a 100644 --- a/src/dealer/capital/index.tsx +++ b/src/dealer/capital/index.tsx @@ -70,7 +70,7 @@ const DealerCapital: React.FC = () => { setRefreshing(false) setLoadingMore(false) } - }, [dealerUser?.userId]) + }, [dealerUser?.userId,date]) // 下拉刷新 const handleRefresh = async () => { diff --git a/src/utils/common.ts b/src/utils/common.ts index e338604..ef152e8 100644 --- a/src/utils/common.ts +++ b/src/utils/common.ts @@ -142,3 +142,30 @@ export function generateOrderTitle(goodsNames: string[], maxLength: number = 30) return truncateText(title, maxLength); } + +/** + * 下划线转驼峰命名 + */ +export function toCamelCase(str: string): string { + return str.replace(/_([a-z])/g, function (_, letter) { + return letter.toUpperCase(); + }); +} + +/** + * 下划线转大驼峰命名 + */ +export function toCamelCaseUpper(str: string): string { + return toCamelCase(str).replace(/^[a-z]/, function (letter) { + return letter.toUpperCase(); + }); +} + +/** + * 转为短下划线 + */ +export function toShortUnderline(str: string): string { + return str.replace(/[A-Z]/g, function (letter) { + return '_' + letter.toLowerCase(); + }).replace(/^_/, ''); +} diff --git a/src/utils/request.ts b/src/utils/request.ts index bc4777f..d515bf9 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -53,7 +53,7 @@ const DEFAULT_CONFIG = { showError: true }; -let baseUrl = BaseUrl; +let baseUrl = Taro.getStorageSync('ApiUrl') || BaseUrl; // 开发环境配置 if (process.env.NODE_ENV === 'development') {