From 28426205c46fb449d71d035978feaae00cff8495 Mon Sep 17 00:00:00 2001 From: lyp Date: Mon, 20 Jan 2025 16:13:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/card/CardProjType.tsx | 13 ++++++++----- src/interfaces/proj/ICardProj.ts | 3 ++- src/route/proj/ProjCreate.tsx | 21 +++++++++++---------- src/route/proj/ProjNew.tsx | 4 ++-- 4 files changed, 23 insertions(+), 18 deletions(-) diff --git a/src/components/card/CardProjType.tsx b/src/components/card/CardProjType.tsx index dac0c89..770855a 100644 --- a/src/components/card/CardProjType.tsx +++ b/src/components/card/CardProjType.tsx @@ -73,7 +73,7 @@ export default function CardProjType(props: ICardProj) { return (
云服务 @@ -123,7 +123,7 @@ export default function CardProjType(props: ICardProj) { setPkg(true); } else if (line.id == ProjAdditionalType.VIDEO_DEMO) { setVideoDemo(true); - }else if(line.id ==ProjAdditionalType.URGENT){ + } else if (line.id == ProjAdditionalType.URGENT) { setUrgent(true) } setChargeAmount(chargeAmount + line.price); @@ -132,7 +132,7 @@ export default function CardProjType(props: ICardProj) { setPkg(false); } else if (line.id == ProjAdditionalType.VIDEO_DEMO) { setVideoDemo(false); - }else if(line.id ==ProjAdditionalType.URGENT){ + } else if (line.id == ProjAdditionalType.URGENT) { setUrgent(false) } setChargeAmount(chargeAmount - line.price); @@ -143,9 +143,11 @@ export default function CardProjType(props: ICardProj) { if (!props.chargeLineArray || props.chargeLineArray.length == 0) { return <> } + return ( <>
+ { props.chargeLineArray.map((line, index) => (
@@ -174,7 +176,7 @@ export default function CardProjType(props: ICardProj) { buy.handleClick(props.head, { pkg: pkg, videoDemo: videoDemo, - urgent:urgent, + urgent: urgent, }); }} style={{ @@ -246,7 +248,7 @@ export default function CardProjType(props: ICardProj) { return (
- {/*
*/} + {/*
*/}
{/*
*/}
@@ -262,6 +264,7 @@ export default function CardProjType(props: ICardProj) {
{renderLines()}
{renderNew()}
+
{props.text}
{renderCharge()}
diff --git a/src/interfaces/proj/ICardProj.ts b/src/interfaces/proj/ICardProj.ts index 289534e..335fc76 100644 --- a/src/interfaces/proj/ICardProj.ts +++ b/src/interfaces/proj/ICardProj.ts @@ -30,5 +30,6 @@ export interface ICardProj { newArray:ICardProjBodyLine[]; isShow:number isClickable:number, - details:string + details:string, + text?:string } \ No newline at end of file diff --git a/src/route/proj/ProjCreate.tsx b/src/route/proj/ProjCreate.tsx index 4b52cfe..6f5fbb5 100644 --- a/src/route/proj/ProjCreate.tsx +++ b/src/route/proj/ProjCreate.tsx @@ -245,19 +245,20 @@ export default function ProjCreate() { ] } chargeLineArray={[ - { - id: ProjAdditionalType.PKG, - price: charge.pkg, - title: `安装包 ${charge.pkg / 100} 元` + // { + // id: ProjAdditionalType.PKG, + // price: charge.pkg, + // title: `安装包 ${charge.pkg / 100} 元` - }, - { - id: ProjAdditionalType.VIDEO_DEMO, - price: charge.videoDemo, - title: `系统演示视频文件 ${charge.videoDemo / 100} 元` + // }, + // { + // id: ProjAdditionalType.VIDEO_DEMO, + // price: charge.videoDemo, + // title: `系统演示视频文件 ${charge.videoDemo / 100} 元` - } + // } ]} + text='如需视频文件和安装包请在下证后购买下载' buyArray={[ { id: ProjChargeType.MATERIAL, diff --git a/src/route/proj/ProjNew.tsx b/src/route/proj/ProjNew.tsx index 7b861c4..9856045 100644 --- a/src/route/proj/ProjNew.tsx +++ b/src/route/proj/ProjNew.tsx @@ -226,7 +226,7 @@ export default function ProjNew() { name="basic" form={form} initialValues={{ - projVersion: 'v1.0', + projVersion: 'V1.0', backendCodeLang: 'JAVA' }} // 添加 initialValues 属性 layout={'vertical'} @@ -241,7 +241,7 @@ export default function ProjNew() { belongPeople: formData.belongPeople, contacts: formData.contacts, projDevCompleteDate: formData.projDevCompleteDate, - projVersion: formData.projVersion ? formData.projVersion : 'v1.0', + projVersion: formData.projVersion ? formData.projVersion : 'V1.0', backendCodeLang: formData.backendCodeLang, }) }}