From 73e21353c2c0f004680b44f059424bbb9f3352d6 Mon Sep 17 00:00:00 2001 From: lyp Date: Thu, 13 Mar 2025 10:06:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A5=97=E9=A4=90=E5=8C=85=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/head/Head.tsx | 165 ++++++++++++++++++++++---------------- src/route/index/Index.tsx | 118 +++++++++++++++++++++++---- src/route/index/index.css | 8 +- 3 files changed, 202 insertions(+), 89 deletions(-) diff --git a/src/layout/head/Head.tsx b/src/layout/head/Head.tsx index fed36ce..a0849f6 100644 --- a/src/layout/head/Head.tsx +++ b/src/layout/head/Head.tsx @@ -132,7 +132,7 @@ export default function Head() { const [packList, setPackList] = useState([]) //服务包列表 const [packPage, setPackPage] = useState(1) //服务包分页 const [packTotal, setPackTotal] = useState(0) //服务包总数 - const [packageType, setPackageType] = useState('') + // const [packageType, setPackageType] = useState('') // 获取我得服务包信息 const getPickList = (page: number, packageType: string) => { @@ -178,48 +178,48 @@ export default function Head() { const redxuState: any = useSelector(state => state) // const [packageType, setPackageType] = useState('') const packNum = redxuState.packNum - const packItems: MenuProps['items'] = [ - { - key: '1', - label: ( -
{ - setPackageModal(true) - setPackPage(1); - getPickList(1, 'ALL') - setPackageType('ALL') + // const packItems: MenuProps['items'] = [ + // { + // key: '1', + // label: ( + //
{ + // setPackageModal(true) + // setPackPage(1); + // getPickList(1, 'ALL') + // setPackageType('ALL') - }} - > - 全托管 : {packNum.ALL}件 -
+ // }} + // > + // 全托管 : {packNum.ALL}件 + //
- ), - }, - { - key: '2', - label: ( -
{ - setPackageModal(true) - setPackPage(1); - getPickList(1, 'MATERIAL') - setPackageType('MATERIAL') + // ), + // }, + // { + // key: '2', + // label: ( + //
{ + // setPackageModal(true) + // setPackPage(1); + // getPickList(1, 'MATERIAL') + // setPackageType('MATERIAL') - }} - > - 写材料 : {packNum.MATERIAL}件 -
- ), + // }} + // > + // 写材料 : {packNum.MATERIAL}件 + //
+ // ), - }, + // }, - ] + // ] // 消息通知弹窗 const [noticeModal, setNoticeModal] = useState(false) // 客服弹窗 @@ -953,7 +953,7 @@ export default function Head() { setPackageModal(true) setPackPage(1); getPickList(1, '') - setPackageType('') + // setPackageType('') } }, @@ -988,7 +988,61 @@ export default function Head() { {/*
*/}
- + +
+
{ + setPackageModal(true) + setPackPage(1); + getPickList(1,'') + }} + > 套餐包
+ +
+
+ 全托管 + {packNum.ALL} + 件 +
+
+ 写材料 + {packNum.MATERIAL} + 件 +
+
{ setkfModal(true) }}> @@ -1014,32 +1068,9 @@ export default function Head() {
- {/*
{ - setPackageModal(true) - setPackPage(1); - getPickList(1) - }} - > -
-
套餐包
-
- 全托管 : {packNum.ALL}件 - 写材料 : {packNum.MATERIAL}件 -
-
-
*/} - - @@ -1059,9 +1090,9 @@ export default function Head() { >套餐包
- + */} -
+ {/*
*/}
{ setinvitationModal(true) getIc() @@ -1246,10 +1277,8 @@ export default function Head() { total: packTotal, onChange: (page: number) => { setPackPage(page); - getPickList(page, packageType) + getPickList(page, '') // console.log(page); - - } }} rowKey="packageOrderId" diff --git a/src/route/index/Index.tsx b/src/route/index/Index.tsx index f0ea146..29ffa8a 100644 --- a/src/route/index/Index.tsx +++ b/src/route/index/Index.tsx @@ -142,6 +142,11 @@ export default function Index() { //redux的belongArray const redxuState: any = useSelector(state => state) const belongArray = redxuState.belongArray + + const belongArrayList = belongArray.map((item:any) => ({ + value: item.projOwnerId , + label: item.name + })); // 优惠券弹窗 const couponModal = redxuState.couponModal @@ -206,7 +211,7 @@ export default function Index() { const [chargeAdditionals, setchargeAdditionals] = useState(null) const [tagDataId, settagDataId] = useState(null) const [payStatus, setpayStatus] = useState(null) - const [authorId, setauthorId] = useState('') + const [authorId, setauthorId] = useState(null) const [projRemindId, setprojRemindId] = useState(null) //退款状态 const [applyStatus, setapplyStatus] = useState(null) @@ -258,12 +263,15 @@ export default function Index() { setpayStatus(null) setprojRemindId(null) nav('/home') + setauthorId(null) } // 退款页初搜索条件始化 const refunInit = () => { setnewRefunValue('') setrefunKeywords('') setapplyStatus(null) + setauthorId(null) + // 刷新当前页面 } @@ -275,6 +283,8 @@ export default function Index() { setcorrectionType(null) setcorrectionApplyStatus(null) setTagCor(null) + setauthorId(null) + } const [searchParams] = useSearchParams(); @@ -879,6 +889,8 @@ export default function Index() { getCorTag() getTag() getremindTag() + console.log(belongArray); + }, []); useEffect(() => { if (location.pathname.includes('/home')) { @@ -1082,7 +1094,7 @@ export default function Index() {
{ // const isHome = getMenuActive() == 'ALL' || getMenuActive() == 'PROCESSING' || getMenuActive() == 'COMPLETE' if (authorId == item.projOwnerId) { - setauthorId('') + setauthorId(null) // if (isHome) { @@ -1287,7 +1299,7 @@ export default function Index() { { // console.log(`selected ${value}`); // const [part1, part2] = value.split(':'); @@ -1393,7 +1405,7 @@ export default function Index() { { + setauthorId(value) + nav('/home', { + state: { + keyword: keywords, + type: type, + chargeAdditionals: chargeAdditionals, + tagDataId: tagDataId, + authorId: value, + payStatus: payStatus, + projRemindId: projRemindId, + // tagNot + } + }) + + }} + options={belongArrayList} + + placeholder={'选择所属者'} + />