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 9506789..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'; @@ -46,7 +47,7 @@ export default function Show({ title }: { title?: string } = {}) { let items = [ { - label: '应用配置', + label: '项目配置', key: '1', closable: false, children: , @@ -77,12 +78,17 @@ export default function Show({ title }: { title?: string } = {}) { }, { - label: '品牌配置', + label: '应用配置', key: '6', closable: false, children: , }, - + { + label: '品牌配置', + key: '7', + closable: false, + children: , + }, { label: '权限配置', key: '8', @@ -95,12 +101,6 @@ export default function Show({ title }: { title?: string } = {}) { closable: false, children: , }, - { - label: '项目配置', - key: '7', - closable: false, - children: , - }, ]; return ( @@ -119,11 +119,48 @@ export default function Show({ title }: { title?: string } = {}) { } >
请按以下顺序配置:
-
- - 应用配置 ➡️ 组织配置 ➡️ 岗位配置 ➡️ 员工配置 ➡️ 账号配置 ➡️ 品牌配置 - ➡️ 权限配置 ➡️ 客户端配置 ➡️ 项目配置; - +
+ , + }, + { + title: '组织配置', + status: 'finish', + icon: , + }, + { + title: '岗位配置', + status: 'finish', + icon: , + }, + { + title: '员工配置', + status: 'finish', + icon: , + }, + { + title: '账号配置', + status: 'finish', + icon: , + }, + { + title: '品牌配置', + status: 'finish', + icon: , + }, + { + title: '项目配置', + status: 'finish', + icon: , + }, + ]} + />
diff --git a/src/pages/company/list/table/CustomerEnd.tsx b/src/pages/company/list/table/CustomerEnd.tsx index 4c9c65b..0e28094 100644 --- a/src/pages/company/list/table/CustomerEnd.tsx +++ b/src/pages/company/list/table/CustomerEnd.tsx @@ -28,7 +28,7 @@ export default function CustomerEnd(props: MyBetaModalFormProps) { 替换系统默认的颜色统一调整为机构主色,保持视觉格一致,以及首屏底部菜单图标。
- 品牌主色是机构在小程序中最核心的视觉代表色。通过配置品牌主色,你可以让整个小程序的交互组件自动统一为机构专属风格,提升品牌识别度。 - + */} );