diff --git a/.umirc.ts b/.umirc.ts index 7f1ef60..1caa088 100644 --- a/.umirc.ts +++ b/.umirc.ts @@ -14,7 +14,6 @@ export default defineConfig({ }, proxy: { '/api/': { - // target: 'http://10.39.13.78:8001', target: 'http://10.39.13.78:8001/', // target: 'https://test-admin.linyikj.com.cn/', // target: 'https://admin.linyikj.com.cn/', diff --git a/src/pages/company/list/pages/set_page_info.tsx b/src/pages/company/list/pages/set_page_info.tsx index d0c2ee1..92ab710 100644 --- a/src/pages/company/list/pages/set_page_info.tsx +++ b/src/pages/company/list/pages/set_page_info.tsx @@ -92,11 +92,12 @@ export default function Index({ title = '小程序页面配置' }) { setFormValues({ ...res?.data?.config_value, pageColor: newCss, - menu: defaultMenu, + menu: res?.data?.config_value?.menu || defaultMenu, }); console.log('newCss', newCss); form.setFieldsValue({ ...res?.data?.config_value, + menu: res?.data?.config_value?.menu || defaultMenu, pageColorOtherValue: [ { color: cssStrColor || '', diff --git a/src/pages/company/list/show/$id.tsx b/src/pages/company/list/show/$id.tsx index 44f9066..b593dc4 100644 --- a/src/pages/company/list/show/$id.tsx +++ b/src/pages/company/list/show/$id.tsx @@ -2,9 +2,10 @@ import { MyPageContainer, usePageTabs } from '@/common'; import { Apis } from '@/gen/Apis'; import { ProCard } from '@ant-design/pro-components'; import { useParams } from '@umijs/max'; -import { Space, Tabs } from 'antd'; +import { Space, Steps, Tabs } from 'antd'; import { useEffect, useState } from 'react'; +import { FileProtectOutlined } from '@ant-design/icons'; import ComponentsInfo from '../modals/CompanyShow'; import CompanyUpdate from '../modals/CompanyUpdate'; import CompanyApps from '../table/Apps'; @@ -118,11 +119,48 @@ export default function Show({ title }: { title?: string } = {}) { } >