From 9b4de12e0336cfc48ba0ad7e1e514c56ce2608d6 Mon Sep 17 00:00:00 2001 From: xixi <123@qq.com> Date: Thu, 16 May 2024 18:00:57 +0800 Subject: [PATCH] =?UTF-8?q?css=E4=BF=AE=E6=94=B9=E5=8F=8A=E7=99=BB?= =?UTF-8?q?=E9=99=86=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/card/CardProjType.tsx | 2 +- src/components/card/card-proj-type.css | 12 +- src/components/list/ListProj.tsx | 2 +- src/components/list/list-proj.css | 2 +- src/components/menu/MenuWithBottomButton.tsx | 2 +- .../menu/menu-tree-with-top-button.css | 8 +- .../menu/menu-with-bottom-button.css | 2 +- src/components/menu/menu-with-top-button.css | 20 +- src/layout/Type/statedata.d.ts | 1 + src/layout/head/head.css | 6 +- src/route/index/Index.tsx | 8 +- src/route/index/index.css | 11 +- src/route/proj/ProjCreate.tsx | 5 +- src/route/proj/ProjEdit.tsx | 5 +- src/route/proj/edit/ProjConfigLoginpage.tsx | 188 ++++++++++-------- src/route/proj/edit/ProjEditStep1.tsx | 6 +- src/route/proj/edit/ProjEditStep1Show.tsx | 6 +- src/route/proj/edit/ProjEditStep2.tsx | 173 +++++++++++----- src/route/proj/edit/proj-config-loginpage.css | 47 +++++ src/route/proj/edit/proj-edit-step.css | 10 + src/route/proj/proj-create.css | 11 +- src/route/proj/proj-edit.css | 8 +- src/route/proj/proj-new.css | 2 +- src/static/buyback.png | Bin 0 -> 635244 bytes src/static/head/background.png | Bin 167047 -> 122060 bytes 25 files changed, 353 insertions(+), 184 deletions(-) create mode 100644 src/route/proj/edit/proj-config-loginpage.css create mode 100644 src/static/buyback.png diff --git a/src/components/card/CardProjType.tsx b/src/components/card/CardProjType.tsx index a2b3147..fea01c6 100644 --- a/src/components/card/CardProjType.tsx +++ b/src/components/card/CardProjType.tsx @@ -3,7 +3,7 @@ import { ICardProj, ICardProjChargeLine } from "../../interfaces/proj/ICardProj. import { Checkbox } from 'antd'; import { useState } from "react"; import { ProjAdditionalType } from "../../interfaces/proj/IProj.ts"; -// import ProjCardHeadBg from '../../assets/proj-card-head-bg.png'; +// import ProjCardHeadBg from '../../assets/proj-card-head-bg.png1'; import serveImg from '../../static/serve.png' import useImg from '../../static/use.png' import leftImg from '../../static/createPro/left.png' diff --git a/src/components/card/card-proj-type.css b/src/components/card/card-proj-type.css index 1d9d25a..eeed5c2 100644 --- a/src/components/card/card-proj-type.css +++ b/src/components/card/card-proj-type.css @@ -3,6 +3,7 @@ /* height: 842px; */ /* position: relative; */ /* background-color: rgb(255, 255, 255); */ + margin-left: 28px; } .seruseImg { @@ -13,6 +14,9 @@ .projTop { height: 745px; background-color: rgb(255, 255, 255); + box-shadow: 0px 7px 7px 0px rgba(30, 30, 30, 0.18); + border-radius: 13px; + border: 1px solid #F3F3F3; } .proj .proj-head { @@ -27,6 +31,7 @@ width: 100%; height: 132px; line-height: 132px; + /* left: 38px; */ /* top: -4px; */ /* background-color: aqua; */ @@ -148,7 +153,7 @@ width: 375px; height: 94px; /* background-color: pink; */ - + } .proj .proj-foot .buy-btn { @@ -157,7 +162,7 @@ padding: 0 10px; background: url(../../static/createPro/buyBack.png); background-size: 100% 100%; - + box-shadow: 0px 7px 7px 0px rgba(30,30,30,0.18); /* text-align: center; margin: 0 5px; padding: 10px 0; @@ -201,7 +206,8 @@ font-size: 18px; color: #696969; } -.proj-foot .buy-btn:nth-child(2){ + +.proj-foot .buy-btn:nth-child(2) { /* background-color: red; */ margin-left: 9px; } \ No newline at end of file diff --git a/src/components/list/ListProj.tsx b/src/components/list/ListProj.tsx index 1df002f..01d5747 100644 --- a/src/components/list/ListProj.tsx +++ b/src/components/list/ListProj.tsx @@ -35,7 +35,7 @@ export default function ListProj() { const [projs, setProjs] = useState([]); const [isLoading, setIsLoading] = useState(false); // const [keywords, setKeywords] = useState(''); - const domHeight = window.innerHeight - 280; + const domHeight = window.innerHeight - 250; // const navigate = useNavigate() const reqData = (currentPage: number) => { get>({ diff --git a/src/components/list/list-proj.css b/src/components/list/list-proj.css index 404ea08..da716f0 100644 --- a/src/components/list/list-proj.css +++ b/src/components/list/list-proj.css @@ -2,7 +2,7 @@ width: 100%; /* padding-top: 26px; */ /* padding-right: 33px; */ - margin-top: 10px; + /* margin-top: 10px; */ } .projListBox{ margin-bottom: 25px; diff --git a/src/components/menu/MenuWithBottomButton.tsx b/src/components/menu/MenuWithBottomButton.tsx index 57efeec..a9edf9b 100644 --- a/src/components/menu/MenuWithBottomButton.tsx +++ b/src/components/menu/MenuWithBottomButton.tsx @@ -5,7 +5,7 @@ import { useNavigate } from 'react-router-dom'; // import newImg from '../../static/left/new.png' // import { -// RightOutlined +// RightOutlined1 // } from '@ant-design/icons'; export default function MenuWithTopButton(props: IMenuWithTopButton) { const navugate = useNavigate() diff --git a/src/components/menu/menu-tree-with-top-button.css b/src/components/menu/menu-tree-with-top-button.css index 956fbeb..857e4cb 100644 --- a/src/components/menu/menu-tree-with-top-button.css +++ b/src/components/menu/menu-tree-with-top-button.css @@ -6,7 +6,7 @@ width: 100%; } .btn-cennter{ - width: 268px; + width: 231px; height: 56px; font-size: 18px; background: #FFFBEF; @@ -27,8 +27,8 @@ .center-top-lift img{ width: 19px; height: 15px; - margin-left: 30px; - margin-right: 14px; + margin-left: 14px; + margin-right: 13px; } .center-top-right{ display: flex; @@ -36,7 +36,7 @@ font-size: 14px; cursor: pointer; width: 53px; - margin-left: 96px; + margin-left: 82px; } .center-top-right img{ margin-right: 10px; diff --git a/src/components/menu/menu-with-bottom-button.css b/src/components/menu/menu-with-bottom-button.css index 5a60d2b..2bbb980 100644 --- a/src/components/menu/menu-with-bottom-button.css +++ b/src/components/menu/menu-with-bottom-button.css @@ -3,7 +3,7 @@ } .bot { - width: 268px; + width: 230px; height: 56px; font-size: 18px; /* color: #FFAF22; */ diff --git a/src/components/menu/menu-with-top-button.css b/src/components/menu/menu-with-top-button.css index 5febbd1..773bf88 100644 --- a/src/components/menu/menu-with-top-button.css +++ b/src/components/menu/menu-with-top-button.css @@ -3,7 +3,7 @@ } .menu-with-top-button .top { - width: 268px; + width: 231px; height: 56px; font-size: 18px; /* color: #FFAF22; */ @@ -25,8 +25,8 @@ .menu-with-top-button .top .top-lift img { width: 19px; height: 19px; - margin-left: 30px; - margin-right: 14px; + margin-left: 14px; + margin-right: 13px; } .menu-with-top-button .top .top-right { @@ -36,7 +36,7 @@ cursor: pointer; width: 53px; /* background-color: red; */ - margin-left: 96px; + margin-left: 82px; } @@ -50,29 +50,33 @@ .menu-with-top-button ul { padding-top: 12px; padding-bottom: 12px; + width: 231px; + /* background-color:pink; */ } .menu-with-top-button ul li { height: 50px; - margin-left: 66px; + margin-left: 35px; font-weight: 400; font-size: 16px; color: #313131; line-height: 50px; cursor: pointer; + /* background-color: red; */ + text-indent: 32px; } .menu-with-top-button ul li.active { - width: 223px; + width: 213px; height: 50px; background: #FF9F08; border-radius: 25px; color: white; - text-indent: 26px; + text-indent: 59px; } .topIcon{ color: white; - margin-left: 101px; + margin-left: 68px; } diff --git a/src/layout/Type/statedata.d.ts b/src/layout/Type/statedata.d.ts index ac93581..e2acc67 100644 --- a/src/layout/Type/statedata.d.ts +++ b/src/layout/Type/statedata.d.ts @@ -19,4 +19,5 @@ interface ContactDataType { name: string phone: string projContactId: string + email:string } \ No newline at end of file diff --git a/src/layout/head/head.css b/src/layout/head/head.css index 8dd7924..b3ee81a 100644 --- a/src/layout/head/head.css +++ b/src/layout/head/head.css @@ -1,7 +1,7 @@ .head { width: 100vw; - height: 84px; + height: 69px; position: fixed; top: 0; left: 0; @@ -29,8 +29,8 @@ height: 41px; /* background-color: red; */ - margin-left: 176px; - margin-top: 21px; + margin-left: 15px; + margin-top: 12px; } .head .center .right { diff --git a/src/route/index/Index.tsx b/src/route/index/Index.tsx index a9f6709..62b2e2e 100644 --- a/src/route/index/Index.tsx +++ b/src/route/index/Index.tsx @@ -153,7 +153,7 @@ export default function Index() { setNow('创建项目') setPathArray([{ title: 首页 }, { title: '创建项目' }]) // - } else if (location.pathname.includes('/proj-edit') && !location.pathname.includes('/step')) { + } else if (location.pathname.includes('/proj-edit') && !location.pathname.includes('/step') &&!location.pathname.includes('/config-loginpage') ) { setNow('编辑项目') // setEditname(location.pathname) setPathArray([{ title: 首页 }, { title: 创建项目 }, { title: '编辑项目' }]) @@ -177,9 +177,12 @@ export default function Index() { setNow('标题简介') // setNewname(location.pathname) setPathArray([{ title: 首页 }, { title: 创建项目 }, { title: { nav(-1) }}>编辑项目 }, { title: '基本信息' }]) + }else if (location.pathname.includes('/proj-edit/config-loginpage')) { + setNow('登录界面设置') + // setNewname(location.pathname) + setPathArray([{ title: 首页 }, { title: 创建项目 }, { title: { nav(-1) }}>编辑项目 }, { title: '登录界面设置' }]) } - // /proj-edit/step1 }, [location.pathname]) useEffect(() => { @@ -220,6 +223,7 @@ export default function Index() {
+
{ get({ messageApi: messageApi, @@ -40,7 +39,7 @@ export default function ProjCreate() { }, []) return ( - <> + < > {contextHolder} {/* { renderData(); }, []) return ( -
+
{contextHolder} {/* ([]); const [bgImgArray, setBgImgArray] = useState([]); const [iframeSrcDoc, setIframeSrcDoc] = useState(); - const height = window.innerHeight - 210; + const height = window.innerHeight - 180; const beforeUpload = (file: FileType) => { const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png'; @@ -65,7 +65,7 @@ export default function ProjConfigLoginpage() { copyrightOwner: form.getFieldValue('copyrightOwner'), copyrightDate: form.getFieldValue('copyrightDate'), }, - onSuccess({data}) { + onSuccess({ data }) { setIframeSrcDoc(data.data); } }) @@ -75,7 +75,7 @@ export default function ProjConfigLoginpage() { get({ messageApi, url: `/api/proj/get/config-loginpage/${pathParams.projId}`, - onSuccess({data}) { + onSuccess({ data }) { form.setFieldValue('loginpageId', data.loginpageId); form.setFieldValue('subTitle', data.subTitle); form.setFieldValue('copyrightOwner', data.copyrightOwner); @@ -117,69 +117,89 @@ export default function ProjConfigLoginpage() { return ( <> {contextHolder} - 首页}, {title: 创建项目}, {title: {nav(-1)}}>编辑项目}, {title: '登录界面设置'}, ]} - /> -
+ /> */} +
- + + +
+