From f4cbf66c8f3901d4f482708ee5b21e0bc0225a3c Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Mon, 26 Jan 2026 19:55:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=9B=B4=E6=96=B0=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .umirc.ts                                     |  1 -
 .../company/list/pages/set_page_info.tsx      |  3 +-
 src/pages/company/list/show/$id.tsx           | 50 ++++++++++++++++---
 src/pages/company/list/table/CustomerEnd.tsx  |  4 +-
 4 files changed, 48 insertions(+), 10 deletions(-)

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 } = {}) {
         }
       >
         <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>
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) {
             替换系统默认的颜色统一调整为机构主色，保持视觉格一致，以及首屏底部菜单图标。
           </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>
   );
-- 
2.47.2