diff --git a/src/components/BelongPeople/BelongPeople.tsx b/src/components/BelongPeople/BelongPeople.tsx
index 90c4d08..27f8942 100644
--- a/src/components/BelongPeople/BelongPeople.tsx
+++ b/src/components/BelongPeople/BelongPeople.tsx
@@ -754,7 +754,7 @@ export default function BelongPeople(props: propsInfo) {
                             </Form>
                         </div>
                     </div>
-                    <div style={{ display: props.isShow ? 'block' : 'none', marginTop: 10 }}>
+                    <div style={{ display: props.isShow ? 'block' : 'none', position:'absolute',right:0,bottom:10  }}>
                         <div className="belongPeopleModal-btn" style={{ display: 'flex', justifyContent: 'flex-end' }} >
                             <Button onClick={() => {
                                 props.closeModal()
diff --git a/src/components/ContactPeople/ContactPeople.tsx b/src/components/ContactPeople/ContactPeople.tsx
index deeacf1..79d17e7 100644
--- a/src/components/ContactPeople/ContactPeople.tsx
+++ b/src/components/ContactPeople/ContactPeople.tsx
@@ -1,4 +1,4 @@
-import { message, Modal,Table, Space } from "antd";
+import { message, Modal, Table, Space } from "antd";
 import { FolderAddOutlined } from '@ant-design/icons';
 // import locale from 'antd/es/date-picker/locale/zh_CN';
 // import { useParams } from "react-router-dom";
@@ -27,7 +27,13 @@ type ContactType = {
 const { Search } = Input;
 const { Column } = Table;
 
-export default function ContactPeople() {
+export default function ContactPeople(props: any) {
+    const [applyConcatId, setApplyConcatId] = useState('') //联系人id
+    const [applyContactCsaNo, setapplyContactCsaNo] = useState('') //客服编号
+    const [applyContactEmail, setapplyContactEmail] = useState('') //联系人邮箱
+    const [applyContactName, setapplyContactName] = useState('')  //联系人姓名
+    const [applyContactPhone, setapplyContactPhone] = useState('') //联系人手机
+    const [applyContactCompany, setapplyContactCompany] = useState('')
     const [messageApi, contextHolder] = message.useMessage();
     const [formContact] = Form.useForm<ContactType>()
     const height = window.innerHeight - 200;
@@ -73,6 +79,20 @@ export default function ContactPeople() {
             }
         })
     }
+    // 联系人表格选择触发
+    const ContantRowSelection = {
+        // selectedRowKeys: React.Key[]
+        onChange: (selectedRowKeys: React.Key[], selectedRows: ContactDataType[]) => {
+            console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows);
+            setApplyConcatId(selectedRows[0].projContactId)
+            setapplyContactCsaNo(selectedRows[0].csaNo)
+            setapplyContactEmail(selectedRows[0].email)
+            setapplyContactName(selectedRows[0].name)
+            setapplyContactPhone(selectedRows[0].phone)
+            setapplyContactCompany(selectedRows[0].company)
+        },
+
+    };
     // 点击创建联系热人获取随机客服
     const getCas = () => {
         get({
@@ -174,9 +194,9 @@ export default function ContactPeople() {
 
     }, [])
     return (
-        <div style={{ height: `${height - 175}px`, overflow: 'auto' }}>
+        <div style={{ height: props.isShow ? `${height - 80}px`:`${height - 160}px`, overflow: 'auto', position: 'relative' }}>
             {contextHolder}
-            <div style={{ padding: '22px 15px 0 15px',background: 'var(--color-light)' }}>
+            <div style={{ padding: '22px 15px 0 15px', background: 'var(--color-light)' }}>
                 <div style={{ padding: '14px 19px', background: '#F3F3F3', color: '#A3A3A3', fontSize: '14px' }}>
                     联系人用于接受平台相关业务办理进度的通知信息与各类协议的线下签章等工作。
                 </div>
@@ -194,10 +214,35 @@ export default function ContactPeople() {
                         <Search placeholder="请输入持有者名称搜索对应信息" onSearch={applicantPeopleSearch} style={{ width: '353px', height: '43px' }} />
                     </div>
                 </div>
+                <div className='showInfo' style={{ display: props.isShow ? 'block' : 'none' }}>
+                    {applyContactName ? (
+                        <div style={{display:'flex'}}>
+                            <div style={{ marginRight: '22px' }}>当前联系人:</div>
+                            <div style={{ display: applyContactName == '' ? 'block' : 'none' }}>请选择联系人</div>
+                            <div style={{ display: applyContactName == '' ? 'none' : 'block' }}>
+                                {applyContactName}/{applyContactPhone}{applyContactEmail ? '/' + applyContactEmail : ''}
+                            </div>
+                        </div>
+                    ) : (
+                        <div style={{display:'flex'}}>
+                            <div style={{ marginRight: '22px' }}>当前联系人:</div>
+                            <div style={{ display: props.concatPeopleInfo.applyContactName == '' ? 'block' : 'none' }}>请选择联系人</div>
+                            <div style={{ display: props.concatPeopleInfo.applyContactName == '' ? 'none' : 'block' }}>
+                                {props.concatPeopleInfo.applyContactName}/{props.concatPeopleInfo.applyContactPhone}{props.concatPeopleInfo.applyContactEmail ? '/' + props.concatPeopleInfo.applyContactEmail : ''}
+                            </div>
 
+                        </div>
+                    )}
+
+                </div>
                 <div className='belongPeople-bot'>
                     {/* 表格 lyp*/}
-                    <Table
+                    {props.isShow ? (<Table
+                        rowSelection={{
+                            type: 'radio',
+                            ...ContantRowSelection,
+                            // selectedRowKeys: selectedKeys // 设置默认选中的行
+                        }}
 
                         dataSource={tableContactData}
                         pagination={{
@@ -264,8 +309,100 @@ export default function ContactPeople() {
                                 </Space>
                             )}
                         />
-                    </Table>
+                    </Table>) : (<Table
 
+                        dataSource={tableContactData}
+                        pagination={{
+                            defaultPageSize: 5, // 设置默认一页显示 5 条数据
+                        }}
+                        style={{ textAlign: 'center' }} // 设置表格内容居中显示
+                        rowKey="projContactId" // 指定数据项的唯一标识符
+                    >
+                        <Column title="联系人" dataIndex="name" />
+                        <Column title="联系人手机号" dataIndex="phone" />
+                        <Column title="平台专属客服" dataIndex="csaNo" />
+                        <Column title="所属公司" dataIndex="company"
+                            render={(text) => (text !== '' ? text : '一')}
+                        />
+
+                        {/* <Column title="实名认证状态" dataIndex="address" key="key" /> */}
+                        <Column
+                            title="操作"
+                            render={(text, record: any) => (
+                                <Space size="middle">
+                                    <a onClick={() => {
+                                        // alert(record.projOwnerId);
+
+                                        console.log('text:', text);
+                                        console.log('record:', record);
+
+                                        setContactId(record.projContactId)
+                                        setContactTitle('编辑联系人')
+                                        steIsContantOpen(true)
+                                        // formContact 表单赋值
+                                        formContact.setFieldsValue({
+                                            csaNo: record.csaNo,
+                                            name: record.name,
+                                            phone: record.phone,
+                                            email: record.email,
+                                            company: record.company
+                                        })
+                                    }}>编辑 </a>
+                                    <span style={{ color: '#3472EE' }}>|</span>
+                                    <a onClick={() => {
+                                        // alert(record.projOwnerId); 
+                                        del({
+                                            messageApi,
+                                            url: `/api/proj-contact/remove/${record.projContactId}`,
+                                            onSuccess() {
+                                                messageApi.success('删除成功');
+                                                getProjContactList()
+                                            }
+                                        })
+                                    }}>删除</a>
+                                    <span style={{ color: '#3472EE' }}>|</span>
+                                    <a onClick={() => {
+                                        setContactTitle('查看联系人')
+                                        steIsContantOpen(true)
+                                        formContact.setFieldsValue({
+                                            csaNo: record.csaNo,
+                                            name: record.name,
+                                            phone: record.phone,
+                                            email: record.email
+
+                                        })
+                                    }}>查看</a>
+
+                                </Space>
+                            )}
+                        />
+                    </Table>)}
+
+
+                </div>
+
+            </div>
+            <div style={{ display: props.isShow ? 'block' : 'none', position: 'absolute', right: 0, bottom: 10 }}>
+                <div className="belongPeopleModal-btn" style={{ display: 'flex', justifyContent: 'flex-end' }} >
+                    <Button onClick={() => {
+                        props.closeModal()
+                    }}>取消</Button>
+                    <Button style={{
+                        marginLeft: 20
+                    }} type="primary"
+                        onClick={() => {
+                            props.setConcatPeopleInfo({
+                                applyConcatId,
+                                applyContactCsaNo,
+                                applyContactEmail,
+                                applyContactName,
+                                applyContactPhone,
+                                applyContactCompany
+                            })
+                            props.setConcatValue(applyContactName)
+                            props.closeModal()
+                        }}
+                    >确定</Button>
                 </div>
             </div>
             {/* 选择创建/编辑/查看联系人弹框 lyp*/}
diff --git a/src/components/ai/AiHelper.tsx b/src/components/ai/AiHelper.tsx
index 678c2c4..5820590 100644
--- a/src/components/ai/AiHelper.tsx
+++ b/src/components/ai/AiHelper.tsx
@@ -368,21 +368,21 @@ export default function AiHelper(props: PropsType) {
                         setActiveTab('简介')
                     }}
                 >
-                    项目简介
+                    系统简介
                 </div>
                 <div className={activeTab == '详情' ? 'tabActive' : "aiTabBtn"}
                     onClick={() => {
                         setActiveTab('详情')
                     }}
                 >
-                    项目详情
+                    系统详情
                 </div>
                 <div className={activeTab == '模块' ? 'tabActive' : "aiTabBtn"}
                     onClick={() => {
                         setActiveTab('模块')
                     }}
                 >
-                    模块管理
+                    功能列表
                 </div>
             </div>
 
diff --git a/src/components/card/CardProj.tsx b/src/components/card/CardProj.tsx
index 912e331..8802f46 100644
--- a/src/components/card/CardProj.tsx
+++ b/src/components/card/CardProj.tsx
@@ -12,10 +12,10 @@ import {
     WarningOutlined,
     FolderOutlined
 } from '@ant-design/icons';
-import { Button, Dropdown, Tag, Modal } from 'antd';
+import { Button, Dropdown, Tag, Modal, Carousel } from 'antd';
 import { GenerateStatus, ProjChargeType } from "../../interfaces/proj/IProj.ts";
 import { useNavigate } from "react-router-dom";
-import { Axios, put } from "../../util/AjaxUtils.ts";
+import { Axios, put, downloadUrl } from "../../util/AjaxUtils.ts";
 import { useContext, useEffect, useState } from "react";
 import { IndexListContext } from "../../context/IndexListContext.ts";
 import useMessage from "antd/es/message/useMessage";
@@ -31,7 +31,7 @@ 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 CardProj(props:any ) {
+export default function CardProj(props: any) {
     // 第四步 登陆页面设置
     const [loginPageOpne, setLoginPageOpne] = useState(false)
     const [loginPageShowOpne, setLoginPageShowOpne] = useState(false)
@@ -47,7 +47,7 @@ export default function CardProj(props:any ) {
 
     const data = props.item;
     const [projId] = useState(data.projId)
-    const isShow = data.pay.chargeAdditionals.includes('PKG')
+    const isShow = data.pay.chargeAdditionals.includes('PKG') || data.pay.charge.includes('ALL')
 
     const [messageApi, messageContext] = useMessage();
     const [projCategoryId, setProjCategoryId] = useState(data.projCategoryId);
@@ -79,7 +79,7 @@ export default function CardProj(props:any ) {
 
     const goEdit = () => {
         if (charge == ProjChargeType.ALL) {
-            nav(`/proj-edit/${data.projId}`);
+            nav(`/proj-eall/${data.projId}`);
         } else if (charge == ProjChargeType.FREE) {
             nav(`/proj-efree/${data.projId}`);
         } else {
@@ -88,6 +88,8 @@ export default function CardProj(props:any ) {
     }
 
     useEffect(() => {
+        console.log('查找图片', data);
+
         const charge = props.item.pay.charge.split(':')[0];
         let chargeName = '';
         if (charge == ProjChargeType.ALL) {
@@ -112,7 +114,7 @@ export default function CardProj(props:any ) {
                     <div className='cpt-left'>
                         <div className='dottedLine'></div>
                         <div className='cpt-title' onClick={goEdit}>{data.projName}</div>
-                        <div className='cp-tag'>
+                        <div className='cp-tag' style={{ background: payCharge == '全托管' ? '#6bd2b4' : payCharge == '免费试用' ? '#ff9226' : payCharge == '写材料' ? '#5279f4' : '', color: '#fff' }}>
                             {payCharge}
                         </div>
                         <div className='cp-num'>
@@ -150,7 +152,21 @@ export default function CardProj(props:any ) {
                 </div>
                 <div className='cp-bot'>
                     <div className='cpb-left'>
-                        <img src={data.img} className='cpb-left-img' alt="" />
+                        {/* lyp */}
+                        <div className='cpb-left-img'>
+                            <Carousel autoplay dots={false}>
+                                
+                                <div>
+                                    <img src={downloadUrl(data.loginpage.loginpagePreviewImgs)} width={'249px'} height={'143px'} alt="" />
+
+                                </div>
+                                <div>
+                                    <img src={downloadUrl(data.codeTypePage.previewImgs)} width={'249px'} height={'143px'} alt="" />
+
+                                </div>
+                            </Carousel>
+                        </div>
+                        {/* <img src={downloadUrl(data.codeTypePage.previewImgs)} className='cpb-left-img' alt="" /> */}
                         <div className='cpbl-right'>
                             <div className='cpbl-money'>
                                 <span className='money'>金额(￥) : </span>
@@ -158,7 +174,7 @@ export default function CardProj(props:any ) {
                             </div>
                             <div className='cpbl-btn'>
                                 <div className='threeBtn' onClick={() => {
-                                    if (data.generate.generateStatus == GenerateStatus.SUCCESS) {
+                                    if (data.generate.generateStatus == GenerateStatus.SUCCESS || payCharge == '全托管') {
                                         // nav(`/proj-edit/config-loginpage-show/${data.projId}`)
                                         setLoginPageShowOpne(true);
 
@@ -171,7 +187,7 @@ export default function CardProj(props:any ) {
                                     <div>登录界面设置</div>
                                 </div>
                                 <div className='threeBtn' onClick={() => {
-                                    if (data.generate.generateStatus == GenerateStatus.SUCCESS) {
+                                    if (data.generate.generateStatus == GenerateStatus.SUCCESS || payCharge == '全托管') {
                                         // nav(`/proj-edit/config-mod-list-show/${data.projId}`)
                                         setSoftwareManagementShowOpen(true)
                                     } else {
@@ -184,7 +200,7 @@ export default function CardProj(props:any ) {
                                     <div>系统菜单管理({data.projModCount})</div>
                                 </div>
                                 <div className='threeBtn rightBit' onClick={() => {
-                                    if (data.generate.generateStatus == GenerateStatus.SUCCESS) {
+                                    if (data.generate.generateStatus == GenerateStatus.SUCCESS || payCharge == '全托管') {
                                         // nav(`/proj-edit/config-menu-list-show/${data.projId}`)
                                         setDisplayOrderShowOpen(true);
                                     } else {
diff --git a/src/components/card/CardProjDownload.tsx b/src/components/card/CardProjDownload.tsx
index 2fe6dc5..f6c732a 100644
--- a/src/components/card/CardProjDownload.tsx
+++ b/src/components/card/CardProjDownload.tsx
@@ -11,12 +11,12 @@ export default function CardProjDownload(props: IProjDownload) {
                 <div className="cpDown-option">
                     {
                         props.canBtnClick ? (
-                            <a href="/#" className="cpDown-edit" onClick={(e) => {
+                            <a href="/#" className="cpDown-edit" style={{minWidth:30}} onClick={(e) => {
                                 e.preventDefault();
                                 props.handleDownload();
                             }}>下载</a>
                         ) : (
-                            <a href="/#" className="cpDown-noedit" style={{ color: '#c2c2c2' }} onClick={(e) => {
+                            <a href="/#" className="cpDown-noedit"  style={{ color: '#c2c2c2',minWidth:30 }} onClick={(e) => {
                                 e.preventDefault();
                             }}>下载</a>
                         )
diff --git a/src/components/card/CardProjEdit.tsx b/src/components/card/CardProjEdit.tsx
index 9e413c3..a21ae86 100644
--- a/src/components/card/CardProjEdit.tsx
+++ b/src/components/card/CardProjEdit.tsx
@@ -26,6 +26,7 @@ export default function CardProjEdit(props: IProjEdit) {
         //         props.handleEdit();
         //     }}>编辑</a>
         // }
+       
     }
 
     return (
diff --git a/src/components/card/card-proj-download.css b/src/components/card/card-proj-download.css
index f9b3b18..aeb3b50 100644
--- a/src/components/card/card-proj-download.css
+++ b/src/components/card/card-proj-download.css
@@ -1,5 +1,5 @@
 .card-proj-download {
-    width: 309px;
+    width: 95%;
     padding: 20px 25px;
     box-sizing: border-box;
     
@@ -10,7 +10,7 @@
     position: relative;
 }
 .card-proj-nodownload{
-    width: 309px;
+    width: 95%;
     padding: 20px 25px;
     box-sizing: border-box;
     background-color: #f3f3f3;
diff --git a/src/components/card/card-proj-edit.css b/src/components/card/card-proj-edit.css
index 7f9b006..7c9aec4 100644
--- a/src/components/card/card-proj-edit.css
+++ b/src/components/card/card-proj-edit.css
@@ -1,5 +1,5 @@
 .card-proj-edit {
-    width: 309px;
+    width: 95%;
     padding: 20px 25px;
     box-sizing: border-box;
     margin-bottom: 27px;
@@ -52,6 +52,8 @@
 .card-proj-edit .option .edit {
     color: var(--color-blue);
     text-decoration:underline;
+    min-width: 30px;
+    /* background-color: red; */
 }
 
 .card-proj-edit .option .status {
@@ -63,6 +65,7 @@
     transform: rotate(-45deg);
     border-top: transparent;
     border-right: transparent;
+    margin-top: 4px;
 }
 .noEdit:hover{
     cursor: not-allowed;
diff --git a/src/components/list/ListProj.tsx b/src/components/list/ListProj.tsx
index a7d468d..f8a0d3c 100644
--- a/src/components/list/ListProj.tsx
+++ b/src/components/list/ListProj.tsx
@@ -8,10 +8,10 @@ import { IListPage } from "../../interfaces/listpage/IListPage.ts";
 import { IProj } from "../../interfaces/proj/IProj.ts";
 // import NoData from "../../assets/no-data.png";
 import { useLocation } from 'react-router-dom';
-import syminga from '../../static/homeimg/homeimga.png'
-import symingb from '../../static/homeimg/homeimgb.png'
-import symingc from '../../static/homeimg/homeimgc.png'
-import symingd from '../../static/homeimg/homeimgd.png'
+// import syminga from '../../static/homeimg/homeimga.png'
+// import symingb from '../../static/homeimg/homeimgb.png'
+// import symingc from '../../static/homeimg/homeimgc.png'
+// import symingd from '../../static/homeimg/homeimgd.png'
 import { getMenuActive } from '../../util/cache.ts';
 
 // import gpsImg from '../../static/right/gps.png'
@@ -29,8 +29,9 @@ export default function ListProj() {
     //     // setKeywords(state.keyword)
     // }
     const keywords = state ? state.keyword : ''
+    const name = state?state.name:''
     // console.log(keywords);
-    const images  = [syminga,symingb,symingc,symingd]
+    // const images  = [syminga,symingb,symingc,symingd]
     const listProjRef: MutableRefObject<HTMLDivElement | null> = useRef(null);
     const listRef: MutableRefObject<HTMLDivElement | null> = useRef(null);
 
@@ -55,6 +56,7 @@ export default function ListProj() {
                     page: currentPage,
                     rows: 10,
                     keywords: keywords,
+                    charge:name,
                     projCategoryId: indexListContext.category,
                     status: indexListContext.status ? indexListContext.status : getMenuActive()
                 }
@@ -66,13 +68,13 @@ export default function ListProj() {
                 console.log('看看结果', data);
                 setPage(data.page);
                 setTotal(data.total);
-                // setProjs(data.rows);
-                const updatedArr = (data.rows).map((item, index) => ({
-                    ...item,
-                    img: images[index % images.length] // 利用取余来循环填充图片
-                }));
-                console.log('循环数组',updatedArr);
-                setProjs(updatedArr);
+                setProjs(data.rows);
+                // const updatedArr = (data.rows).map((item, index) => ({
+                //     ...item,
+                //     img: images[index % images.length] // 利用取余来循环填充图片
+                // }));
+                // console.log('循环数组',updatedArr);
+                // setProjs(updatedArr);
     
             },
             onFinally() {
@@ -159,7 +161,7 @@ export default function ListProj() {
         setTimeout(() => {
             setShowPage(true)
         }, 0);
-    }, [indexListContext.status,keywords])
+    }, [indexListContext.status,keywords,name])
 
     useEffect(() => {
         if (indexListContext.categorys) {
diff --git a/src/components/scrollAD/ScrollAd.tsx b/src/components/scrollAD/ScrollAd.tsx
new file mode 100644
index 0000000..dedcf16
--- /dev/null
+++ b/src/components/scrollAD/ScrollAd.tsx
@@ -0,0 +1,27 @@
+import React, { useEffect } from 'react'
+import './scrollAd.css'
+export default function ScrollAd() {
+    useEffect(() => {
+        const scrollInterval = setInterval(() => {
+            const adContainer = document.getElementById('scrolling-ad-container');
+            if (adContainer) {
+                adContainer.scrollLeft += 1; // 每次滚动的距离
+                if (adContainer.scrollLeft % adContainer.scrollWidth === 0) {
+                    clearInterval(scrollInterval); // 滚动到末尾时停止滚动
+                }
+            }
+        }, 50); // 滚动速度，单位毫秒
+
+        return () => clearInterval(scrollInterval); // 组件卸载时清除定时器
+    }, []);
+    return (
+        <div id="scrolling-ad-container" className="scrolling-ad-container">
+
+            <div className="scrolling-ad-content">
+                    广告广告广告广告广告广告广告广告广告广告广告广告广告广
+            </div>
+        </div>
+    
+
+    )
+}
diff --git a/src/components/scrollAD/scrollAd.css b/src/components/scrollAD/scrollAd.css
new file mode 100644
index 0000000..22792f8
--- /dev/null
+++ b/src/components/scrollAD/scrollAd.css
@@ -0,0 +1,28 @@
+.scrolling-ad-container {
+    overflow: hidden; /* 隐藏超出盒子的部分 */
+    white-space: nowrap; /* 内容不换行 */
+    position: relative; /* 使子元素的动画定位参考于此 */
+    padding: 10px; /* 内容内边距 */
+    width: 100%; /* 盒子的宽度 */
+    height: 30px; /* 盒子的高度 */
+    display: flex;
+    align-items: center; /* 垂直居中对齐文字 */
+    box-sizing: border-box; /* 包含内边距和边框 */
+    
+  }
+  
+  .scrolling-ad-content {
+    
+    display: inline-block;
+    padding-left: 100%; /* 确保广告从盒子外开始滚动 */
+    animation: scrollLeft 10s linear infinite; /* 滚动动画，持续时间为10秒，线性匀速，无限循环 */
+  }
+  
+  @keyframes scrollLeft {
+    0% {
+      transform: translateX(0); /* 从盒子的右边开始 */
+    }
+    100% {
+      transform: translateX(-100%); /* 向左移动到盒子的左边 */
+    }
+  }
\ No newline at end of file
diff --git a/src/components/step/StepProjEdit.tsx b/src/components/step/StepProjEdit.tsx
index 8c16a2b..e4d90b8 100644
--- a/src/components/step/StepProjEdit.tsx
+++ b/src/components/step/StepProjEdit.tsx
@@ -1,12 +1,16 @@
 import './step-proj-edit.css';
 import { IStepProj, Process } from "../../interfaces/step/IStepProj.ts";
 // import { CheckOutlined } from "@ant-design/icons";
-import { useEffect } from 'react';
-
+import { useEffect, useState, } from 'react';
+import { useLocation } from 'react-router-dom';
 export default function StepProjEdit(props: IStepProj) {
+    const location = useLocation()
+    const [allShow, setAllShow] = useState(false)
     useEffect(() => {
-        console.log(props);
-
+        // console.log(props);
+        // location.pathname.includes('/proj-eall')
+        console.log('路由', location.pathname);
+        setAllShow(location.pathname.includes('/proj-eall') ? true : false)
     }, [])
     const height = window.innerHeight - 390;
     // 状态值  已完成:Process.COMPLETE  进行中: Process.PROCESSING 未操作:Process.PENDING
@@ -83,7 +87,7 @@ export default function StepProjEdit(props: IStepProj) {
                     props.step === 1 ? 'complete-oneLine setLine' : props.step === 2 ? 'complete-twoLine setLine' : props.step === 3 ? 'complete-threeLine setLine' : props.step === 4 ? 'complete-fourLine setLine' : ''
                 }></div>
             )
-        } 
+        }
         // else if (props.process == Process.PROCESSING) {
         //     // 进行中
         //     return(
@@ -96,15 +100,17 @@ export default function StepProjEdit(props: IStepProj) {
     }
 
     return (
-        <div className="step-proj">
+        <div className="step-proj" style={{width:allShow?'19%':'21%'}}>
             <div className="step" >
                 {renderStepNo()}
                 {/* {renderStepDesc()} */}
-                {renderStepLine()}
+                <div style={{display:allShow?'none':'block'}}>
+                    {renderStepLine()}
+                </div>
                 <div className='downBox'></div>
             </div>
             <div className="step-card" style={{ maxHeight: `${height - 20}px` }}>
-            {/* <div className="step-card" style={{  }}> */}
+                {/* <div className="step-card" style={{  }}> */}
                 <div className="step-card-list">{props.children}</div>
             </div>
         </div>
diff --git a/src/components/step/step-proj-edit.css b/src/components/step/step-proj-edit.css
index 0b05633..b6a9bc3 100644
--- a/src/components/step/step-proj-edit.css
+++ b/src/components/step/step-proj-edit.css
@@ -1,5 +1,7 @@
 .step-proj {
-    width: 317px;
+    /* width: 317px; */
+    width: 21%;
+    /* background: skyblue; */
     position: relative;
     /* overflow: scroll; */
 }
@@ -14,7 +16,7 @@
 
 }
 .step-proj .step {
-    width: 309px;
+    width: 100%;
     height: 56px;
     /* background-color: rgb(248, 213, 219); */
     margin-top: 10px;
@@ -27,7 +29,8 @@
 
 /* Top 状态:已完成 开始---------------------------------------------------------------*/
 .step-proj .step .complete-one {
-    width: 309px;
+    /* width: 309px; */
+    width: 100%;
     height: 56px;
     /* background-color: pink; */
     display: flex;
@@ -45,12 +48,12 @@
     display: flex;
     align-items: center;
     justify-content: center;
-    margin-left: 44px;
+    margin-left: 11%;
 }
 
 /* 已完成状态第一个序号 */
 .step-proj .step .complete-one .complete-num {
-    margin-left: 16px;
+    margin-left: 8%;
 
 }
 
@@ -60,16 +63,18 @@
     font-weight: 700;
     font-size: 16px;
     color: #FFFFFF;
-    margin-left: 47px;
+    margin-left: 15%;
 }
 
 /* 已完成状态第一个标题 */
 .step-proj .step .complete-one .complete-text {
-    margin-left: 61px;
+    margin-left: 23%;
 }
 
 .step-proj .step .complete-two {
-    width: 309px;
+    /* width: 309px; */
+    width: 100%;
+
     height: 56px;
     /* background-color: pink; */
     display: flex;
@@ -79,7 +84,9 @@
 }
 
 .step-proj .step .complete-three {
-    width: 309px;
+    /* width: 309px; */
+    width: 100%;
+
     height: 56px;
     /* background-color: pink; */
     display: flex;
@@ -89,7 +96,9 @@
 }
 
 .step-proj .step .complete-four {
-    width: 309px;
+    /* width: 309px; */
+    width: 100%;
+
     height: 56px;
     /* background-color: pink; */
     display: flex;
@@ -99,11 +108,11 @@
 }
 /* 已完成状态连接线 */
 .step-proj .step .setLine {
-    width: 49px;
+    width: 10%;
     height: 22px;
     background-color: pink;
     position: absolute;
-    right: -67px;
+    right: -15%;
     top: 17px;
 }
 .step-proj .step .complete-oneLine{
@@ -125,7 +134,9 @@
 
 /* Top 状态:进行中  开始----------------------------------------------------------- */
 .step-proj .step .processing-one {
-    width: 309px;
+    /* width: 309px; */
+    width: 100%;
+
     height: 56px;
     /* background-color: pink; */
     display: flex;
@@ -135,7 +146,9 @@
 }
 
 .step-proj .step .processing-two {
-    width: 309px;
+    /* width: 309px; */
+    width: 100%;
+
     height: 56px;
     /* background-color: pink; */
     display: flex;
@@ -145,7 +158,9 @@
 }
 
 .step-proj .step .processing-three {
-    width: 309px;
+    /* width: 309px; */
+    width: 100%;
+
     height: 56px;
     /* background-color: pink; */
     display: flex;
@@ -155,7 +170,9 @@
 }
 
 .step-proj .step .processing-four {
-    width: 309px;
+    width: 100%;
+    
+    /* width: 309px; */
     height: 56px;
     /* background-color: pink; */
     display: flex;
@@ -168,7 +185,7 @@
     height: 21px;
     background: #FFFFFF;
     border-radius: 50%;
-    margin-left: 46px;
+    margin-left: 18%;
     display: flex;
     justify-content: center;
     align-items: center;
@@ -183,7 +200,7 @@
     font-weight: 700;
     font-size: 16px;
     color: #71757E;
-    margin-left: 47px;
+    margin-left: 15%;
 }
 
 /* Top 状态:进行中   结束----------------------------------------------------------- */
@@ -193,9 +210,12 @@
 /* Top 状态:未操作  开始 ------------------------------------------------------------ */
 .step-proj .step .pending {
     width: 309px;
+    width: 100%;
+
     height: 56px;
     display: flex;
     align-items: center;
+    /* background: pink; */
     background: url('../../static/editPro/no.png');
     background-size: 100% 100%;
 }
@@ -205,7 +225,7 @@
     height: 21px;
     background: #FFFFFF;
     border-radius: 50%;
-    margin-left: 46px;
+    margin-left: 18%;
     display: flex;
     justify-content: center;
     align-items: center;
@@ -220,7 +240,7 @@
     font-weight: 700;
     font-size: 16px;
     color: #71757E;
-    margin-left: 47px;
+    margin-left: 15%;
 }
 .step-proj .step .no-line{
     background:url('../../static/editPro/lineno.png');
diff --git a/src/layout/head/Head.tsx b/src/layout/head/Head.tsx
index f78a6fd..90f4b4b 100644
--- a/src/layout/head/Head.tsx
+++ b/src/layout/head/Head.tsx
@@ -36,12 +36,23 @@ export default function Head() {
         authorId: '',
         authorProvinceCity: ''
     })
+    
     const setValue = () => {
         // console.log(value);
+    }
+    const setConcatValue = ()=> {
+        
     }
     // 联系人弹窗
     const [contactModal, setContactModal] = useState(false)
-
+    const [concatPeopleInfo,setConcatPeopleInfo] = useState({
+        applyConcatId:'',
+        applyContactCsaNo:'',
+        applyContactEmail:'',
+        applyContactName:'',
+        applyContactPhone:'',
+        applyContactCompany:''
+    })
     useEffect(() => {
         reloadUser(messageApi, globalDispatchContext).then((data) => {
             if (!data.hasUserInfo) {
@@ -278,7 +289,7 @@ export default function Head() {
 
                 }}>
 
-                <ContactPeople ></ContactPeople>
+                <ContactPeople isShow={false}  closeModal = {()=>{setContactModal(false)} } setConcatPeopleInfo={setConcatPeopleInfo} concatPeopleInfo={concatPeopleInfo} setConcatValue={setConcatValue}></ContactPeople>
             </Modal>
             <Spin tip="正在提交..." spinning={loading} fullscreen />
             {contextHolder}
diff --git a/src/route/index/Index.tsx b/src/route/index/Index.tsx
index 95b56f1..bd80d0f 100644
--- a/src/route/index/Index.tsx
+++ b/src/route/index/Index.tsx
@@ -8,7 +8,7 @@ import MenuWithTopButton from "../../components/menu/MenuWithTopButton.tsx";
 import MenuTreeWithTopButton from "../../components/menu/MenuTreeWithTopButton.tsx";
 // import ListProj from "../../components/list/ListProj.tsx";
 // import ListProjAgent from "../../components/list/ListProjAgent.tsx";
-import { MenuProps } from 'antd';
+import { MenuProps,Select } from 'antd';
 import {
     IndexListContext,
     IndexListDataType,
@@ -29,8 +29,9 @@ const { Search } = Input;
 
 
 export default function Index() {
-
-    // const [keywords, setKeywords] = useState('');
+    // 关键字
+    const [keywords, setKeywords] = useState('');
+    const [type,setType] = useState('')
     // const indexListContext = useContext(IndexListContext);
 
 
@@ -195,81 +196,119 @@ export default function Index() {
     // const [newname,setNewname] = useState('')
 
     const [pathArray, setPathArray] = useState<any>([])
+    const [showSearchBox,setShowSearchBox] = useState(true)
     useEffect(() => {
         // const nowname = sessionStorage.getItem('now')
         console.log('路由名字', location.pathname);
         if (location.pathname.includes('/home')) {
             setNow('首页')
             setPathArray([{ title: '首页' }])
+            setShowSearchBox(true)
+
         } else if (location.pathname.includes('/proj-create')) {
+            setShowSearchBox(false)
             setNow('创建项目')
             setPathArray([{ title: <Link to={'/home'}>首页</Link> }, { title: '创建项目' }])
             // /config-mod-list    /config-menu-list /config-mod-show
         } else if (location.pathname.includes('/proj-edit') && !location.pathname.includes('/config-mod-show') && !location.pathname.includes('/config-mod-edit') && !location.pathname.includes('/step') && !location.pathname.includes('/config-loginpage') && !location.pathname.includes('/config-mod-save') && !location.pathname.includes('/config-mod-list') && !location.pathname.includes('/config-menu-list')) {
             setNow('编辑项目')
+            setShowSearchBox(false)
+
             // setEditname(location.pathname)
             setPathArray([{ title: <Link to={'/home'}>首页</Link> }, { title: <Link to={'/proj-create'}>创建项目</Link> }, { title: '编辑项目' }])
         } else if (location.pathname.includes('/proj-new')) {
             setNow('新建项目')
+            setShowSearchBox(false)
+
             // setNewname(location.pathname)
             setPathArray([{ title: <Link to={'/home'}>首页</Link> }, { title: <Link to={'/proj-create'}>创建项目</Link> }, { title: '新建项目' }])
         } else if (location.pathname.includes('/proj-efree')) {
             setNow('编辑项目')
+            setShowSearchBox(false)
+
             // setNewname(location.pathname)
             setPathArray([{ title: <Link to={'/home'}>首页</Link> }, { title: <Link to={'/proj-create'}>创建项目</Link> }, { title: '编辑项目' }])
         } else if (location.pathname.includes('/proj-eall')) {
             setNow('编辑项目')
+            setShowSearchBox(false)
+
             // setNewname(location.pathname)
             setPathArray([{ title: <Link to={'/home'}>首页</Link> }, { title: <Link to={'/proj-create'}>创建项目</Link> }, { title: '编辑项目' }])
         } else if (location.pathname.includes('/proj-edit/step1')) {
             setNow('标题简介')
+            setShowSearchBox(false)
+
             // setNewname(location.pathname)
             setPathArray([{ title: <Link to={'/home'}>首页</Link> }, { title: <Link to={'/proj-create'}>创建项目</Link> }, { title: <a onClick={() => { nav(-1) }}>编辑项目</a> }, { title: '标题简介' }])
         } else if (location.pathname.includes('/proj-edit/step2')) {
             setNow('标题简介')
+            setShowSearchBox(false)
+
             // setNewname(location.pathname)
             setPathArray([{ title: <Link to={'/home'}>首页</Link> }, { title: <Link to={'/proj-create'}>创建项目</Link> }, { title: <a onClick={() => { nav(-1) }}>编辑项目</a> }, { title: '基本信息' }])
         } else if (location.pathname.includes('/proj-edit/config-loginpage')) {
             setNow('登录界面设置')
+            setShowSearchBox(false)
+
             // setNewname(location.pathname)
             setPathArray([{ title: <Link to={'/home'}>首页</Link> }, { title: <Link to={'/proj-create'}>创建项目</Link> }, { title: <a onClick={() => { nav(-1) }}>编辑项目</a> }, { title: '登录界面设置' }])
         } else if (location.pathname.includes('/proj-edit/config-mod-list')) {
             setNow('系统菜单管理')
+            setShowSearchBox(false)
+
             // setNewname(location.pathname)
             setPathArray([{ title: <Link to={'/home'}>首页</Link> }, { title: <Link to={'/proj-create'}>创建项目</Link> }, { title: <a onClick={() => { nav(-1) }}>编辑项目</a> }, { title: '系统菜单管理' }])
         } else if (location.pathname.includes('/proj-edit/config-menu-list')) {
             setNow('系统菜单顺序')
+            setShowSearchBox(false)
+
             // setNewname(location.pathname)
             setPathArray([{ title: <Link to={'/home'}>首页</Link> }, { title: <Link to={'/proj-create'}>创建项目</Link> }, { title: <a onClick={() => { nav(-1) }}>编辑项目</a> }, { title: '系统菜单顺序' }])
         } else if (location.pathname.includes('/step3')) {
             setNow('软件功能特点')
+            setShowSearchBox(false)
+
             // setNewname(location.pathname)
             setPathArray([{ title: <Link to={'/home'}>首页</Link> }, { title: <Link to={'/proj-create'}>创建项目</Link> }, { title: <a onClick={() => { nav(-1) }}>编辑项目</a> }, { title: '软件功能特点' }])
         } else if (location.pathname.includes('/proj-edit/config-mod-save')) {
             setNow('添加菜单')
+            setShowSearchBox(false)
+
             setPathArray([{ title: <Link to={'/home'}>首页</Link> }, { title: <Link to={'/proj-create'}>创建项目</Link> }, { title: <a onClick={() => { nav(-1) }}>编辑项目</a> }, { title: '添加菜单' }])
         } else if (location.pathname.includes('/proj-edit/config-mod-edit')) {
             setNow('编辑菜单')
+            setShowSearchBox(false)
+
             setPathArray([{ title: <Link to={'/home'}>首页</Link> }, { title: <Link to={'/proj-create'}>创建项目</Link> }, { title: <a onClick={() => { nav(-2) }}>编辑项目</a> }, { title: <a onClick={() => { nav(-1) }}>系统菜单管理</a> }, { title: '编辑菜单' }])
             //  /config-mod-edit  /config-mod-show
         } else if (location.pathname.includes('/proj-edit/config-mod-show')) {
             setNow('查看菜单')
+            setShowSearchBox(false)
+
             setPathArray([{ title: <Link to={'/home'}>首页</Link> }, { title: <Link to={'/proj-create'}>创建项目</Link> }, { title: <a onClick={() => { nav(-2) }}>编辑项目</a> }, { title: <a onClick={() => { nav(-1) }}>系统菜单管理</a> }, { title: '查看菜单' }])
             //  /config-mod-edit 
         } else if (location.pathname.includes('/product-release')) {
             setNow('首页')
+            setShowSearchBox(false)
+
             setPathArray([{ title: '首页' }])
             //  /config-mod-edit  /product-release /transaction-order
         } else if (location.pathname.includes(' /transaction-order')) {
             setNow('首页')
+            setShowSearchBox(false)
+
             setPathArray([{ title: '首页' }])
             //  /config-mod-edit  /product-release /transaction-order
         } else if (location.pathname.includes(' /copyright-goods')) {
             setNow('首页')
+            setShowSearchBox(false)
+
             setPathArray([{ title: '首页' }])
             //  /config-mod-edit  /product-release /transaction-order
         } else if (location.pathname.includes(' /trading-goods')) {
             setNow('首页')
+            setShowSearchBox(false)
+
             setPathArray([{ title: '首页' }])
             //  /config-mod-edit  /product-release /transaction-order
         }
@@ -296,9 +335,11 @@ export default function Index() {
 
     const handleSearch = (value: string) => {
         console.log(value);
+        setKeywords(value)
         nav('/home', {
             state: {
-                keyword: value
+                keyword: value,
+                name:type
             }
         })
     }
@@ -348,7 +389,7 @@ export default function Index() {
                                         <div>当前位置:{now}</div>
                                     </div>
                                     <div className='line' style={{
-                                        display: location.pathname.includes('/home') ? 'block' : 'none',
+                                        display:showSearchBox ? 'block' : 'none',
 
                                     }} ></div>
                                     <div
@@ -357,14 +398,37 @@ export default function Index() {
                                             height: 23,
                                             marginLeft: 33,
                                             marginRight: 31,
-                                            display: location.pathname.includes('/home') ? 'none' : 'block'
+                                            display: showSearchBox ? 'none' : 'block'
                                         }}
                                     ></div>
                                     <Search placeholder="输入项目名称" onSearch={handleSearch} style={{
                                         width: '253px',
                                         height: '31px',
-                                        display: location.pathname.includes('/home') ? 'block' : 'none'
+                                        display: showSearchBox ? 'block' : 'none'
                                     }} />
+                                    <Select
+                                        style={{ height: '31px', width: '183px',marginLeft:20, display: showSearchBox ? 'block' : 'none' }}
+                                        onChange={(value: string) => {
+                                            // console.log(`selected ${value}`);
+                                            setType(value)
+                                            // alert(`selected ${value}`)
+                                            // lyp
+                                            nav('/home', {
+                                                state: {
+                                                    keyword: keywords,
+                                                    name:value
+                                                }
+                                            })
+
+                                        }}
+                                        options={[
+                                            { value: '', label: '全部类型' },
+                                            { value: 'FREE', label: '免费试用' },
+                                            { value: 'MATERIAL', label: '写材料' },
+                                            { value: 'ALL', label: '全托管' },
+                                        ]}
+                                        defaultValue=""
+                                    />
                                     <div style={{
                                         width: '253px',
                                         height: '31px',
diff --git a/src/route/proj/ProjCreate.tsx b/src/route/proj/ProjCreate.tsx
index a592e3e..680f2bf 100644
--- a/src/route/proj/ProjCreate.tsx
+++ b/src/route/proj/ProjCreate.tsx
@@ -1,12 +1,17 @@
 import './proj-create.css'
 import { useNavigate } from "react-router-dom";
 import { message } from "antd";
+import {
+    CloseOutlined
+  } from '@ant-design/icons';
 import CardProjType from "../../components/card/CardProjType.tsx";
-import { 
+import {
     // IProjCharge,
-    ProjAdditionalType, ProjChargeType } from "../../interfaces/proj/IProj.ts";
+    ProjAdditionalType, ProjChargeType
+} from "../../interfaces/proj/IProj.ts";
 import { useEffect, useState } from "react";
 import { get } from "../../util/AjaxUtils.ts";
+import ScrollAd from '../../components/scrollAD/ScrollAd.tsx'
 // import { Link } from "react-router-dom";
 
 export default function ProjCreate() {
@@ -31,9 +36,10 @@ export default function ProjCreate() {
     const [allInfo, setAllInfo] = useState<any>({}) //全部托管信息
     const [materialInfo, setMaterialInfo] = useState<any>({}) //写材料信息
     const [freeInfo, setFreeInfo] = useState<any>({}) //免费托管信息
-    const [ freeCount,setFreeCount] = useState(0) //免费次数
+    const [freeCount, setFreeCount] = useState(0) //免费次数
     const nav = useNavigate();
     const height = window.innerHeight - 170;
+    const [show,setShow] = useState(true) //是否显示广告
     useEffect(() => {
         get<any>({
             messageApi: messageApi,
@@ -52,14 +58,26 @@ export default function ProjCreate() {
         // sessionStorage.setItem('pathArray', JSON.stringify([ { title: <Link to={'/home'}>首页</Link> },{ title: '创建项目' }]));
         // sessionStorage.setItem('now', '创建');
         console.log(allInfo);
-        
+
     }, [])
 
     return (
         < >
             {contextHolder}
             <div style={{}}>
-                <div className="proj-create" style={{ height: `${height}px`, overflow: 'auto' }}>
+                <div className="proj-create" style={{ height: `${height}px`, overflow: 'auto', position: 'relative' }}>
+                    <div style={{ position: 'absolute', top: 0, left: 0, width: '100%', background: 'rgba(0, 0, 0, 0.1)' ,display:show?'block':'none'}}>
+                        <div style={{display:'flex',justifyContent:'space-between',alignItems:'center'}}>
+                            <div style={{width:'100%'}}>
+                                <ScrollAd></ScrollAd>
+                            </div>
+                            <div style={{width:20,fontWeight:700,cursor:'pointer'}} onClick={()=>{
+                                setShow(false)
+                            }}>
+                                <CloseOutlined />
+                            </div>
+                        </div>
+                    </div>
                     <CardProjType
                         head={'全托'}
                         bodyLineArray={[
@@ -95,8 +113,8 @@ export default function ProjCreate() {
                                 }
                             }
                         ]}
-                    isShow = {allInfo.isShow}
-                    isClickable = {allInfo.isClickable}
+                        isShow={allInfo.isShow}
+                        isClickable={allInfo.isClickable}
                     />
                     {/* <CardProjType
                         head={'写材料+代理'}
@@ -164,7 +182,7 @@ export default function ProjCreate() {
                                     '系统可在线运行一年',
                                     '软著材料编写',
                                     '资料补正三次',
-                                   
+
                                 ]
                             },
                         ]}
@@ -173,7 +191,7 @@ export default function ProjCreate() {
                                 title: '使用流程：',
                                 contents: [
                                     '系统操作手册执行',
-                                   
+
                                 ]
                             }
                         ]
@@ -183,13 +201,13 @@ export default function ProjCreate() {
                                 id: ProjAdditionalType.PKG,
                                 price: charge.pkg,
                                 title: `安装包 ${charge.pkg / 100} 元`
-                               
+
                             },
                             {
                                 id: ProjAdditionalType.VIDEO_DEMO,
                                 price: charge.videoDemo,
                                 title: `系统演示视频文件 ${charge.videoDemo / 100} 元`
-                               
+
                             }
                         ]}
                         buyArray={[
@@ -201,8 +219,8 @@ export default function ProjCreate() {
                                 }
                             }
                         ]}
-                        isShow = {materialInfo.isShow}
-                        isClickable = {materialInfo.isClickable}
+                        isShow={materialInfo.isShow}
+                        isClickable={materialInfo.isClickable}
                     />
                     <CardProjType
                         head={`免费试用${freeCount}次`}
@@ -214,7 +232,7 @@ export default function ProjCreate() {
                                     '系统可在线存储三天',
                                 ]
                             },
-                            
+
                         ]}
                         newArray={[
                             {
@@ -234,8 +252,8 @@ export default function ProjCreate() {
                                 }
                             }
                         ]}
-                        isShow = {freeInfo.isShow}
-                        isClickable = {freeInfo.isClickable}
+                        isShow={freeInfo.isShow}
+                        isClickable={freeInfo.isClickable}
                     />
                 </div>
             </div>
diff --git a/src/route/proj/ProjEditAll.tsx b/src/route/proj/ProjEditAll.tsx
index ffee14e..03555b5 100644
--- a/src/route/proj/ProjEditAll.tsx
+++ b/src/route/proj/ProjEditAll.tsx
@@ -1,76 +1,232 @@
 import './proj-edit.css';
+// import {Link, useNavigate, useParams} from "react-router-dom";
 import { useNavigate, useParams } from "react-router-dom";
-import { Button, message, Modal } from "antd";
+import {
+    Button,
+    // FloatButton,
+    message, Modal,
+    Tag, Upload,
+    //  GetProp,
+      UploadProps, 
+} from "antd";
+import { UploadOutlined } from '@ant-design/icons';
+import TextArea from "antd/es/input/TextArea";
 import StepProjEdit from "../../components/step/StepProjEdit.tsx";
 import CardProjEdit from "../../components/card/CardProjEdit.tsx";
 import { Process } from "../../interfaces/step/IStepProj.ts";
+import CardProjLoading from "../../components/card/CardProjLoading.tsx";
+import CardProjResult from "../../components/card/CardProjResult.tsx";
 import CardProjDownload from "../../components/card/CardProjDownload.tsx";
 import CardProjJump from "../../components/card/CardProjJump.tsx";
 import { useEffect, useState } from "react";
-import { Axios, get } from "../../util/AjaxUtils.ts";
+import { Axios, get, put, post, uploadFileUrl, DevUserId, downloadUrl } from "../../util/AjaxUtils.ts";
 import { EditStepEnum, IProjEdit } from "../../interfaces/card/ICardProj.ts";
-import { MAX_MOD_SIZE } from "./edit/ProjConfigModList.tsx";
+import { MIN_MOD_SIZE } from "./edit/ProjConfigModList.tsx";
 import { GenerateStatus } from "../../interfaces/proj/IProj.ts";
+// import AiHelper from "../../components/ai/AiHelper.tsx";
 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'
+// import aiGif from '../../static/ai.gif'
+// type AiHelperType = {
+//     projId: string;
+//     projIntroduction: string;
+//     projDesc: string;
+//     projMods: ProjModType[];
+// }
+
+// type ProjModType = {
+//     name: string,
+//     desc: string
+// }
+// type FileType = Parameters<GetProp<UploadProps, 'beforeUpload'>>[0];
 export default function ProjEditAll() {
+    // 回复信息
+    const [aContent, setaContent] = useState('')
+    // 回复问题的id
+    const [projMaterialsAddId, setprojMaterialsAddId] = useState('')
+    // 上传附件
+    const [uploadedFiles, setUploadedFiles] = useState<any[]>([]);
+    // 接口需要的文件id数组
+    // const [aFiles, setAFiles] = useState<string[]>([])
+    const props: UploadProps = {
+        maxCount: 6,//上传限制最多6个
+        action: uploadFileUrl(),
+        headers: {
+            'X-USER-ID': DevUserId,
+        },
+        // headers={{'X-USER-ID': DevUserId}}
+        beforeUpload: (file) => {
+            const isPNG = file.type === 'application/pdf';
+            if (!isPNG) {
+                message.error('只能上传 PDF 格式文件!');
+                return Upload.LIST_IGNORE; // 不允许上传非PDF文件
+            }
+            // return isPNG || Upload.LIST_IGNORE;
+            // 检查是否已经上传过相同文件
+            const isDuplicate = uploadedFiles.some(uploadedFile => (
+                uploadedFile.name === file.name && uploadedFile.size === file.size
+            ));
+
+            if (isDuplicate) {
+                message.error('文件已经存在，请勿重复上传！');
+                return Upload.LIST_IGNORE; // 不允许上传重复文件
+            }
+
+            return true; // 允许上传文件
+        },
+        onChange: (info) => {
+            console.log(info.fileList);
+            if (info.file.status === 'done') {
+                message.success('上传成功');
+                // info.file.name = '协议文件';
+                console.log('列表', info.fileList);
+                setUploadedFiles([...uploadedFiles, info.file]); // 将上传成功的文件信息添加到列表中
+                // setUploadSignFileId(info.file.response.data.fileId);
+
+            } else if (info.file.status === 'error') {
+                message.error('上传失败');
+            }
+        },
+        // action={uploadFileUrl()}
+
+    };
+
+    // const [uploadSignFileId, setUploadSignFileId] = useState('');
+
+
     //第一步 标题简介弹窗
     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 [projModCount, setprojModCount] = useState(0)
+    const height = window.innerHeight - 180;
     const nav = useNavigate();
     const pathParams = useParams();
-
+    // 是否显示下载代码压缩包模块
+    // const [showZpi, setShowZpi] = useState(false)
     const [messageApi, contextHolder] = message.useMessage();
     const [editStepArray, setEditStepArray] = useState<IProjEdit[]>([]);
+    const [configArray, setConfigArray] = useState<IProjEdit[]>([]);
     const [isEditStepEdited, setIsEditStepEdited] = useState(false);
     const [isConfigEdited, setIsConfigEdited] = useState(false);
+    const [canGenerate, setCanGenerate] = useState(false);
     const [generateStatus, setGenerateStatus] = useState(GenerateStatus.NONE);
+    const [generateEmainingTime, setGenerateEmainingTime] = useState(0);
+    const [isGenerateModalOpen, setIsGenerateModalOpen] = useState(false);
     const [previewUrl, setPreviewUrl] = useState('');
+    const [generateErrorModal, setGenerateErrorModal] = useState(false);
+    const [generateErrorMsg, setGenerateErrorMsg] = useState('');
+    const [aiHelperModalOpen, setAiHelperModalOpen] = useState(false);
+    // const [aiHelper, setAiHelper] = useState<AiHelperType>({
+    //     projId: '',
+    //     projIntroduction: '',
+    //     projDesc: '',
+    //     projMods: [],
+    // });
+    // 点击回复弹窗
+    const [replyModal, setReplyModal] = useState(false)
+
 
     // const height = window.innerHeight - 240;
 
-    const renderEditStep = (data: any, isEdited: boolean, isGenerateSuccess: boolean) => {
-
+    const renderEditStep = (data: any, isEdited: boolean) => {
+        console.log('嘻嘻', data);
+        // projIntroduction
         const editStepArray: IProjEdit[] = [];
         editStepArray.push(
             {
                 title: '第1步:软件简介确认',
                 desc: '修改软件系统的相关简介与详细介绍',
                 step: 1,
-                btnName: !isGenerateSuccess ? '设置' : '查看',
+                // btnName: !isGenerateSuccess ? '设置' : '查看',
+                btnName: '查看',
                 status: data.projIntroduction ? EditStepEnum.EDITED : EditStepEnum.UN_EDIT,
                 handleEdit() {
-                    if (!isGenerateSuccess) {
-                        // nav(`/proj-edit/step1/${pathParams.projId}`)
-                        setTitleIntroductionOpen(true)
-                    } else {
-                        // nav(`/proj-edit/step1-show/${pathParams.projId}`)
-                        setTitleIntroductionShowOpen(true)
-                    }
+                    // if (!isGenerateSuccess) {
+                    //     // nav(`/proj-edit/step1/${pathParams.projId}`)
+                    //     setTitleIntroductionOpen(true)
+                    // } else {
+                    // nav(`/proj-edit/step1-show/${pathParams.projId}`)
+                    setTitleIntroductionShowOpen(true)
+                    // }
                 }
             },
             {
                 title: '第2步:软件基本信息填写',
                 desc: '完善软件简称、版本号、软件所属者及联系人等信息',
                 step: 2,
-                btnName: !isGenerateSuccess ? '设置' : '查看',
+                // btnName: !isGenerateSuccess ? '设置' : '查看',
+                btnName: '查看',
                 status: data.apply.projDevCompleteDate ? EditStepEnum.EDITED : EditStepEnum.UN_EDIT,
-                canBtnClick: false,
                 handleEdit() {
-                    if (generateStatus != GenerateStatus.SUCCESS) {
-                        // nav(`/proj-edit/step2/${pathParams.projId}`)
-                        setSoftwareOpen(true)
-
-                    } else {
-                        // nav(`/proj-edit/step2-show/${pathParams.projId}`)
-                        setSoftwareShowOpen(true)
-
-                    }
+                    // if (generateStatus != GenerateStatus.SUCCESS) {
+                    // if (!isGenerateSuccess) {
+                    //     // nav(`/proj-edit/step2/${pathParams.projId}`)
+                    //     setSoftwareOpen(true)
+                    // } else {
+                    // nav(`/proj-edit/step2-show/${pathParams.projId}`)
+                    setSoftwareShowOpen(true)
+                    // }
+                }
+            },
+            {
+                title: '第3步:软件功能特点设置',
+                desc: '设置软件相关功能特点',
+                step: 3,
+                btnName: '查看',
+                status: data.apply.envHardDev ? EditStepEnum.EDITED : EditStepEnum.UN_EDIT,
+                handleEdit() {
+                    // if (!isGenerateSuccess) {
+                    //     // nav(`/proj-edit/step3/${pathParams.projId}`)
+                    //     setSoftwareFeaturesOpen(true)
+                    // } else {
+                    // nav(`/proj-edit/step3-show/${pathParams.projId}`)
+                    setSoftwareFeaturesShowOpen(true)
+                    // }
+                }
+            },
+            {
+                title: '第4步:登录页面设置',
+                desc: '对登录界面进行个性化设置，包括背景图片等',
+                step: 1,
+                btnName: '查看',
+                // 状态判断lyp
+                status: data.loginpage.loginpageId ? EditStepEnum.EDITED : EditStepEnum.UN_EDIT,
+                handleEdit() {
+                    // if (!isGenerateSuccess) {
+                    //     // nav(`/proj-edit/config-loginpage/${pathParams.projId}`)
+                    //     setLoginPageOpne(true)
+                    // } else {
+                    // nav(`/proj-edit/config-loginpage-show/${pathParams.projId}`)
+                    setLoginPageShowOpne(true)
+                    // }
                 }
             },
             // {
@@ -101,33 +257,148 @@ export default function ProjEditAll() {
             //         }
             //     }
             // },
+            // {
+            //     title: '选择登录页面',
+            //     desc: '选择软件的登录页面模板',
+            //     step: 6,
+            //     btnName: !isGenerateSuccess ? '设置' : '查看',
+            //     status: editSteps[5].editStatus,
+            //     handleEdit() {
+            //         if (!isGenerateSuccess) {
+            //             nav(`/proj-edit/step6/${pathParams.projId}`)
+            //         } else {
+            //             nav(`/proj-edit/step6-show/${pathParams.projId}`)
+            //         }
+            //     }
+            // }
         )
         setEditStepArray(editStepArray);
         setIsEditStepEdited(isEdited);
     }
 
+    const renderSetting = (data: any, isConfig: boolean) => {
+        const configArray: IProjEdit[] = [];
+        configArray.push(
+            // {
+            //     title: '登录界面设置',
+            //     desc: '请对登录界面完成个性化设置',
+            //     step: 1,
+            //     btnName: !isGenerateSuccess ? '设置' : '查看',
+            //     status: data.loginpage.loginpageId ? EditStepEnum.EDITED : EditStepEnum.UN_EDIT,
+            //     handleEdit() {
+            //         if (!isGenerateSuccess) {
+            //             nav(`/proj-edit/config-loginpage/${pathParams.projId}`)
+            //         } else {
+            //             nav(`/proj-edit/config-loginpage-show/${pathParams.projId}`)
+            //         }
+            //     }
+            // },
+            {
+                title: '第5步:对软件功能进行管理',
+                desc: '可对软件功能列表进行添加与修改',
+                step: 2,
+                btnName: '查看',
+                status: data.projModCount >= MIN_MOD_SIZE ? EditStepEnum.EDITED : EditStepEnum.UN_EDIT,
+                handleEdit() {
+                    // if (!isGenerateSuccess) {
+                    //     // nav(`/proj-edit/config-mod-list/${pathParams.projId}`)
+                    //     setSoftwareManagementOpen(true)
+                    // } else {
+                    // nav(`/proj-edit/config-mod-list-show/${pathParams.projId}`)
+                    setSoftwareManagementShowOpen(true)
+                    // }
+                }
+
+            },
+            {
+                title: '第6步:设置功能列表显示顺序',
+                desc: '调整菜单顺序',
+                step: 3,
+                btnName: '查看',
+                status: data.projModCount >= MIN_MOD_SIZE ? EditStepEnum.EDITED : EditStepEnum.UN_EDIT,
+                handleEdit() {
+                    // if (!isGenerateSuccess) {
+                    //     // nav(`/proj-edit/config-menu-list/${pathParams.projId}`)
+                    //     setDisplayOrderOpen(true)
+                    // } else {
+                    // nav(`/proj-edit/config-menu-list-show/${pathParams.projId}`)
+                    setDisplayOrderShowOpen(true);
+                    // }
+                }
+            }
+        )
+        setConfigArray(configArray);
+        setIsConfigEdited(isConfig);
+    }
+
     const renderData = () => {
         get<any>({
             messageApi: messageApi,
             url: `/api/proj/get/${pathParams.projId}`,
             onSuccess({ data }) {
+                console.log('状态判断', data.pay.chargeAdditionals);
+                // setShowZpi(true)
+                // const isShow = data.pay.chargeAdditionals.includes('PKG')
+                // console.log(isShow);
+                // if (isShow) {
+                //     setShowZpi(true)
+                // } else {
+                //     setShowZpi(false)
+                // }
+
+                // const isEdited = data.editSteps[0].editStatus == EditStepEnum.EDITED
+                //     && data.editSteps[1].editStatus == EditStepEnum.EDITED
+                //     && data.editSteps[2].editStatus == EditStepEnum.EDITED
+                //     && data.editSteps[3].editStatus == EditStepEnum.EDITED
+                //     && data.editSteps[4].editStatus == EditStepEnum.EDITED
+                //     && data.editSteps[5].editStatus == EditStepEnum.EDITED;
+                // setprojModCount(data.projModCount)
                 const isEdited = Boolean(data.projIntroduction) == true && Boolean(data.apply.projDevCompleteDate) == true && Boolean(data.apply.envHardDev) == true && Boolean(data.loginpage.loginpageId) == true
-                const isConfig = data.loginpage.loginpageId && MAX_MOD_SIZE > 0;
-                const isGenerateSuccess: boolean = data.generate.generateStatus == GenerateStatus.SUCCESS;
-                renderEditStep(data, isEdited, isGenerateSuccess);
-                setIsConfigEdited(isConfig);
+                // console.log('isEdited',isEdited);
+
+                const isConfig = data.loginpage.loginpageId && data.projModCount >= MIN_MOD_SIZE;
+                const isGenerate = isEdited && isConfig;
+                // const isGenerateSuccess: boolean = data.generate.generateStatus == GenerateStatus.SUCCESS || data.generate.generateStatus == GenerateStatus.GENERATING;
+                renderEditStep(data, isEdited);
+                renderSetting(data, isConfig,);
+                setCanGenerate(isGenerate);
                 setGenerateStatus(data.generate.generateStatus);
                 setPreviewUrl(data.previewUrl);
+                setGenerateEmainingTime(data.generate.generateEmainingTime);
+                setGenerateErrorMsg(data.generate.generateMsg);
+                // setAiHelper({
+                //     projId: data.projId,
+                //     projIntroduction: data.projIntroduction,
+                //     projDesc: data.projDesc,
+                //     projMods: data.projMods
+                // })
+                // setAiHelperModalOpen(!data.projIntroduction || !data.projDesc)
+
+            }
+        })
+
+    }
+    const [questionList, setQuestionList] = useState<any[]>([])
+    // 获取问题及回复列表
+    const getQuestionList = () => {
+        get<any>({
+            messageApi: messageApi,
+            url: `/api/proj/materials/add/listpage/${pathParams.projId}`,
+            onSuccess({ data }) {
+                console.log('问题列表', data);
+                setQuestionList(data.rows)
+                // console.log(JSON.parse(data.rows[0].aFiles));
+
             }
         })
     }
-
     useEffect(() => {
         renderData();
+        getQuestionList()
     }, [])
 
     return (
-        <>
+        <div className='proj-edit-box' style={{ height: `${height}px`, overflow: 'auto' }}>
             {contextHolder}
             {/* <Breadcrumb
                 items={[
@@ -136,7 +407,8 @@ export default function ProjEditAll() {
                     {title: '编辑项目'},
                 ]}
             /> */}
-            <div className="proj-edit" style={{ marginTop: '21px', padding: '15px 175px' }}>
+            {/* <div className="proj-edit" style={{height: `${height}px`}}> */}
+            <div className="proj-edit" style={{}}>
                 <StepProjEdit step={1} process={isEditStepEdited ? Process.COMPLETE : Process.PROCESSING}
                     descTitle="完善信息"
                     descDetail="完善项目的基本信息"
@@ -151,27 +423,116 @@ export default function ProjEditAll() {
                                 handleEdit={item.handleEdit}
                                 background={item.status == EditStepEnum.EDITED ? '#F5FAFE' : '#f3f3f3'}
                                 shadow={item.status == EditStepEnum.EDITED ? '0px 3px 0px 0px rgba(55,144,215,0.18)' : ''}
-
                             />
                         })
                     }
 
                 </StepProjEdit>
+                {/*trueisEditStepEdited*/}
                 <StepProjEdit step={2}
                     process={!isEditStepEdited ? Process.PENDING : (isConfigEdited ? Process.COMPLETE : Process.PROCESSING)}
                     descTitle="功能设置"
                     descDetail="设置系统的菜单功能" hasNext={true}>
                     {
-                        <CardProjJump title="预览系统"
-                            desc={isEditStepEdited && isConfigEdited ? "点击查看预览系统" : "制作中"}
-                            canBtnClick={isEditStepEdited && isConfigEdited}
-                            handleJump={() => {
-                                window.open(`${Axios.defaults?.baseURL}/${previewUrl}`, '_blank')
-                            }}
-                        />
+                        configArray.map((item, index) => {
+                            return <CardProjEdit key={`config-${index}`}
+                                title={item.title}
+                                desc={item.desc}
+                                btnName={item.btnName}
+                                canBtnClick={true}
+                                status={item.status}
+                                handleEdit={item.handleEdit}
+                                background={item.status == EditStepEnum.EDITED ? '#F5FEFA' : '#f3f3f3'}
+                                shadow={item.status == EditStepEnum.EDITED ? ' 0px 3px 0px 0px rgba(55,215,138,0.18)' : ''}
+
+                            />
+                        })
+                    }
+                    {
+                        isEditStepEdited && isConfigEdited ? (
+                            <CardProjJump title="预览系统"
+                                desc="点击查看预览系统"
+                                canBtnClick={true}
+                                handleJump={() => {
+                                    window.open(`${Axios.defaults?.baseURL}/${previewUrl}`, '_blank')
+                                }}
+                            />
+                        ) : <></>
                     }
                 </StepProjEdit>
+
                 <StepProjEdit step={3}
+                    process={generateStatus == GenerateStatus.SUCCESS ? Process.COMPLETE : (canGenerate ? Process.PROCESSING : Process.PENDING)}
+                    descTitle="资料生成"
+                    hasNext={true}>
+                    {
+                        generateStatus == GenerateStatus.NONE || generateStatus == GenerateStatus.FAILED ? (
+                            <CardProjEdit title="第8步:资料生成"
+                                desc="生成软著所需要的资料，此操作后项目无法再次编辑"
+                                btnName="生成"
+                                status={EditStepEnum.UN_EDIT}
+                                canBtnClick={canGenerate}
+                                handleEdit={() => {
+                                    setIsGenerateModalOpen(true);
+                                    // setTimeout(() => {
+                                    //     window.location.reload();
+                                    // }, 1000)
+                                }}
+                                //   background = {status == EditStepEnum.EDITED?'#F5FAFE':'#f3f3f3'}
+                                //   shadow = {status == EditStepEnum.EDITED?'0px 3px 0px 0px rgba(55,144,215,0.18)':''}
+                                background='#f3f3f3'
+                            />
+                        ) : <></>
+                    }
+                    {
+                        generateStatus == GenerateStatus.PENDING ? (
+                            <CardProjLoading title="正在排队"
+                                desc="资料正在排队"
+                                duration={generateEmainingTime}
+                                handleCountDownOver={() => {
+                                    setTimeout(() => {
+                                        window.location.reload();
+                                    }, 1000)
+                                }}
+                            />
+                        ) : <></>
+                    }
+                    {
+                        generateStatus == GenerateStatus.GENERATING ? (
+                            <CardProjLoading title="正在生成"
+                                desc="资料正在生成，点击刷新"
+                                duration={generateEmainingTime}
+                                handleClick={() => {
+                                    renderData();
+                                }}
+                                handleCountDownOver={() => {
+                                    renderData();
+                                }}
+
+                            />
+                        ) : <></>
+                    }
+                    {
+                        generateStatus == GenerateStatus.SUCCESS ? (
+                            <CardProjResult title="生成成功"
+                                isSuccess={true}
+                            />
+                        ) : <></>
+                    }
+                    {
+                        generateStatus == GenerateStatus.FAILED ? (
+                            <CardProjResult title="生成失败"
+                                isSuccess={false}
+                                handleFeedback={() => {
+                                    setGenerateErrorModal(true);
+                                    console.log('反馈')
+                                }}
+                            />
+                        ) : <></>
+                    }
+                </StepProjEdit>
+
+                <StepProjEdit step={4}
                     process={generateStatus == GenerateStatus.SUCCESS ? Process.PROCESSING : Process.PENDING}
                     descTitle="资料下载">
                     <CardProjDownload title="申请表"
@@ -188,6 +549,7 @@ export default function ProjEditAll() {
                             window.open(`${Axios.defaults?.baseURL}/route/proj/download/manual/${pathParams.projId}`)
                         }}
                     />
+                    {/* {showZpi && ( */}
                     <CardProjDownload title="代码压缩包"
                         desc="点击下载代码压缩包"
                         canBtnClick={generateStatus == GenerateStatus.SUCCESS}
@@ -195,27 +557,215 @@ export default function ProjEditAll() {
                             window.open(`${Axios.defaults?.baseURL}/route/proj/download/code-zip/${pathParams.projId}`)
                         }}
                     />
-                    <CardProjDownload title="代码文档"
-                        desc="点击下载代码文档"
+                    {/* )} */}
+                    {/* <CardProjDownload title="代码压缩包"
+                        desc="点击下载代码压缩包"
+                        canBtnClick={generateStatus == GenerateStatus.SUCCESS}
+                        handleDownload={() => {
+                            window.open(`${Axios.defaults?.baseURL}/route/proj/download/code-zip/${pathParams.projId}`)
+                        }}
+                        
+                    /> */}
+                    <CardProjDownload title="源代码"
+                        desc="点击下载源代码"
                         canBtnClick={generateStatus == GenerateStatus.SUCCESS}
                         handleDownload={() => {
                             window.open(`${Axios.defaults?.baseURL}/route/proj/download/code/${pathParams.projId}`)
                         }}
                     />
+                    {/*<CardProjJump title="找代理"*/}
+                    {/*              desc="到软著代理完成软著申请"*/}
+                    {/*              handleJump={() => {*/}
+                    {/*                  nav(`/agent-select/${pathParams.projId}`);*/}
+                    {/*              }}*/}
+                    {/*/>*/}
                 </StepProjEdit>
+
+                <div className='editAll-box' >
+
+                    <div className='editAll-box-title'>
+                        资料补充
+                    </div>
+                    <div style={{ display: questionList.length == 0 ? 'block' : 'none' }} className='editAll-boxNo-con'>
+                        暂无数据
+                    </div>
+                    <div style={{ marginTop: 50, maxHeight: `${height - 230}px`, overflow: 'auto' }}>
+                        {questionList.length == 0 ? (<>
+                        </>) : (<>
+                            {questionList.map((item, index) => (
+                                <div key={index} className='editAll-box-con'>
+                                    <div className='question'>
+                                        <div>提问</div>
+                                        <div className='questionStatus'>
+                                            <Tag color={item.status == 'NONE' ? '#108ee9' : item.status == 'PASSED' ? '#87d068' : item.status == 'UN_PASSED' ? '#f50' : item.status == 'PENDING' ? '#2db7f5' : ''}>
+                                                {item.status == 'NONE' ? '未回复' : item.status == 'PASSED' ? '通过' : item.status == 'UN_PASSED' ? '未通过' : item.status == 'PENDING' ? '待审核' : ''}
+                                            </Tag>
+                                        </div>
+                                    </div>
+                                    <div className='boxtextTop'>
+                                        <div style={{ maxHeight: '140px', overflow: 'auto', fontSize: 16 }}>
+                                            {item.qContent}
+
+                                        </div>
+                                        <div className='unReason' style={{ display: item.status == 'UN_PASSED' ? 'block' : 'none' }}>未通过原因:{item.reason}</div>
+                                        <div className='fileBox' >
+                                            <a style={{ cursor: 'pointer' }} onClick={() => {
+                                                window.open(downloadUrl(item.qFiles))
+                                            }}>{item.qFiles}</a>
+                                        </div>
+                                    </div>
+                                    <div className='boxtitle' style={{}}>回复</div>
+                                    <div className='boxtextBot'>
+                                        <div style={{ maxHeight: '100px', overflow: 'auto', fontSize: 16 }}>{item.aContent}</div>
+
+                                        <div className='fileBox'>
+                                            {JSON.parse(item.aFiles).map((fileName: string, index: number) => (
+                                                <span key={index}>
+                                                    <a style={{ cursor: 'pointer', }} onClick={() => {
+                                                        window.open(downloadUrl(fileName))
+                                                    }}>{fileName} </a>
+                                                 
+                                                    <span style={{marginRight:5, visibility: index + 1 == JSON.parse(item.aFiles).length ? 'hidden' : 'visible' }}>,</span>
+                                                </span>
+                                            ))}
+
+                                        </div>
+                                        <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
+                                            <Button style={{ marginTop: '8px', display: item.status == 'PASSED' ? 'none' : 'block' }} onClick={() => {
+                                                setReplyModal(true)
+                                                setprojMaterialsAddId(item.projMaterialsAddId)
+                                                setUploadedFiles([])//清除
+                                                setaContent('')
+                                            }}>回复</Button>
+                                        </div>
+                                    </div>
+                                </div>
+                            ))}
+                        </>)}
+
+
+
+                        {/* <div className='editAll-box-con' >
+                            <div className=' question'>
+                                <div>提问</div>
+                                <div className='questionStatus'>
+                                    <Tag color="magenta">未通过</Tag>
+                                </div>
+                            </div>
+                            <div className='boxtextTop'>
+                                <div style={{ maxHeight: '140px', overflow: 'auto', fontSize: 16 }}>嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻</div>
+                                <div className='fileBox'>文件1,文件2</div>
+                            </div>
+                            <div className='boxtitle'>回复</div>
+                            <div className='boxtextBot'>
+                                <div style={{ maxHeight: '100px', overflow: 'auto', fontSize: 16 }}>哈哈哈哈哈哈哈哈</div>
+
+                                <div className='fileBox'>文件1,文件2</div>
+                                <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
+                                    <Button style={{ marginTop: '8px' }} onClick={() => {
+                                        setReplyModal(true)
+                                    }}>回复</Button>
+                                </div>
+                            </div>
+                        </div> */}
+
+
+                    </div>
+
+                </div>
+
             </div>
             <div className="btn-container">
                 <Button size="large" style={{
                     width: '200px',
                     height: '40px',
                     fontSize: '16px',
-                    backgroundColor: '#e9e7e7',
-                    color: '#A0A0A0',
-                    border: 'none',
+                    backgroundColor: 'white',
+                    // color: '#A0A0A0',
+                    // border: 'none',
                 }} onClick={() => {
                     nav(-1);
                 }}>返回</Button>
             </div>
+            {/* <FloatButton.Group>
+                <FloatButton
+                    shape="square" //报错处理 
+                    onClick={() => { setAiHelperModalOpen(true) }}
+                    description={<span style={{ fontWeight: 'bold' }}>AI</span>}
+                >AI助手</FloatButton>
+            </FloatButton.Group> */}
+            {/* <div className='aiImg' onClick={() => { setAiHelperModalOpen(true) }}>
+                <img src={aiGif} alt="" width={'100%'} height={'100%'} />
+            </div> */}
+
+            <Modal title="提示"
+                okText="确定"
+                cancelText="取消"
+                open={isGenerateModalOpen}
+                onOk={() => {
+                    setTimeout(() => {
+                        window.location.reload();
+                    }, 1000)
+                    post({
+                        messageApi,
+                        url: `/api/proj/generate/proj-id/${pathParams.projId}`,
+                        body: {},
+                        onSuccess() {
+                            messageApi.success('提交成功');
+                            setIsGenerateModalOpen(false);
+                            renderData();
+                        }
+                    })
+                }}
+                onCancel={() => {
+                    setIsGenerateModalOpen(false);
+                }}>
+                <div>点击“确定按钮”后，项目便无法再次修改，建议通过预览查看系统，确认无误后点击“确定按钮”。</div>
+            </Modal>
+            <Modal open={generateErrorModal}
+                title="出错信息"
+                okText="确定"
+                cancelText={false}
+                footer={false}
+                okButtonProps={{
+                    style: {
+                        backgroundColor: 'var(--color-primary)',
+                    }
+                }}
+                onCancel={() => {
+                    setGenerateErrorModal(false)
+                }}
+            >
+                <p style={{ color: 'var(--color-red)' }}>{generateErrorMsg}</p>
+            </Modal>
+            <Modal open={aiHelperModalOpen}
+                title=""
+                width={1200}
+                footer={false}
+                maskClosable={false}
+                destroyOnClose={true}
+                onCancel={() => {
+                    setAiHelperModalOpen(false);
+
+                    renderData()
+                    // setAiHelperModalOpen(false);
+                    // console.log(123);
+
+                }}
+
+            >
+                {/* <div style={{ height: `${height - 20}px`, overflow: 'hidden', }}>
+                    <AiHelper
+                        projId={aiHelper.projId}
+                        projIntroduction={aiHelper.projIntroduction}
+                        projDesc={aiHelper.projDesc}
+                        isFree={false}
+                        renderData={() => {
+                            renderData()
+                        }}
+                    />
+                </div> */}
+            </Modal>
             {/* 第1步设置 */}
             <Modal open={titleIntroductionOpen}
                 title="软件简介确认"
@@ -232,9 +782,10 @@ export default function ProjEditAll() {
                 }}
                 footer={null}
             >
-                <TitleIntroduction closeModal={() => { setTitleIntroductionOpen(false)
+                <TitleIntroduction closeModal={() => {
+                    setTitleIntroductionOpen(false)
                     renderData()
-                 }}></TitleIntroduction>
+                }}></TitleIntroduction>
             </Modal>
             {/* 第1步查看 */}
             <Modal open={titleIntroductionShowOpen}
@@ -266,9 +817,10 @@ export default function ProjEditAll() {
                 }}
                 footer={null}
             >
-                <SoftwareInfo closeModal={() => { setSoftwareOpen(false)
+                <SoftwareInfo closeModal={() => {
+                    setSoftwareOpen(false)
                     renderData()
-                 }}></SoftwareInfo>
+                }}></SoftwareInfo>
             </Modal>
             {/* 第二步查看 */}
             <Modal open={softwareInfoShowOpen}
@@ -282,6 +834,224 @@ export default function ProjEditAll() {
             >
                 <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)
+                    renderData()
+                }}></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)
+                    renderData()
+                }}></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={() => {
+                    renderData()
+                    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={() => {
+                    renderData()
+                    setDisplayOrderOpen(false);
+
+                }}
+                footer={null}
+            >
+                <DisplayOrder></DisplayOrder>
+            </Modal>
+            {/* 第六步 查看 */}
+            <Modal open={displayOrderShowOpen}
+                title="查看功能列表显示顺序"
+                width={1500}
+                destroyOnClose={true}
+                onCancel={() => {
+                    setDisplayOrderShowOpen(false);
+                }}
+                footer={null}
+            >
+                <DisplayOrderShow></DisplayOrderShow>
+            </Modal>
+            <Modal title="回复内容"
+                okText="确定"
+                cancelText="取消"
+                destroyOnClose={true}
+                open={replyModal}
+                width={800}
+                onOk={() => {
+                    console.log('上传文件', uploadedFiles);
+                    console.log('上传信息', aContent)
+                    if(aContent==''){
+                        messageApi.open({
+                            type: 'error',
+                            content: '请回复内容'
+                        })
+                    }else if(uploadedFiles.length == 0){
+                      
+                        messageApi.open({
+                            type: 'error',
+                            content: '请上传文件'
+                        })
+                    }else{
+                        put({
+                            messageApi,
+                            url: `/api/proj/materials/add/update-a/${projMaterialsAddId}`,
+                            body: {
+                                aContent,
+                                aFiles: uploadedFiles.map(file => file.response.data.fileId)
+                            },
+                            onBefore() {
+                            },
+                            onSuccess() {
+    
+                                // alert('编辑成功')
+                                messageApi.open({
+                                    type: 'success',
+                                    content: '回复成功'
+                                })
+                                setTimeout(() => {
+                                    setReplyModal(false);
+                                    getQuestionList()
+                                    // window.location.reload(); // 刷新页面
+                                }, 1000);
+                                // getProjOwnerList()
+    
+                            },
+                            onFinally() {
+                            }
+                        })
+                    }
+                    // uploadedFiles.map(file => file.uid);
+                    // put({
+                    //     messageApi,
+                    //     url: `/api/proj/materials/add/update-a/${projMaterialsAddId}`,
+                    //     body: {
+                    //         aContent,
+                    //         aFiles: uploadedFiles.map(file => file.response.data.fileId)
+                    //     },
+                    //     onBefore() {
+                    //     },
+                    //     onSuccess() {
+
+                    //         // alert('编辑成功')
+                    //         messageApi.open({
+                    //             type: 'success',
+                    //             content: '回复成功'
+                    //         })
+                    //         setTimeout(() => {
+                    //             setReplyModal(false);
+                    //             getQuestionList()
+                    //             // window.location.reload(); // 刷新页面
+                    //         }, 1000);
+                    //         // getProjOwnerList()
+
+                    //     },
+                    //     onFinally() {
+                    //     }
+                    // })
+                }}
+                onCancel={() => {
+                    setReplyModal(false);
+                }}>
+                <div>
+
+                    <TextArea style={{ height: '200px', resize: 'none', fontSize: 16 }} onChange={(e) => {
+                        setaContent(e.target.value)
+                    }} ></TextArea>
+
+                    <div className='upload-box'>
+                        <div className='uploadTitle'>
+                            附件:
+                        </div>
+
+                        <Upload {...props} listType="picture" multiple>
+                            <Button icon={<UploadOutlined />}>上传</Button>
+                        </Upload>
+                    </div>
+                </div>
+            </Modal>
+        </div>
     )
 }
\ No newline at end of file
diff --git a/src/route/proj/ProjEditFree.tsx b/src/route/proj/ProjEditFree.tsx
index daff5a9..e5c420d 100644
--- a/src/route/proj/ProjEditFree.tsx
+++ b/src/route/proj/ProjEditFree.tsx
@@ -359,6 +359,7 @@ export default function ProjEdit() {
                         isEditStepEdited && isConfigEdited ? (
                             <CardProjJump title="预览系统"
                                 desc="点击查看预览系统"
+                                canBtnClick={true}
                                 handleJump={() => {
                                     window.open(`${Axios.defaults?.baseURL}/${previewUrl}`, '_blank')
                                 }}
@@ -453,18 +454,18 @@ export default function ProjEdit() {
                             window.open(`${Axios.defaults?.baseURL}/route/proj/download/manual/${pathParams.projId}`)
                         }}
                     />
-                    <CardProjDownload title="代码压缩包"
+                    {/* <CardProjDownload title="代码压缩包"
                         desc="点击下载代码压缩包"
                         canBtnClick={generateStatus == GenerateStatus.SUCCESS}
                         handleDownload={() => {
                             window.open(`${Axios.defaults?.baseURL}/route/proj/download/code-zip/${pathParams.projId}`)
                         }}
-                    />
-                    {/* <CardProjDownload title="代码文档"
-                        desc="点击下载代码文档"
+                    /> */}
+                    <CardProjDownload title="源代码"
+                        desc="点击下载源代码"
                         canBtnClick={false}
                         handleDownload={() => { }}
-                    /> */}
+                    />
                     {/* <CardProjJump title="找代理"
                         desc="到软著代理完成软著申请"
                         canBtnClick={false}
diff --git a/src/route/proj/ProjNew.tsx b/src/route/proj/ProjNew.tsx
index 3a5d996..36c4d43 100644
--- a/src/route/proj/ProjNew.tsx
+++ b/src/route/proj/ProjNew.tsx
@@ -1,6 +1,6 @@
 import './proj-new.css';
 import { useNavigate, useParams, useSearchParams } from "react-router-dom";
-import { Button, Flex, Form, Input, message, Modal, Spin, Checkbox } from "antd";
+import { Button, Flex, Form, Input, message, Modal, Spin, Checkbox, DatePicker } from "antd";
 import { useContext, useEffect, useState } from "react";
 import { get, post } from "../../util/AjaxUtils.ts";
 // import {GlobalContext} from "../../context/GlobalContext.ts";
@@ -8,17 +8,23 @@ import {
     // IProjCharge, 
     ProjAdditionalType, ProjChargeType
 } from "../../interfaces/proj/IProj.ts";
+import locale from 'antd/es/date-picker/locale/zh_CN';
 import { GlobalDispatchContext, reloadUser } from "../../context/GlobalContext.ts";
 import BelongPeople from '../../components/BelongPeople/BelongPeople.tsx'
+import ContactPeople from '../../components/ContactPeople/ContactPeople.tsx'
+import dayjs from 'dayjs';
 // const { TextArea } = Input;
 type ProjInfo = {
     projName: string;
     projIntroduction: string;
-    belongPeople: string
+    belongPeople: string;
+    contacts: string;
+    projDevCompleteDate: string;
 };
 
 export default function ProjNew() {
     // const globalContext = useContext(GlobalContext);
+    const dateFormat = 'YYYY年MM月DD日';
     const globalDispatchContext = useContext(GlobalDispatchContext);
     const nav = useNavigate();
     const pathParams = useParams();
@@ -33,29 +39,43 @@ export default function ProjNew() {
     const [projInfo, setProjInfo] = useState<ProjInfo>({
         projName: '',
         projIntroduction: '',
-        belongPeople: ''
+        belongPeople: '',
+        contacts: '',
+        projDevCompleteDate: '',
     });
     const [form] = Form.useForm<ProjInfo>();
     // 所属者弹窗
     const [belongModal, setBelongModal] = useState(false)
+    // 联系人弹窗
+    const [concatModal, setConcatModal] = useState(false)
     // const [belongPeopleName ,setBelongPeopleName] = useState('')
-    // // 暂存一个信息过度
-    // const [newBelongPeopleName,setNewBelongPeopleName] = useState('')
     const [belongPeopleInfo, setBelongPeopleInfo] = useState({
         authorName: '',
         authorType: '',
         authorIdCardType: '',
         authorIdCard: '',
-        authorCrcAccount:'',
-        authorId:'',
-        authorProvinceCity:''
+        authorCrcAccount: '',
+        authorId: '',
+        authorProvinceCity: ''
     })
-    const setValue = (value:string) => {
+    const [concatPeopleInfo, setConcatPeopleInfo] = useState({
+        applyConcatId: '',
+        applyContactCsaNo: '',
+        applyContactEmail: '',
+        applyContactName: '',
+        applyContactPhone: '',
+        applyContactCompany: ''
+    })
+    const setValue = (value: string) => {
         form.setFieldsValue({
-            belongPeople:value
+            belongPeople: value
+        })
+    }
+    const setConcatValue = (value: string) => {
+        form.setFieldsValue({
+            contacts: value
         })
     }
-
     const [createProjId, setCreateProjId] = useState('');
     const oldlistProjChargeAdditional: string[] = [];
     const [listProjChargeAdditional, setlistProjChargeAdditional] = useState<string[]>([])
@@ -112,7 +132,6 @@ export default function ProjNew() {
                 // console.log('传递信息pkg:',pkg,'videoDemo:',videoDemo);
 
                 // console.log('显示价格',price);
-
             }
         })
     }, []);
@@ -143,7 +162,9 @@ export default function ProjNew() {
                                 setProjInfo({
                                     projName: formData.projName,
                                     projIntroduction: formData.projIntroduction,
-                                    belongPeople: formData.belongPeople
+                                    belongPeople: formData.belongPeople,
+                                    contacts: formData.contacts,
+                                    projDevCompleteDate: formData.projDevCompleteDate,
                                 })
                             }}
                             autoComplete="off"
@@ -172,6 +193,39 @@ export default function ProjNew() {
                                     setBelongModal(true)
                                 }}>选择</div>
                             </div>
+                            <div className='formItemOne' style={{ marginTop: 20, position: 'relative' }}>
+                                <div className='formItem-title '>
+                                    知识产权联系人*
+                                </div>
+                                <Form.Item<ProjInfo>
+                                    name="contacts"
+                                    rules={[{ required: true, message: '请选择/创建知识产权联系人' }]}
+                                >
+                                    <Input style={{ background: '#eeeeee', width: '800px', height: '50px', fontSize: '16px', color: '#3B3B3B' }} placeholder="请选择/创建知识产权联系人" disabled />
+
+                                </Form.Item>
+                                <div style={{ position: 'absolute', right: 23, fontSize: 16, color: " #1F79FF", cursor: 'pointer' }} onClick={() => {
+                                    setConcatModal(true)
+                                }}>选择</div>
+                            </div>
+                            <div className='formItemOne' style={{ marginTop: 20}}>
+                                <div className='formItem-title '>
+                                    开发完成时间*
+                                </div>
+                                <Form.Item<ProjInfo>
+                                    // label="开发完成时间"
+                                    name="projDevCompleteDate"
+                                    rules={[{ required: true, message: '请输入开发完成时间' }]}
+                                >
+                                    <DatePicker placeholder="请选择开发完成日期"
+                                        format={dateFormat}
+                                        locale={locale}
+                                        // style={{ width: '100%' }}
+                                        style={{ height: '50px', width: '800px', fontSize: 16, background: '#eeeeee', }}
+
+                                    />
+                                </Form.Item>
+                            </div>
                             <div className='software-protocol'>
                                 <Form.Item
                                     name="agreement"
@@ -219,6 +273,9 @@ export default function ProjNew() {
                                         //     backgroundColor: 'var(--color-primary)', width: '216px',
                                         //     height: '50px', fontSize: '16px', marginLeft: '53px'
                                         // }}
+                                        // onClick={()=>{
+                                        //     alert(belongPeopleInfo.authorProvinceCity)
+                                        // }}
                                         >
                                             保存并付款
                                         </Button>
@@ -237,41 +294,50 @@ export default function ProjNew() {
                 onOk={() => {
                     // console.log('最终',listProjChargeAdditional);
                     // console.log(belongPeopleInfo.authorId);
-                 
-                        post<any>({
-                            messageApi,
-                            url: '/api/proj/create',
-                            body: {
-                                projName: projInfo.projName,
-                                projChargeType: pathParams.projChargeType,
-                                listProjChargeAdditional: listProjChargeAdditional,
-    
-                                authorCrcAccount:belongPeopleInfo.authorCrcAccount,
-                                authorId:belongPeopleInfo.authorId,
-                                authorIdCard:belongPeopleInfo.authorIdCard,
-                                authorIdCardType:belongPeopleInfo.authorIdCardType,
-                                authorName:belongPeopleInfo.authorName,
-                                authorProvinceCity:belongPeopleInfo.authorProvinceCity,
-                                authorType:belongPeopleInfo.authorType
-                            },
-                            onBefore() {
-                                setLoading(true);
-                            },
-                            onSuccess({ data }) {
-                                setIsEditModalOpen(true);
-                                setCreateProjId(data.data);
-                                reloadUser(messageApi, globalDispatchContext).then(() => {
-                                    messageApi.success('扣款成功');
-                                });
-                            },
-                            onFinally() {
-                                setLoading(false);
-                            }
-                        })
-                    
-                    
+
+                    post<any>({
+                        messageApi,
+                        url: '/api/proj/create',
+                        body: {
+                            projName: projInfo.projName,
+                            projChargeType: pathParams.projChargeType,
+                            listProjChargeAdditional: listProjChargeAdditional,
+                            // dayjs(formInfo.getFieldValue('projDevCompleteDate')).format(dateFormat),
+                            projDevCompleteDate:dayjs(projInfo.projDevCompleteDate).format(dateFormat),
+                            authorCrcAccount: belongPeopleInfo.authorCrcAccount,
+                            authorId: belongPeopleInfo.authorId,
+                            authorIdCard: belongPeopleInfo.authorIdCard,
+                            authorIdCardType: belongPeopleInfo.authorIdCardType,
+                            authorName: belongPeopleInfo.authorName,
+                            authorProvinceCity: belongPeopleInfo.authorProvinceCity,
+                            authorType: belongPeopleInfo.authorType,
+                            
+                            applyContactCompany:concatPeopleInfo.applyContactCompany,
+                            applyContactCsaNo:concatPeopleInfo.applyContactCsaNo,
+                            applyContactEmail:concatPeopleInfo.applyContactEmail,
+                            applyContactId:concatPeopleInfo.applyConcatId,
+                            applyContactName:concatPeopleInfo.applyContactName,
+                            applyContactPhone:concatPeopleInfo.applyContactPhone,
+                            projVersion:'v1.0'
+                        },
+                        onBefore() {
+                            setLoading(true);
+                        },
+                        onSuccess({ data }) {
+                            setIsEditModalOpen(true);
+                            setCreateProjId(data.data);
+                            reloadUser(messageApi, globalDispatchContext).then(() => {
+                                messageApi.success('扣款成功');
+                            });
+                        },
+                        onFinally() {
+                            setLoading(false);
+                        }
+                    })
+
+
                     setIsCreateModalOpen(false);
-                   
+
                 }}
                 onCancel={() => {
                     setIsCreateModalOpen(false);
@@ -296,6 +362,20 @@ export default function ProjNew() {
                 }}>
                 <div>项目创建成功，开始编辑项目？</div>
             </Modal>
+            <Modal title="选择联系人"
+                destroyOnClose
+
+                open={concatModal}
+                width={1200}
+
+                footer={null}
+                onCancel={() => {
+                    setConcatModal(false)
+
+                }}>
+
+                <ContactPeople isShow={true} closeModal={() => { setConcatModal(false) }} setConcatPeopleInfo={setConcatPeopleInfo} concatPeopleInfo={concatPeopleInfo} setConcatValue={setConcatValue}></ContactPeople>
+            </Modal>
             <Modal title="选择所属者"
                 destroyOnClose
 
@@ -308,7 +388,7 @@ export default function ProjNew() {
 
                 }}>
 
-                <BelongPeople closeModal = {()=>{setBelongModal(false)}} setBelongPeopleInfo={setBelongPeopleInfo} belongPeopleInfo={belongPeopleInfo} setValue={setValue} isShow={true}></BelongPeople>
+                <BelongPeople closeModal={() => { setBelongModal(false) }} setBelongPeopleInfo={setBelongPeopleInfo} belongPeopleInfo={belongPeopleInfo} setValue={setValue} isShow={true}></BelongPeople>
             </Modal>
             <Spin tip="正在提交..." spinning={loading} fullscreen />
         </>
diff --git a/src/route/proj/edit/ProjEditStep2.tsx b/src/route/proj/edit/ProjEditStep2.tsx
index 4dd3ff9..c389f06 100644
--- a/src/route/proj/edit/ProjEditStep2.tsx
+++ b/src/route/proj/edit/ProjEditStep2.tsx
@@ -870,8 +870,8 @@ export default function ProjEditStep2(props: any) {
                                         </div>
                                     </div>
                                     <div className='showInfo'>
-                                        <div style={{ marginRight: '22px' }}>当前申请人:</div>
-                                        <div style={{ display: applyContactName == '' ? 'block' : 'none' }}>请选择申请人</div>
+                                        <div style={{ marginRight: '22px' }}>当前联系人:</div>
+                                        <div style={{ display: applyContactName == '' ? 'block' : 'none' }}>请选择联系人</div>
                                         <div style={{ display: applyContactName == '' ? 'none' : 'block' }}>
                                             {applyContactName}/{applyContactPhone}{applyContactEmail ? '/' + applyContactEmail : ''}
                                         </div>
@@ -1022,7 +1022,7 @@ export default function ProjEditStep2(props: any) {
                             // alert('申请人不能为空')
                             messageApi.open({
                                 type: 'error',
-                                content: '请选择申请人'
+                                content: '请选择联系人'
                             })
                             setIsEditModalOpen(false);
                         }
diff --git a/src/route/proj/edit/ProjEditStep2Show.tsx b/src/route/proj/edit/ProjEditStep2Show.tsx
index 5491d0f..2af9003 100644
--- a/src/route/proj/edit/ProjEditStep2Show.tsx
+++ b/src/route/proj/edit/ProjEditStep2Show.tsx
@@ -719,8 +719,8 @@ export default function ProjEditStep2() {
                                         </div>
                                     </div>
                                     <div className='showInfo'>
-                                        <div style={{ marginRight: '22px' }}>当前申请人:</div>
-                                        <div style={{ display: applyContactName == '' ? 'block' : 'none' }}>请选择申请人</div>
+                                        <div style={{ marginRight: '22px' }}>当前联系人:</div>
+                                        <div style={{ display: applyContactName == '' ? 'block' : 'none' }}>请选择联系人</div>
                                         <div style={{ display: applyContactName == '' ? 'none' : 'block' }}>
                                             {applyContactName}/{applyContactPhone}/{applyContactEmail}
                                         </div>
@@ -775,7 +775,7 @@ export default function ProjEditStep2() {
                             // alert('申请人不能为空')
                             messageApi.open({
                                 type: 'error',
-                                content: '请选择申请人'
+                                content: '请选择联系人'
                             })
                             setIsEditModalOpen(false);
                         }
diff --git a/src/route/proj/proj-edit.css b/src/route/proj/proj-edit.css
index 3a465c4..a5b2942 100644
--- a/src/route/proj/proj-edit.css
+++ b/src/route/proj/proj-edit.css
@@ -9,6 +9,7 @@
 }
 .proj-edit {
     background-color: var(--color-light);
+    /* background-color: var(--color-light); */
     padding: 15px;
     display: flex;
     justify-content: space-around;
@@ -25,6 +26,105 @@
     height: 100px;
     position: fixed;
     right: 25px;
-    bottom: 50px;
+    bottom: 20px;
     cursor: pointer;
 }
+.editAll-box{
+    width: 19%;
+    /* background-color: skyblue; */
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+}
+.editAll-box-title{
+    width: 100%;
+    height: 56px;
+    background-color: #FF9F08;
+    margin-top: 10px;
+    text-align: center;
+    line-height: 56px;
+    font-size: 16px;
+    font-weight: 700;
+    border-radius: 10px;
+    color:#fff;
+}
+.editAll-boxNo-con{
+    margin-top: 50px;
+    width: 100%;
+    background-color: #f3f3f3;
+    height: 95px;
+   line-height: 95px;
+   text-align: center;
+   font-size: 16px;
+   font-weight: bold;
+}
+.editAll-box-con{
+    /* width: 270px; */
+    /* width: 100%; */
+    width: calc(100% - 2px);
+
+    /* height: 500px; */
+    border: 1px solid rgb(212, 212, 212);
+    margin-bottom: 20px;
+    
+}
+.question{
+    width: 100%;
+    height: 40px;
+    background-color: #FF9F08;
+    line-height: 40px;
+    font-weight: 700;
+    padding:0  10px;
+    box-sizing: border-box;
+    display: flex;
+    justify-content: space-between;
+    color: #fff;
+}
+.questionStatus{
+    font-weight: 300;
+}
+.boxtitle{
+    width: 100%;
+    height: 40px;
+    background-color: #FF9F08;
+    color: #fff;
+
+    line-height: 40px;
+    text-indent: 10px;
+    /* font-size: 16px; */
+    font-weight: 700;
+}
+.boxtextTop{
+    background-color: #fff;
+    width: 100%;
+    padding: 10px;
+    box-sizing: border-box;
+}
+.unReason{
+    /* background-color: pink; */
+    margin-top: 10px;
+    color: red;
+}
+.boxtextBot{
+    background-color: #fff;
+    width: 100%;
+    padding: 10px;
+    box-sizing: border-box;
+}
+.fileBox{
+    /* background-color: skyblue; */
+    margin-top: 10px;
+    min-height: 40px;
+    /* overflow: scroll; */
+    text-align: justify; /* 让文字两端对齐 */
+   
+ 
+}
+.upload-box{
+    margin-top: 10px;
+    /* background-color: skyblue; */
+}
+.uploadTitle{
+    font-size: 16px;
+    margin-right: 10px;
+}
\ No newline at end of file
diff --git a/src/route/proj/proj-new.css b/src/route/proj/proj-new.css
index f8ca296..c6af614 100644
--- a/src/route/proj/proj-new.css
+++ b/src/route/proj/proj-new.css
@@ -67,3 +67,6 @@
     margin-left: 190px;
 }
 
+.formItemOne .css-dev-only-do-not-override-1ae8k9u.ant-picker .ant-picker-input >input{
+    font-size: 16px;
+}
\ No newline at end of file