{renderStepNo()}
{renderStepDesc()}
- {renderStepLine()}
+ {/* {renderStepLine()} */}
{props.children}
diff --git a/src/components/step/step-proj-edit.css b/src/components/step/step-proj-edit.css
index 4962f67..1e9c8e2 100644
--- a/src/components/step/step-proj-edit.css
+++ b/src/components/step/step-proj-edit.css
@@ -3,57 +3,153 @@
position: relative;
}
+.step-proj .fiestStep {
+ width: 282px;
+ height: 56px;
+ background-color: pink;
+ position: relative;
+ display: flex;
+ align-items: center;
+}
+/* style={{
+ background:props.process != Process.PENDING?'#3790FF':'#8B919D',
+ }} */
+.step-proj .fiestStep:before {
+ content: "";
+ position: absolute;
+ right: -28px;
+ top: 0;
+ width: 0;
+ height: 0;
+ border-left: 28px solid ;
+ border-top: 28px solid transparent;
+ border-bottom: 28px solid transparent;
+}
+
+.step-proj .fiestStep .complete {
+ margin-left: 10px;
+}
+
.step-proj .step {
- margin-top: 30px;
+ /* margin-top: 30px;
display: flex;
flex-direction: row;
justify-content: center;
align-items: start;
+ position: relative; */
+ width: 282px;
+ height: 56px;
+ background-color: pink;
position: relative;
+ display: flex;
+ align-items: center;
+}
+
+.step-proj .step:after {
+ content: "";
+ position: absolute;
+ left: 0;
+ bottom: 0;
+ width: 0;
+ height: 0;
+ border-left: 28px solid var(--color-light);
+ border-top: 28px solid transparent;
+ border-bottom: 28px solid transparent;
+}
+
+.step-proj .step:before {
+ content: "";
+ position: absolute;
+ right: -28px;
+ top: 0;
+ width: 0;
+ height: 0;
+ border-left: 28px solid red;
+ border-top: 28px solid transparent;
+ border-bottom: 28px solid transparent;
}
.step-proj .step .no {
- width: 38px;
+ /* width: 38px;
height: 38px;
border-radius: 50%;
font-size: 16px;
display: flex;
align-items: center;
- justify-content: center;
+ justify-content: center; */
}
-.step-proj .step .complete {
+.step-proj .complete {
+ width: 30px;
+ height: 30px;
+ background-color: white;
+ border-radius: 50%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
border: 1px solid var(--color-primary);
color: var(--color-primary);
+ color: #3790FF;
}
-.step-proj .step .processing {
- border: 1px solid var(--color-primary);
+.step-proj .processing {
+ /* border: 1px solid var(--color-primary);
background-color: var(--color-primary);
- color: var(--color-light);
+ color: var(--color-light); */
+ width: 21px;
+ height: 21px;
+ border-radius: 50%;
+ background-color: white;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ color: #B5B5B5;
+
}
-.step-proj .step .pending {
+.step-proj .notop {
+ width: 21px;
+ height: 21px;
+ border-radius: 50%;
+ background-color: white;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ color: #B5B5B5;
+}
+
+.step-proj .pending {
border: 1px solid var(--color-disabled);
color: var(--color-disabled);
}
-.step-proj .step .desc {
+.step-proj .desc {
margin-left: 15px;
width: 150px;
border: none;
+ /* background-color: #3790FF; */
+ display: flex;
+
}
-.step-proj .step .desc .title {
- margin-top: 8px;
+.step-proj .desc .title {
font-weight: bold;
+ /* background-color: #3790FF; */
+
}
-.step-proj .step .pending .title {
+.step-proj .fiestStep .desc .title {
+ margin-left: 60px;
+ font-weight: 300;
+ font-size: 16px;
+ color: #FFFFFF;
+}
+
+.step-proj .pending .title {
color: var(--color-text-disabled);
}
-.step-proj .step .desc .detail {
+.step-proj .desc .detail {
margin-top: 10px;
font-size: 12px;
width: 100%;
diff --git a/src/interfaces/proj/ICardProj.ts b/src/interfaces/proj/ICardProj.ts
index da83efe..d6c6cb6 100644
--- a/src/interfaces/proj/ICardProj.ts
+++ b/src/interfaces/proj/ICardProj.ts
@@ -26,4 +26,5 @@ export interface ICardProj {
bodyLineArray: ICardProjBodyLine[];
chargeLineArray?: ICardProjChargeLine[];
buyArray: ICardProjBuy[];
+ newArray:ICardProjBodyLine[];
}
\ No newline at end of file
diff --git a/src/route/index/Index.tsx b/src/route/index/Index.tsx
index 7e468e4..f0146a1 100644
--- a/src/route/index/Index.tsx
+++ b/src/route/index/Index.tsx
@@ -141,12 +141,16 @@ export default function Index() {
useEffect(()=>{
// const nowname = sessionStorage.getItem('now')
console.log( '路由名字', location.pathname);
- if(location.pathname == '/home'){
+ if(location.pathname.includes('/home') ){
setNow('首页')
setPathArray([ { title:
首页 }])
- }else if(location.pathname == '/proj-create'){
+ }else if(location.pathname.includes('/proj-create') ){
setNow('创建项目')
- setPathArray([ { title:
首页 },{title:
创建}])
+ setPathArray([ { title:
首页 },{title:
创建项目}])
+ //
+ }else if(location.pathname.includes('/proj-edit')){
+ setNow('编辑项目')
+ setPathArray([ { title:
首页 },{title:
创建项目},{title:
编辑项目}])
}
},[location.pathname])
diff --git a/src/route/proj/ProjCreate.tsx b/src/route/proj/ProjCreate.tsx
index 5006708..9525966 100644
--- a/src/route/proj/ProjCreate.tsx
+++ b/src/route/proj/ProjCreate.tsx
@@ -1,11 +1,11 @@
import './proj-create.css'
-import { useNavigate } from "react-router-dom";
-import { message } from "antd";
+import { useNavigate } from "react-router-dom";
+import { message } from "antd";
import CardProjType from "../../components/card/CardProjType.tsx";
import { IProjCharge, ProjAdditionalType, ProjChargeType } from "../../interfaces/proj/IProj.ts";
import { useEffect, useState } from "react";
import { get } from "../../util/AjaxUtils.ts";
-import { Link } from "react-router-dom";
+// import { Link } from "react-router-dom";
export default function ProjCreate() {
const [messageApi, contextHolder] = message.useMessage();
@@ -18,7 +18,7 @@ export default function ProjCreate() {
free: 0,
},
additional: {
- pkg: 0,
+ pkg: 0,
videoDemo: 0
}
});
@@ -31,6 +31,8 @@ export default function ProjCreate() {
url: '/api/proj/charge/get',
onSuccess({ data }) {
setCharge(data);
+ // console.log('后面的price',data.proj.materialAgent);
+
}
})
// sessionStorage.setItem('pathArray', JSON.stringify([ { title:
首页 },{ title: '创建项目' }]));
@@ -115,26 +117,27 @@ export default function ProjCreate() {
{/* title: `系统演示视频文件 ${charge.additional.videoDemo / 100} 元`*/}
{/* }*/}
{/* ]}*/}
- {/* buyArray={[*/}
- {/* {*/}
- {/* id: ProjChargeType.MATERIAL_AGENT,*/}
- {/* label: '普件：',*/}
- {/* price: charge.proj.materialAgent,*/}
- {/* handleClick: (_title, additional) => {*/}
- {/* nav(`/proj-new/${ProjChargeType.MATERIAL_AGENT}?pkg=${additional.pkg}&videoDemo=${additional.videoDemo}`)*/}
- {/* }*/}
- {/* },*/}
- {/* {*/}
- {/* id: ProjChargeType.MATERIAL_AGENT_URGENT,*/}
- {/* label: '加急：',*/}
- {/* price: charge.proj.materialAgentUrgent,*/}
- {/* handleClick: (_title, additional) => {*/}
- {/* nav(`/proj-new/${ProjChargeType.MATERIAL_AGENT_URGENT}?pkg=${additional.pkg}&videoDemo=${additional.videoDemo}`)*/}
- {/* }*/}
- {/* }*/}
- {/* ]}*/}
+ {/* buyArray={[
+ {
+ id: ProjChargeType.MATERIAL_AGENT,
+ label: '普件：',
+ price: charge.proj.materialAgent,
+ handleClick: (_title, additional) => {
+ nav(`/proj-new/${ProjChargeType.MATERIAL_AGENT}?pkg=${additional.pkg}&videoDemo=${additional.videoDemo}`)
+ }
+ },
+ {
+ id: ProjChargeType.MATERIAL_AGENT_URGENT,
+ label: '加急：',
+ price: charge.proj.materialAgentUrgent,
+ handleClick: (_title, additional) => {
+ nav(`/proj-new/${ProjChargeType.MATERIAL_AGENT_URGENT}?pkg=${additional.pkg}&videoDemo=${additional.videoDemo}`)
+ }
+ }
+ ]} */}
{/*/>*/}
-
{
+ nav(`/proj-new/${ProjChargeType.MATERIAL}?${additional.pkg ? 'pkg=true' : 'pkg='}&${additional.videoDemo ? 'videoDemo=true' : 'videoDemo='}`);
+ }
+ }
+ ]}
+ /> */}
+
+ {
+ nav(`/proj-new/${ProjChargeType.ALL}`)
+ }
+ }
+ ]}
+ />
+ {
+ nav(`/proj-new/${ProjChargeType.MATERIAL_AGENT}?pkg=${additional.pkg}&videoDemo=${additional.videoDemo}`)
+ }
+ },
+ {
+ id: ProjChargeType.MATERIAL_AGENT_URGENT,
+ label: '加急：',
+ price: charge.proj.materialAgentUrgent,
+ handleClick: (_title, additional) => {
+ nav(`/proj-new/${ProjChargeType.MATERIAL_AGENT_URGENT}?pkg=${additional.pkg}&videoDemo=${additional.videoDemo}`)
+ }
+ }
+ ]}
+ chargeLineArray={[
+ {
+ id: ProjAdditionalType.PKG,
+ price: charge.additional.pkg,
+ title: `安装包 ${charge.additional.pkg / 100} 元`
+ },
+ {
+ id: ProjAdditionalType.VIDEO_DEMO,
+ price: charge.additional.videoDemo,
+ title: `系统演示视频文件 ${charge.additional.videoDemo / 100} 元`
+ }
+ ]}
+ />
+
- {
- nav(`/proj-new/${ProjChargeType.FREE}?${additional.pkg ? 'pkg=true' : 'pkg='}&${additional.videoDemo ? 'videoDemo=true' : 'videoDemo='}`)
- }
- }
- ]}
+ {
+ nav(`/proj-new/${ProjChargeType.FREE}?${additional.pkg ? 'pkg=true' : 'pkg='}&${additional.videoDemo ? 'videoDemo=true' : 'videoDemo='}`)
+ }
+ }
+ ]}
/>