diff --git a/src/api/cms/cmsWebsiteField/index.ts b/src/api/cms/cmsWebsiteField/index.ts index 65644c6..119bba7 100644 --- a/src/api/cms/cmsWebsiteField/index.ts +++ b/src/api/cms/cmsWebsiteField/index.ts @@ -1,6 +1,6 @@ import request from '@/utils/request'; import type { ApiResult, PageResult } from '@/api'; -import type {CmsWebsiteField, CmsWebsiteFieldParam, Config} from './model'; +import type {CmsWebsiteField, CmsWebsiteFieldParam} from './model'; /** * 分页查询应用参数 @@ -112,18 +112,3 @@ export async function undeleteWebsiteField(id?: number) { } return Promise.reject(new Error(res.message)); } - - -/** - * 查询项目参数列表 - */ -export async function configWebsiteField(params?: CmsWebsiteFieldParam) { - const res = await request.get>( - '/cms/cms-website-field/config', - params - ); - if (res.code === 0 && res.data) { - return res.data; - } - return Promise.reject(new Error(res.message)); -} diff --git a/src/hooks/useConfig.ts b/src/hooks/useConfig.ts deleted file mode 100644 index d572bb4..0000000 --- a/src/hooks/useConfig.ts +++ /dev/null @@ -1,50 +0,0 @@ -import { useEffect, useState } from 'react'; -import Taro from '@tarojs/taro'; -import { configWebsiteField } from '@/api/cms/cmsWebsiteField'; -import { Config } from '@/api/cms/cmsWebsiteField/model'; - -/** - * 自定义Hook用于获取和管理网站配置数据 - * @returns {Object} 包含配置数据和加载状态的对象 - */ -export const useConfig = () => { - const [config, setConfig] = useState(null); - const [loading, setLoading] = useState(true); - const [error, setError] = useState(null); - - useEffect(() => { - const fetchConfig = async () => { - try { - setLoading(true); - const data = await configWebsiteField(); - setConfig(data); - Taro.setStorageSync('config', data); - - // 设置主题 - if (data.theme && !Taro.getStorageSync('user_theme')) { - Taro.setStorageSync('user_theme', data.theme); - } - } catch (err) { - setError(err instanceof Error ? err : new Error('获取配置失败')); - console.error('获取网站配置失败:', err); - } finally { - setLoading(false); - } - }; - - fetchConfig(); - }, []); - - return { config, loading, error, refetch: () => { - setLoading(true); - setError(null); - configWebsiteField().then(data => { - setConfig(data); - Taro.setStorageSync('config', data); - setLoading(false); - }).catch(err => { - setError(err instanceof Error ? err : new Error('获取配置失败')); - setLoading(false); - }); - }}; -}; \ No newline at end of file diff --git a/src/passport/invite/index.tsx b/src/passport/invite/index.tsx index bcdd196..cb93228 100644 --- a/src/passport/invite/index.tsx +++ b/src/passport/invite/index.tsx @@ -79,11 +79,11 @@ const InvitePage: React.FC = () => { const fetchInviteInfo = async (inviteToken: string) => { try { console.log('开始获取邀请信息, token:', inviteToken); - console.log('请求URL:', `${SERVER_API_URL}/api/_app/developer/invite/info?token=${encodeURIComponent(inviteToken)}`); + console.log('请求URL:', `${INVITE_API_URL}/api/developer/invite/info?token=${encodeURIComponent(inviteToken)}`); console.log('请求头:', { 'content-type': 'application/json', TenantId }); const res = await Taro.request({ - url: `${INVITE_API_URL}/developer/invite/info?token=${encodeURIComponent(inviteToken)}`, + url: `${INVITE_API_URL}/api/developer/invite/info?token=${encodeURIComponent(inviteToken)}`, method: 'GET', header: { 'content-type': 'application/json', @@ -142,7 +142,7 @@ const InvitePage: React.FC = () => { setAuthLoading(true); const res = await Taro.request({ - url: `${INVITE_API_URL}/developer/invite/accept`, + url: `${INVITE_API_URL}/api/developer/invite/accept`, method: 'POST', data: { token, diff --git a/src/user/about/index.tsx b/src/user/about/index.tsx index 5011331..e645374 100644 --- a/src/user/about/index.tsx +++ b/src/user/about/index.tsx @@ -9,14 +9,12 @@ import {listCmsNavigation} from "@/api/cms/cmsNavigation"; import {View, RichText} from '@tarojs/components' import {listCmsDesign} from "@/api/cms/cmsDesign"; import {CmsDesign} from "@/api/cms/cmsDesign/model"; -import { useConfig } from "@/hooks/useConfig"; // 使用新的自定义Hook const Helper = () => { const [nav, setNav] = useState() const [design, setDesign] = useState() const [category, setCategory] = useState([]) - const { config } = useConfig(); // 使用新的Hook const reload = async () => { const navs = await listCmsNavigation({model: 'page', parentId: 0}); @@ -81,10 +79,7 @@ const Helper = () => { > ))} - - 服务热线:{config?.tel} - 工作日:{config?.workDay} - + ); };