diff --git a/src/route/proj/ProjEditFree.tsx b/src/route/proj/ProjEditFree.tsx
index 6b5b9ca..e4791e5 100644
--- a/src/route/proj/ProjEditFree.tsx
+++ b/src/route/proj/ProjEditFree.tsx
@@ -13,10 +13,36 @@ import { MAX_MOD_SIZE_FREE } from "./edit/ProjConfigModList.tsx";
 import { GenerateStatus } from "../../interfaces/proj/IProj.ts";
 import TitleIntroduction from '../../route/proj/edit/ProjEditStep1.tsx'
 import TitleIntroductionShow from '../../route/proj/edit/ProjEditStep1Show.tsx'
+import SoftwareInfo from '../../route/proj/edit/ProjEditStep2.tsx'
+import SoftwareInfoShow from '../../route/proj/edit/ProjEditStep2Show.tsx'
+import SoftwareFeatures from '../../route/proj/edit/ProjEditStep3.tsx'
+import SoftwareFeaturesShow from '../../route/proj/edit/ProjEditStep3Show.tsx'
+import LoginPage from '../../route/proj/edit/ProjConfigLoginpage.tsx'
+import LoginPageShow from '../../route/proj/edit/ProjConfigLoginpageShow.tsx'
+import SoftwareManagement from '../../route/proj/edit/ProjConfigModList.tsx'
+import SoftwareManagementShow from '../../route/proj/edit/ProjConfigModListShow.tsx'
+import DisplayOrder from '../../route/proj/edit/ProjConfigMenuList.tsx'
+import DisplayOrderShow from '../../route/proj/edit/ProjConfigMenuListShow.tsx'
 export default function ProjEdit() {
     //第一步 标题简介弹窗
     const [titleIntroductionOpen, setTitleIntroductionOpen] = useState(false)
     const [titleIntroductionShowOpen, setTitleIntroductionShowOpen] = useState(false)
+     //第二步 软件基本信息弹窗
+     const [softwareInfoOpen, setSoftwareOpen] = useState(false)
+     const [softwareInfoShowOpen, setSoftwareShowOpen] = useState(false)
+     // 第三步 软件功能特点弹窗
+     const [softwareFeaturesOpen, setSoftwareFeaturesOpen] = useState(false)
+     const [softwareFeaturesShowOpen, setSoftwareFeaturesShowOpen] = useState(false)
+     // 第四步 登陆页面设置
+     const [loginPageOpne, setLoginPageOpne] = useState(false)
+     const [loginPageShowOpne, setLoginPageShowOpne] = useState(false)
+     // 第五步 软件功能管理
+     const [softwareManagementOpen, setSoftwareManagementOpen] = useState(false)
+     const [softwareManagementShowOpen, setSoftwareManagementShowOpen] = useState(false)
+     // 第六步 显示顺序
+     const [displayOrderOpen, setDisplayOrderOpen] = useState(false)
+     const [displayOrderShowOpen, setDisplayOrderShowOpen] = useState(false)
+ 
     const nav = useNavigate();
     const pathParams = useParams();
 
@@ -45,7 +71,7 @@ export default function ProjEdit() {
                         // nav(`/proj-edit/step1/${pathParams.projId}`)
                         setTitleIntroductionOpen(true)
                     } else {
-                        nav(`/proj-edit/step1-show/${pathParams.projId}`)
+                        // nav(`/proj-edit/step1-show/${pathParams.projId}`)
                         setTitleIntroductionShowOpen(true)
                     }
                 }
@@ -59,9 +85,13 @@ export default function ProjEdit() {
                 canBtnClick: false,
                 handleEdit() {
                     if (generateStatus != GenerateStatus.SUCCESS) {
-                        nav(`/proj-edit/step2/${pathParams.projId}`)
+                        // nav(`/proj-edit/step2/${pathParams.projId}`)
+                        setSoftwareOpen(true)
+
                     } else {
-                        nav(`/proj-edit/step2-show/${pathParams.projId}`)
+                        // nav(`/proj-edit/step2-show/${pathParams.projId}`)
+                        setSoftwareShowOpen(true)
+
                     }
                 }
             },
@@ -74,9 +104,13 @@ export default function ProjEdit() {
                 canBtnClick: false,
                 handleEdit() {
                     if (!isGenerateSuccess) {
-                        nav(`/proj-edit/step3/${pathParams.projId}`)
+                        // nav(`/proj-edit/step3/${pathParams.projId}`)
+                        setSoftwareFeaturesOpen(true)
+
                     } else {
-                        nav(`/proj-edit/step3-show/${pathParams.projId}`)
+                        // nav(`/proj-edit/step3-show/${pathParams.projId}`)
+                        setSoftwareFeaturesShowOpen(true)
+
                     }
                 }
             },
@@ -91,9 +125,13 @@ export default function ProjEdit() {
                 status:data.loginpage.loginpageId?EditStepEnum.EDITED:EditStepEnum.UN_EDIT,
                 handleEdit() {
                     if (!isGenerateSuccess) {
-                        nav(`/proj-edit/config-loginpage/${pathParams.projId}`)
+                        // nav(`/proj-edit/config-loginpage/${pathParams.projId}`)
+                        setLoginPageOpne(true)
+
                     } else {
-                        nav(`/proj-edit/config-loginpage-show/${pathParams.projId}`)
+                        // nav(`/proj-edit/config-loginpage-show/${pathParams.projId}`)
+                        setLoginPageShowOpne(true)
+                    
                     }
                 }
             },
@@ -171,9 +209,13 @@ export default function ProjEdit() {
                 status: data.projModCount > MAX_MOD_SIZE_FREE ? EditStepEnum.EDITED : EditStepEnum.UN_EDIT,
                 handleEdit() {
                     if (!isGenerateSuccess) {
-                        nav(`/proj-edit/config-mod-flist/${pathParams.projId}`)
+                        // nav(`/proj-edit/config-mod-flist/${pathParams.projId}`)
+                        setSoftwareManagementOpen(true)
+
                     } else {
-                        nav(`/proj-edit/config-mod-flist-show/${pathParams.projId}`)
+                        // nav(`/proj-edit/config-mod-flist-show/${pathParams.projId}`)
+                        setSoftwareManagementShowOpen(true)
+
                     }
                 }
             },
@@ -185,9 +227,13 @@ export default function ProjEdit() {
                 status: data.projModCount > MAX_MOD_SIZE_FREE ? EditStepEnum.EDITED : EditStepEnum.UN_EDIT,
                 handleEdit() {
                     if (!isGenerateSuccess) {
-                        nav(`/proj-edit/config-menu-list/${pathParams.projId}`)
+                        // nav(`/proj-edit/config-menu-list/${pathParams.projId}`)
+                        setDisplayOrderOpen(true)
+
                     } else {
-                        nav(`/proj-edit/config-menu-list-show/${pathParams.projId}`)
+                        // nav(`/proj-edit/config-menu-list-show/${pathParams.projId}`)
+                        setDisplayOrderShowOpen(true);
+
                     }
                 }
             }
@@ -378,6 +424,147 @@ export default function ProjEdit() {
             >
                 <TitleIntroductionShow></TitleIntroductionShow>
             </Modal>
+             {/* 第二步设置 */}
+             <Modal open={softwareInfoOpen}
+                title="软件基本信息填写"
+                width={1500}
+                destroyOnClose={true}
+                onCancel={() => {
+                    setSoftwareOpen(false);
+                    // setTimeout(() => {
+                    //     props.closeModal()
+                    //     window.location.reload(); // 刷新页面
+                    // }, 1000);
+                    // setTimeout(() => {
+                    //     window.location.reload()
+                    // }, 500)
+                }}
+                footer={null}
+            >
+                <SoftwareInfo closeModal={() => { setSoftwareOpen(false) }}></SoftwareInfo>
+            </Modal>
+            {/* 第二步查看 */}
+            <Modal open={softwareInfoShowOpen}
+                title="软件基本信息查看"
+                width={1500}
+                destroyOnClose={true}
+                onCancel={() => {
+                    setSoftwareShowOpen(false);
+                }}
+                footer={null}
+            >
+                <SoftwareInfoShow></SoftwareInfoShow>
+            </Modal>
+            {/* 第三步 设置 */}
+            <Modal open={softwareFeaturesOpen}
+                title="软件功能特点设置"
+                width={1500}
+                destroyOnClose={true}
+                onCancel={() => {
+                    setSoftwareFeaturesOpen(false);
+                    // setTimeout(() => {
+                    //     window.location.reload()
+                    // }, 500)
+
+                }}
+                footer={null}
+            >
+                <SoftwareFeatures closeModal={() => { setSoftwareFeaturesOpen(false) }}></SoftwareFeatures>
+            </Modal>
+            {/* 第三步 查看 */}
+            <Modal open={softwareFeaturesShowOpen}
+                title="软件功能特点查看"
+                width={1500}
+                destroyOnClose={true}
+
+                onCancel={() => {
+                    setSoftwareFeaturesShowOpen(false);
+                }}
+                footer={null}
+            >
+                <SoftwareFeaturesShow ></SoftwareFeaturesShow>
+            </Modal>
+            {/* 第四步 设置 */}
+            <Modal open={loginPageOpne}
+                title="登陆页面设置"
+                width={1700}
+                destroyOnClose={true}
+
+                onCancel={() => {
+                    setLoginPageOpne(false);
+                    // setTimeout(() => {
+                    //     window.location.reload()
+                    // }, 500)
+
+                }}
+                footer={null}
+            >
+                <LoginPage closeModal={() => { setLoginPageOpne(false) }}></LoginPage>
+            </Modal>
+            {/* 第四步 查看 */}
+            <Modal open={loginPageShowOpne}
+                title="登陆页面查看"
+                width={1700}
+                destroyOnClose={true}
+
+                onCancel={() => {
+                    setLoginPageShowOpne(false);
+                }}
+                footer={null}
+            >
+                <LoginPageShow></LoginPageShow>
+            </Modal>
+            {/* 第五步 设置 */}
+            <Modal open={softwareManagementOpen}
+                title="软件功能管理设置"
+                width={1500}
+                destroyOnClose={true}
+
+                onCancel={() => {
+                    setSoftwareManagementOpen(false);
+                }}
+                footer={null}
+            >
+                <SoftwareManagement></SoftwareManagement>
+            </Modal>
+            {/* 第五步 查看 */}
+            <Modal open={softwareManagementShowOpen}
+                title="软件功能管理查看"
+                width={1500}
+                onCancel={() => {
+                    setSoftwareManagementShowOpen(false);
+                }}
+                destroyOnClose={true}
+
+                footer={null}
+            >
+                <SoftwareManagementShow></SoftwareManagementShow>
+            </Modal>
+            {/* 第六步 设置 */}
+            <Modal open={displayOrderOpen}
+                title="设置功能列表显示顺序"
+                width={1500}
+                destroyOnClose={true}
+
+                onCancel={() => {
+                    setDisplayOrderOpen(false);
+                }}
+                footer={null}
+            >
+                <DisplayOrder></DisplayOrder>
+            </Modal>
+            {/* 第六步 查看 */}
+            <Modal open={displayOrderShowOpen}
+                title="查看功能列表显示顺序"
+                width={1500}
+                destroyOnClose={true}
+                onCancel={() => {
+                    setDisplayOrderShowOpen(false);
+                }}
+                footer={null}
+            >
+                <DisplayOrderShow></DisplayOrderShow>
+            </Modal>
         </>
     )
 }
\ No newline at end of file