develop #21

Merged
zsq merged 2 commits from develop into main 2026-01-26 20:05:08 +08:00
4 changed files with 48 additions and 10 deletions
Showing only changes of commit f4cbf66c8f - Show all commits

View File

@ -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/',

View File

@ -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 || '',

View File

@ -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 } = {}) {
}
>
<div></div>
<div style={{ padding: '0 0 10px 0' }}>
<span>
</span>
<div style={{ padding: '10px 0' }}>
<Steps
type="navigation"
current={-1}
items={[
{
title: '应用配置',
status: 'finish',
icon: <FileProtectOutlined />,
},
{
title: '组织配置',
status: 'finish',
icon: <FileProtectOutlined />,
},
{
title: '岗位配置',
status: 'finish',
icon: <FileProtectOutlined />,
},
{
title: '员工配置',
status: 'finish',
icon: <FileProtectOutlined />,
},
{
title: '账号配置',
status: 'finish',
icon: <FileProtectOutlined />,
},
{
title: '品牌配置',
status: 'finish',
icon: <FileProtectOutlined />,
},
{
title: '项目配置',
status: 'finish',
icon: <FileProtectOutlined />,
},
]}
/>
</div>
</ProCard>
<ProCard>

View File

@ -28,7 +28,7 @@ export default function CustomerEnd(props: MyBetaModalFormProps) {
</div>
</ProCard>
<ProCard
{/* <ProCard
title="金刚区图标配置"
type="inner"
bordered
@ -39,7 +39,7 @@ export default function CustomerEnd(props: MyBetaModalFormProps) {
<div style={{ height: '80px' }}>
</div>
</ProCard>
</ProCard> */}
</ProCard>
</div>
);