diff --git a/src/route/Correction/Correction.tsx b/src/route/Correction/Correction.tsx
index cb1841a..4caeaa5 100644
--- a/src/route/Correction/Correction.tsx
+++ b/src/route/Correction/Correction.tsx
@@ -8,7 +8,7 @@ import {
     message, Spin,
     Empty,
     Dropdown,
-    Button
+    // Button
 } from 'antd';
 // import {
 //     // MenuFoldOutlined,
@@ -1136,43 +1136,50 @@ export default function Correction() {
                                                 }
                                             </div>
 
-                                            <Button style={{
-                                                display: item.applyStatus == 'APPROVED' && item.type == 'CORRECTION1' ? 'unset' : 'none',
+                                            <a style={{
+                                                display: item.applyStatus == 'APPROVED' && item.type == 'CORRECTION1' && item.projStatus !== 'CLOSE' ? 'unset' : 'none',
+                                                marginLeft: 10,
+                                                // 下划线
+                                                textDecoration: 'underline',
+                                                // display: item.applyStatus == 'APPROVED' && item.type == 'CORRECTION1'  ? 'unset' : 'none',
                                             }}
+                                                onClick={() => {
+                                                    // console.log('projId',item.projId);
+                                                    // console.log('嘻嘻',item);
+                                                    nav(
+                                                        `/proj-new/MATERIAL?pkg=&videoDemo=`,
+                                                        {
+                                                            state: {
+                                                                type: 'replace',
+                                                                projId: item.projId,
+                                                            }
+                                                        }
+                                                    );
+                                                }}
+                                            >
+                                                换名
+                                            </a>
+                                            <a
+                                                style={{
+                                                    display: item.applyStatus == 'APPROVED' && item.type == 'CORRECTION2' ? 'unset' : 'none',
+                                                    marginLeft: 10,
+                                                    textDecoration: 'underline',
+                                                }}
                                                 onClick={() => {
                                                     console.log(item.projCorrectionApplyId);
                                                     nav(
                                                         `/proj-new/MATERIAL?pkg=&videoDemo=`,
                                                         {
                                                             state: {
-                                                                type:'replace', 
-                                                                price: 3800
-                                                             }
-                                                        }
-                                                    );
-                                                }}
-                                            >
-                                                换名
-                                            </Button>
-                                            <Button
-                                                style={{
-                                                    display: item.applyStatus == 'APPROVED' && item.type == 'CORRECTION2' ? 'unset' : 'none',
-
-                                                }}
-                                                onClick={() => {
-                                                    console.log(item.projCorrectionApplyId);
-                                                    nav(
-                                                        `/proj-new/MATERIAL?pkg=&videoDemo=`,
-                                                        {
-                                                            state: { 
-                                                                type:'copy',
+                                                                type: 'copy',
+                                                                projId: item.projId,
                                                             }
                                                         }
                                                     );
                                                 }}
                                             >
                                                 复制
-                                            </Button>
+                                            </a>
                                         </div>
                                         <div className='projBoxBot'>
                                             <div className='boxTopL'>
@@ -1247,7 +1254,15 @@ export default function Correction() {
                                                 }}
                                                     style={{ display: item.applyStatus == 'PENDING' ? 'block' : 'none' }}
                                                 >撤销补正</div>
-                                                <div style={{ display: item.applyStatus == 'APPROVED' ? 'block' : 'none' }}>
+                                                <div  style={{
+                                                    display: item.projStatus== 'CLOSE'? 'block' : 'none',
+                                                    fontSize: 16,
+                                                    color: '#5a5a5a',
+                                                    fontWeight: 700,
+                                                }}>
+                                                    项目已关闭
+                                                </div>
+                                                <div style={{ display: item.applyStatus == 'APPROVED' && item.projStatus !== 'CLOSE' ? 'block' : 'none' }}>
                                                     <div className='correctDownBox'>
                                                         <div className='correctDownBtn' style={{ display: item.correctionType == 'CODE' || item.correctionType == 'ALL' ? 'block' : 'none' }}>
                                                             <Dropdown menu={{
diff --git a/src/route/index/Index.tsx b/src/route/index/Index.tsx
index 8798d70..4819c29 100644
--- a/src/route/index/Index.tsx
+++ b/src/route/index/Index.tsx
@@ -54,7 +54,9 @@ import {
     post, getCouponUrl
 } from '../../util/AjaxUtils.ts'
 // import { getLanguageList, getSoftTypeList } from '../../request/api'
-import { setMenuActive, getMenuActive } from '../../util/cache.ts'
+import { setMenuActive, 
+    // getMenuActive
+ } from '../../util/cache.ts'
 import gpsImg from '@theme/img/right/gps.png'
 import backImg from '@theme/img/right/back.png'
 // import { Link } from "react-router-dom";
@@ -78,10 +80,10 @@ interface DataType {
 }
 
 
-import app from '../../static/left/app.png'
-import appnew from '../../static/left/appnew.png'
-import tra from '../../static/left/tra.png'
-import tranew from '../../static/left/tranew.png'
+// import app from '../../static/left/app.png'
+// import appnew from '../../static/left/appnew.png'
+// import tra from '../../static/left/tra.png'
+// import tranew from '../../static/left/tranew.png'
 
 import topblack from '../../static/appimgs/topblack.png'
 import topblue from '../../static/appimgs/topblue.png'
@@ -1873,7 +1875,7 @@ export default function Index() {
                                 list={agentMenu.list}
                                 handleListItem={agentMenu.handleListItem}
                             /> */}
-                                {THEME == 'mzw' ? (
+                                {/* {THEME == 'mzw' ? (
                                     <>
                                         <div style={{
                                             background: getMenuActive() == 'APP' ? 'linear-gradient(90deg, #FF9F08 0%, #FF7331 100%)' : ' var(--color-menuback)',
@@ -1946,7 +1948,7 @@ export default function Index() {
                                     </>
                                 ) : (
                                     <></>
-                                )}
+                                )} */}
                                 {THEME == 'mzw' ? (
                                     <MenuWithBottomButtom
                                         button={sellMenu.button}
diff --git a/src/route/proj/ProjNew.tsx b/src/route/proj/ProjNew.tsx
index 3d7e2d0..408a16a 100644
--- a/src/route/proj/ProjNew.tsx
+++ b/src/route/proj/ProjNew.tsx
@@ -24,7 +24,7 @@ type ProjInfo = {
     projIntroduction: string;
     belongPeople: string;
     contacts: string;
-    projDevCompleteDate: string;
+    projDevCompleteDate: any;
     coupon?: string;
     projVersion: string;
     backendCodeLang: string;
@@ -489,7 +489,60 @@ export default function ProjNew() {
             })
         }
     }, []);
+    // 换名金额
+    const [changePrice, setChangePrice] = useState(0)
+    // 换名项目原名
+    const [changeProjName, setChangeProjName] = useState('')
+    // 获取项目信息
+    const getProjInfo = (projId: string) => {
+        get<any>({
+            messageApi: messageApi,
+            url: `/api/proj/get/${projId}`,
+            onSuccess({ data }) {
+                // console.log('项目信息', data);
+                if (state.type == 'replace') {
+                    setChangePrice(
+                        data.pay.servicePackageId?0:(data.pay.payment) / 100)
+                }
+                setChangeProjName(data.projName)
+                // 给表单赋值
+                form.setFieldsValue({
+                    projName: state.type == 'replace' ? '' : data.projName, //全称
+                    projSubName: data.apply.projSubName, //简称
+                    projDevCompleteDate: data.apply.projDevCompleteDate ? dayjs(data.apply.projDevCompleteDate, 'YYYY-MM-DD') : '',
+                    projVersion: data.apply.projVersion, //版本
+                    backendCodeLang: data.apply.envLang,
+                    belongPeople: data.apply.authorName,
+                    contacts: data.apply.applyContactName,
 
+                })
+                setBelongPeopleInfo({
+                    authorName: data.apply.authorName,
+                    authorType: data.apply.authorType,
+                    authorIdCardType: data.apply.authorIdCardType,
+                    authorIdCard: data.apply.authorIdCard,
+                    authorCrcAccount: data.apply.authorCrcAccount,
+                    authorId: data.apply.authorId,
+                    authorProvinceCity: data.apply.authorProvinceCity,
+                    authorCrcAccountUsername: data.apply.authorCrcAccountUsername,
+                    authorCrcAccountPassword: data.apply.authorCrcAccountPassword,
+                })
+                setConcatPeopleInfo({
+                    applyConcatId: data.apply.applyContactId,
+                    applyContactCsaNo: data.apply.applyContactCsaNo,
+                    applyContactEmail: data.apply.applyContactEmail,
+                    applyContactName: data.apply.applyContactName,
+                    applyContactPhone: data.apply.applyContactPhone,
+                    applyContactCompany: data.apply.applyContactCompany,
+                })
+            }
+        })
+    }
+    useEffect(() => {
+        if (state && state.projId) {
+            getProjInfo(state.projId)
+        }
+    }, [])
 
     return (
         <>
@@ -545,8 +598,9 @@ export default function ProjNew() {
                                     justifyContent: 'center',
                                     fontSize: 18,
                                     fontWeight: 'bold',
+                                    textAlign: 'center',
                                 }}>
-                                    换名项目
+                                    换名项目: {changeProjName}
                                 </div>
                             </div>
                             <div style={{
@@ -1226,7 +1280,7 @@ export default function ProjNew() {
                                             }}
                                         >
                                             {/* {(showPrice / 100 - couponNum) < 0 ? 0 : showPrice / 100 - couponNum} */}
-                                            {state && state.price ? state.price / 100 : selectPack ? 0 : (chargePrice / 100 - couponNum) < 0 ? 0 : chargePrice / 100 - couponNum}
+                                            {state && state.type == 'replace' ? changePrice : selectPack ? 0 : (chargePrice / 100 - couponNum) < 0 ? 0 : chargePrice / 100 - couponNum}
                                             {/* {selectPack ? 0 : (chargePrice / 100 - couponNum) < 0 ? 0 : chargePrice / 100 - couponNum} */}
                                             元</span>
                                     </div>
@@ -1285,8 +1339,117 @@ export default function ProjNew() {
                     // console.log('最终',listProjChargeAdditional);
                     // console.log(belongPeopleInfo.authorId);
                     if (state && state.type == 'replace') {
-                        alert('替换项目')
-                    } else {
+                        console.log(concatPeopleInfo);
+                        // return
+
+                        post<any>({
+                            messageApi,
+                            url: `/api/proj/rename/proj-id/${state.projId}`,
+                            body: {
+                                // packageInfoId: projInfo.packageInfoId,
+                                projName: projInfo.projName,
+                                projSubName: projInfo.projSubName,
+                                projVersion: projInfo.projVersion,
+                                backendCodeLang: projInfo.backendCodeLang,
+                                projChargeType: pathParams.projChargeType,
+                                listProjChargeAdditional: listProjChargeAdditional,
+                                // dayjs(formInfo.getFieldValue('projDevCompleteDate')).format(dateFormat),
+                                projDevCompleteDate: projInfo.projDevCompleteDate ? dayjs(projInfo.projDevCompleteDate).format(dateFormat) : '',
+                                authorCrcAccount: belongPeopleInfo.authorCrcAccount,
+                                authorCrcAccountPassword: belongPeopleInfo.authorCrcAccountPassword,
+                                authorCrcAccountUsername: belongPeopleInfo.authorCrcAccountUsername,
+                                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,
+                                // couponId: couponId ? couponId : '',
+                                // packageInfoId: packageInfoId ? packageInfoId : ''
+                                // packageOrderId: packageOrderId ? packageOrderId : '',
+
+                            },
+                            onBefore() {
+                                setLoading(true);
+                            },
+                            onSuccess({ data }) {
+                                // console.log(data);
+                                // return
+
+                                setIsEditModalOpen(true);
+                                setCreateProjId(data.data);
+                                reloadUser(messageApi, globalDispatchContext).then(() => {
+                                    messageApi.success('扣款成功');
+                                });
+                                getMyPackNum()
+                            },
+                            onFinally() {
+                                setLoading(false);
+                            }
+                        })
+                    }
+                    else if (state && state.type == 'copy') {
+                        post<any>({
+                            messageApi,
+                            url: `/api/proj/copy/proj-id/${state.projId}`,
+                            body: {
+                                // packageInfoId: projInfo.packageInfoId,
+                                // projName: projInfo.projName,
+                                // projSubName: projInfo.projSubName,
+                                // projVersion: projInfo.projVersion,
+                                // backendCodeLang: projInfo.backendCodeLang,
+                                projChargeType: pathParams.projChargeType,
+                                listProjChargeAdditional: listProjChargeAdditional,
+                                // // dayjs(formInfo.getFieldValue('projDevCompleteDate')).format(dateFormat),
+                                // projDevCompleteDate: projInfo.projDevCompleteDate ? dayjs(projInfo.projDevCompleteDate).format(dateFormat) : '',
+                                // authorCrcAccount: belongPeopleInfo.authorCrcAccount,
+                                // authorCrcAccountPassword: belongPeopleInfo.authorCrcAccountPassword,
+                                // authorCrcAccountUsername: belongPeopleInfo.authorCrcAccountUsername,
+                                // 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,
+                                couponId: couponId ? couponId : '',
+                                // // packageInfoId: packageInfoId ? packageInfoId : ''
+                                packageOrderId: packageOrderId ? packageOrderId : '',
+
+                            },
+                            onBefore() {
+                                setLoading(true);
+                            },
+                            onSuccess({ data }) {
+                                // console.log(data);
+                                // return
+
+                                setIsEditModalOpen(true);
+                                setCreateProjId(data.data);
+                                reloadUser(messageApi, globalDispatchContext).then(() => {
+                                    messageApi.success('扣款成功');
+                                });
+                                getMyPackNum()
+                            },
+                            onFinally() {
+                                setLoading(false);
+                            }
+                        })
+                    }
+                    else {
                         post<any>({
                             messageApi,
                             url: '/api/proj/create',
@@ -1352,7 +1515,7 @@ export default function ProjNew() {
                     {/* {(chargePrice / 100 - couponNum) < 0 ? 0 : chargePrice / 100 - couponNum}  */}
                     {/* {selectPack ? 0 : (chargePrice / 100 - couponNum) < 0 ? 0 : chargePrice / 100 - couponNum}
                      */}
-                    {state && state.price ? state.price / 100 : selectPack ? 0 : (chargePrice / 100 - couponNum) < 0 ? 0 : chargePrice / 100 - couponNum}
+                    {state && state.type == 'replace' ? changePrice : selectPack ? 0 : (chargePrice / 100 - couponNum) < 0 ? 0 : chargePrice / 100 - couponNum}
                     元，确定操作吗？</div>
             </Modal>
             <Modal title="提示"