From c3eb7b63b29734092dfe456825f15224b30c4c78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Thu, 24 Jul 2025 20:26:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/config.ts => config/app.ts | 2 +- src/api/system/file/index.ts | 2 +- src/app.ts | 2 +- src/pages/index/Header.tsx | 2 +- src/pages/index/Help.tsx | 2 +- src/pages/index/Login.tsx | 2 +- src/pages/user/components/OrderIcon.tsx | 2 +- src/pages/user/components/UserCard.tsx | 2 +- src/pages/user/components/UserFooter.tsx | 2 +- src/user/profile/profile.tsx | 2 +- src/utils/request.ts | 4 ++-- tsconfig.json | 3 ++- 12 files changed, 14 insertions(+), 13 deletions(-) rename src/utils/config.ts => config/app.ts (73%) diff --git a/src/utils/config.ts b/config/app.ts similarity index 73% rename from src/utils/config.ts rename to config/app.ts index 23d23cf..906814f 100644 --- a/src/utils/config.ts +++ b/config/app.ts @@ -1,7 +1,7 @@ // 租户ID export const TenantId = 10550; // 接口地址 -export const BaseUrl = 'https://cms.websoft.top/api'; +export const BaseUrl = 'https://cms-api.websoft.top/api'; // 当前版本 export const Version = 'v3.0.8'; // 版权信息 diff --git a/src/api/system/file/index.ts b/src/api/system/file/index.ts index fa78a8a..8087554 100644 --- a/src/api/system/file/index.ts +++ b/src/api/system/file/index.ts @@ -4,7 +4,7 @@ import dayjs from 'dayjs'; import crypto from 'crypto-js'; import {Base64} from 'js-base64'; import {FileRecord} from "@/api/system/file/model"; -import {TenantId} from "@/utils/config"; +import {TenantId} from "@/config/app"; export async function uploadOssByPath(filePath: string) { return new Promise(async (resolve) => { diff --git a/src/app.ts b/src/app.ts index b60462a..497f809 100644 --- a/src/app.ts +++ b/src/app.ts @@ -4,7 +4,7 @@ import Taro, {useDidShow, useDidHide} from '@tarojs/taro' // 全局样式 import './app.scss' import {loginByOpenId} from "@/api/layout"; -import {TenantId} from "@/utils/config"; +import {TenantId} from "@/config/app"; import {saveStorageByLoginUser} from "@/utils/server"; function App(props) { diff --git a/src/pages/index/Header.tsx b/src/pages/index/Header.tsx index 3e1cf04..cf2e362 100644 --- a/src/pages/index/Header.tsx +++ b/src/pages/index/Header.tsx @@ -4,7 +4,7 @@ import {Button, Space} from '@nutui/nutui-react-taro' import {TriangleDown} from '@nutui/icons-react-taro' import {Popup, Avatar, NavBar} from '@nutui/nutui-react-taro' import {getSiteInfo, getUserInfo, getWxOpenId} from "@/api/layout"; -import {TenantId} from "@/utils/config"; +import {TenantId} from "@/config/app"; import {getOrganization} from "@/api/system/organization"; import {myUserVerify} from "@/api/system/userVerify"; import {CmsWebsite} from "@/api/cms/cmsWebsite/model"; diff --git a/src/pages/index/Help.tsx b/src/pages/index/Help.tsx index 59ce37b..2689cd5 100644 --- a/src/pages/index/Help.tsx +++ b/src/pages/index/Help.tsx @@ -3,7 +3,7 @@ import {ArrowRight} from '@nutui/icons-react-taro' import {CmsArticle} from "@/api/cms/cmsArticle/model"; import Taro from '@tarojs/taro' import {useRouter} from '@tarojs/taro' -import {BaseUrl} from "@/utils/config"; +import {BaseUrl} from "@/config/app"; import {TEMPLATE_ID} from "@/utils/server"; /** diff --git a/src/pages/index/Login.tsx b/src/pages/index/Login.tsx index a2528e6..6f84c68 100644 --- a/src/pages/index/Login.tsx +++ b/src/pages/index/Login.tsx @@ -1,7 +1,7 @@ import {useEffect, useState} from "react"; import Taro from '@tarojs/taro' import {Input, Radio, Button} from '@nutui/nutui-react-taro' -import {TenantId} from "@/utils/config"; +import {TenantId} from "@/config/app"; import './login.scss'; import {saveStorageByLoginUser} from "@/utils/server"; diff --git a/src/pages/user/components/OrderIcon.tsx b/src/pages/user/components/OrderIcon.tsx index 1e5fb10..ff3bea1 100644 --- a/src/pages/user/components/OrderIcon.tsx +++ b/src/pages/user/components/OrderIcon.tsx @@ -4,7 +4,7 @@ import Taro from '@tarojs/taro' import {Button} from '@tarojs/components'; import {Image} from '@nutui/nutui-react-taro' import {getUserInfo, getWxOpenId} from "@/api/layout"; -import {TenantId} from "@/utils/config"; +import {TenantId} from "@/config/app"; import {User} from "@/api/system/user/model"; // import News from "./News"; import {myPageBszxBm} from "@/api/bszx/bszxBm"; diff --git a/src/pages/user/components/UserCard.tsx b/src/pages/user/components/UserCard.tsx index e12879d..651837a 100644 --- a/src/pages/user/components/UserCard.tsx +++ b/src/pages/user/components/UserCard.tsx @@ -5,7 +5,7 @@ import Taro from '@tarojs/taro'; import {useEffect, useState} from "react"; import {User} from "@/api/system/user/model"; import navTo from "@/utils/common"; -import {TenantId} from "@/utils/config"; +import {TenantId} from "@/config/app"; function UserCard() { const [IsLogin, setIsLogin] = useState(false) diff --git a/src/pages/user/components/UserFooter.tsx b/src/pages/user/components/UserFooter.tsx index 63c7dae..fb74b71 100644 --- a/src/pages/user/components/UserFooter.tsx +++ b/src/pages/user/components/UserFooter.tsx @@ -5,7 +5,7 @@ import {Popup} from '@nutui/nutui-react-taro' import {UserParam} from "@/api/system/user/model"; import {Button} from '@nutui/nutui-react-taro' import {Form, Input} from '@nutui/nutui-react-taro' -import {Copyright, Version} from "@/utils/config"; +import {Copyright, Version} from "@/config/app"; const UserFooter = () => { const [openLoginByPhone, setOpenLoginByPhone] = useState(false) const [clickNum, setClickNum] = useState(0) diff --git a/src/user/profile/profile.tsx b/src/user/profile/profile.tsx index cb141b5..6b79318 100644 --- a/src/user/profile/profile.tsx +++ b/src/user/profile/profile.tsx @@ -4,7 +4,7 @@ import {useEffect, useState} from "react"; import {ConfigProvider} from '@nutui/nutui-react-taro' import Taro, {getCurrentInstance} from '@tarojs/taro' import {getUserInfo, updateUserInfo} from "@/api/layout"; -import {TenantId} from "@/utils/config"; +import {TenantId} from "@/config/app"; import { TextArea } from '@nutui/nutui-react-taro' import './profile.scss' diff --git a/src/utils/request.ts b/src/utils/request.ts index 1f1e824..5609c00 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -1,11 +1,11 @@ import Taro from '@tarojs/taro' -import {BaseUrl, TenantId} from "@/utils/config"; +import {BaseUrl, TenantId} from "@/config/app"; let baseUrl = BaseUrl // 开发环境 if(process.env.NODE_ENV === 'development'){ - baseUrl = 'http://localhost:9000/api' + // baseUrl = 'http://localhost:9000/api' } export function request(options:any) { const token = Taro.getStorageSync('access_token'); diff --git a/tsconfig.json b/tsconfig.json index a71efcd..6978128 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -26,7 +26,8 @@ "@/utils/*": ["./src/utils/*"], "@/assets/*": ["./src/assets/*"], "@/api/*": ["./src/api/*"], - "@/hooks/*": ["./src/hooks/*"] + "@/hooks/*": ["./src/hooks/*"], + "@/config/*": ["./config/*"] } }, "include": ["./src", "./types"],