套餐包样式修改

This commit is contained in:
lyp 2025-03-13 10:06:40 +08:00
parent 64705ce7b7
commit 73e21353c2
3 changed files with 202 additions and 89 deletions

View File

@ -132,7 +132,7 @@ export default function Head() {
const [packList, setPackList] = useState<any[]>([]) //服务包列表 const [packList, setPackList] = useState<any[]>([]) //服务包列表
const [packPage, setPackPage] = useState(1) //服务包分页 const [packPage, setPackPage] = useState(1) //服务包分页
const [packTotal, setPackTotal] = useState(0) //服务包总数 const [packTotal, setPackTotal] = useState(0) //服务包总数
const [packageType, setPackageType] = useState('') // const [packageType, setPackageType] = useState('')
// 获取我得服务包信息 // 获取我得服务包信息
const getPickList = (page: number, packageType: string) => { const getPickList = (page: number, packageType: string) => {
@ -178,48 +178,48 @@ export default function Head() {
const redxuState: any = useSelector(state => state) const redxuState: any = useSelector(state => state)
// const [packageType, setPackageType] = useState('') // const [packageType, setPackageType] = useState('')
const packNum = redxuState.packNum const packNum = redxuState.packNum
const packItems: MenuProps['items'] = [ // const packItems: MenuProps['items'] = [
{ // {
key: '1', // key: '1',
label: ( // label: (
<div // <div
onClick={() => { // onClick={() => {
setPackageModal(true) // setPackageModal(true)
setPackPage(1); // setPackPage(1);
getPickList(1, 'ALL') // getPickList(1, 'ALL')
setPackageType('ALL') // setPackageType('ALL')
}} // }}
> // >
<span style={{ // <span style={{
fontWeight: 'bold' // fontWeight: 'bold'
}}> : {packNum.ALL}</span> // }}>全托管 : {packNum.ALL}件</span>
</div> // </div>
), // ),
}, // },
{ // {
key: '2', // key: '2',
label: ( // label: (
<div // <div
onClick={() => { // onClick={() => {
setPackageModal(true) // setPackageModal(true)
setPackPage(1); // setPackPage(1);
getPickList(1, 'MATERIAL') // getPickList(1, 'MATERIAL')
setPackageType('MATERIAL') // setPackageType('MATERIAL')
}} // }}
> // >
<span style={{ // <span style={{
fontWeight: 'bold' // fontWeight: 'bold'
}}> : {packNum.MATERIAL}</span> // }}>写材料 : {packNum.MATERIAL}件</span>
</div> // </div>
), // ),
}, // },
] // ]
// 消息通知弹窗 // 消息通知弹窗
const [noticeModal, setNoticeModal] = useState(false) const [noticeModal, setNoticeModal] = useState(false)
// 客服弹窗 // 客服弹窗
@ -953,7 +953,7 @@ export default function Head() {
setPackageModal(true) setPackageModal(true)
setPackPage(1); setPackPage(1);
getPickList(1, '') getPickList(1, '')
setPackageType('') // setPackageType('')
} }
}, },
@ -988,7 +988,61 @@ export default function Head() {
{/* <div className="right" style={{backgroundImage: `url(${headRightBg})`}}> */} {/* <div className="right" style={{backgroundImage: `url(${headRightBg})`}}> */}
<div className="right"> <div className="right">
<div style={{padding:'10px 20px',background:'rgba(255,228,181,0.2)',marginRight:20,display:'flex'}}>
<div style={{
fontSize: 16,
color: '#FF9F08',
fontWeight: 700,
cursor: 'pointer'
}}
onClick={() => {
setPackageModal(true)
setPackPage(1);
getPickList(1,'')
}}
> </div>
<div className='headLine' style={{background:"#FFEDCA"}}></div>
<div>
<span style={{
fontSize: 12,
color: '#FF9F08',
// fontWeight: 700,
}}></span>
<span style={{
fontSize: 16,
color: '#FF9F08',
fontWeight: 700,
marginLeft: 5,
marginRight: 5,
}}>{packNum.ALL}</span>
<span style={{
fontSize: 12,
color: '#FF9F08',
// fontWeight: 700,
}}></span>
</div>
<div style={{marginLeft:10}}>
<span style={{
fontSize: 12,
color: '#FF9F08',
// fontWeight: 700,
}}></span>
<span style={{
fontSize: 16,
color: '#FF9F08',
fontWeight: 700,
marginLeft: 5,
marginRight: 5,
}}>{packNum.MATERIAL}</span>
<span style={{
fontSize: 12,
color: '#FF9F08',
// fontWeight: 700,
}}></span>
</div>
</div>
<div className='kf' onClick={() => { <div className='kf' onClick={() => {
setkfModal(true) setkfModal(true)
}}> }}>
@ -1014,32 +1068,9 @@ export default function Head() {
<RechargeHead /> <RechargeHead />
<div className='headLine'></div> <div className='headLine'></div>
{/* <div className='kf' onClick={() => {
setPackageModal(true)
setPackPage(1);
getPickList(1)
}}
>
<div style={{
display: 'flex',
flexDirection: 'column',
alignItems: 'center',
justifyContent: 'center',
}}> {/* <Dropdown
<div className='kfText '></div>
<div style={{
marginTop: 10,
fontWeight: 700,
}}>
<span> : {packNum.ALL}</span>
<span style={{ marginLeft: 15 }}> : {packNum.MATERIAL}</span>
</div>
</div>
</div> */}
<Dropdown
menu={{ items: packItems }} menu={{ items: packItems }}
> >
@ -1059,9 +1090,9 @@ export default function Head() {
></div> ></div>
</Dropdown> </Dropdown> */}
<div className='headLine'></div> {/* <div className='headLine'></div> */}
<div className='invitationButton' onClick={() => { <div className='invitationButton' onClick={() => {
setinvitationModal(true) setinvitationModal(true)
getIc() getIc()
@ -1246,10 +1277,8 @@ export default function Head() {
total: packTotal, total: packTotal,
onChange: (page: number) => { onChange: (page: number) => {
setPackPage(page); setPackPage(page);
getPickList(page, packageType) getPickList(page, '')
// console.log(page); // console.log(page);
} }
}} }}
rowKey="packageOrderId" rowKey="packageOrderId"

View File

@ -142,6 +142,11 @@ export default function Index() {
//redux的belongArray //redux的belongArray
const redxuState: any = useSelector(state => state) const redxuState: any = useSelector(state => state)
const belongArray = redxuState.belongArray const belongArray = redxuState.belongArray
const belongArrayList = belongArray.map((item:any) => ({
value: item.projOwnerId ,
label: item.name
}));
// 优惠券弹窗 // 优惠券弹窗
const couponModal = redxuState.couponModal const couponModal = redxuState.couponModal
@ -206,7 +211,7 @@ export default function Index() {
const [chargeAdditionals, setchargeAdditionals] = useState<string | null>(null) const [chargeAdditionals, setchargeAdditionals] = useState<string | null>(null)
const [tagDataId, settagDataId] = useState<string | null>(null) const [tagDataId, settagDataId] = useState<string | null>(null)
const [payStatus, setpayStatus] = useState<string | null>(null) const [payStatus, setpayStatus] = useState<string | null>(null)
const [authorId, setauthorId] = useState('') const [authorId, setauthorId] = useState<string | null>(null)
const [projRemindId, setprojRemindId] = useState<string | null>(null) const [projRemindId, setprojRemindId] = useState<string | null>(null)
//退款状态 //退款状态
const [applyStatus, setapplyStatus] = useState<string | null>(null) const [applyStatus, setapplyStatus] = useState<string | null>(null)
@ -258,12 +263,15 @@ export default function Index() {
setpayStatus(null) setpayStatus(null)
setprojRemindId(null) setprojRemindId(null)
nav('/home') nav('/home')
setauthorId(null)
} }
// 退款页初搜索条件始化 // 退款页初搜索条件始化
const refunInit = () => { const refunInit = () => {
setnewRefunValue('') setnewRefunValue('')
setrefunKeywords('') setrefunKeywords('')
setapplyStatus(null) setapplyStatus(null)
setauthorId(null)
// 刷新当前页面 // 刷新当前页面
} }
@ -275,6 +283,8 @@ export default function Index() {
setcorrectionType(null) setcorrectionType(null)
setcorrectionApplyStatus(null) setcorrectionApplyStatus(null)
setTagCor(null) setTagCor(null)
setauthorId(null)
} }
const [searchParams] = useSearchParams(); const [searchParams] = useSearchParams();
@ -879,6 +889,8 @@ export default function Index() {
getCorTag() getCorTag()
getTag() getTag()
getremindTag() getremindTag()
console.log(belongArray);
}, []); }, []);
useEffect(() => { useEffect(() => {
if (location.pathname.includes('/home')) { if (location.pathname.includes('/home')) {
@ -1082,7 +1094,7 @@ export default function Index() {
<div className='belongpeopleName' key={item.projOwnerId} onClick={() => { <div className='belongpeopleName' key={item.projOwnerId} onClick={() => {
// const isHome = getMenuActive() == 'ALL' || getMenuActive() == 'PROCESSING' || getMenuActive() == 'COMPLETE' // const isHome = getMenuActive() == 'ALL' || getMenuActive() == 'PROCESSING' || getMenuActive() == 'COMPLETE'
if (authorId == item.projOwnerId) { if (authorId == item.projOwnerId) {
setauthorId('') setauthorId(null)
// if (isHome) { // if (isHome) {
@ -1287,7 +1299,7 @@ export default function Index() {
<Select <Select
value={type} value={type}
allowClear allowClear
style={{ height: '31px', width: '110px', marginLeft: 20, display: showSearchBox ? 'block' : 'none' }} style={{ height: '31px', width: '110px', marginLeft: 5, display: showSearchBox ? 'block' : 'none' }}
onChange={(value: string) => { onChange={(value: string) => {
setType(value) setType(value)
@ -1318,7 +1330,7 @@ export default function Index() {
allowClear allowClear
value={chargeAdditionals} value={chargeAdditionals}
style={{ height: '31px', width: '130px', marginLeft: 20, display: showSearchBox ? 'block' : 'none' }} style={{ height: '31px', width: '130px', marginLeft: 5, display: showSearchBox ? 'block' : 'none' }}
onChange={(value: string) => { onChange={(value: string) => {
// console.log(`selected ${value}`); // console.log(`selected ${value}`);
setchargeAdditionals(value) setchargeAdditionals(value)
@ -1351,7 +1363,7 @@ export default function Index() {
<Select <Select
allowClear allowClear
value={tagDataId} value={tagDataId}
style={{ height: '31px', width: '130px', marginLeft: 20, display: showSearchBox ? 'block' : 'none' }} style={{ height: '31px', width: '130px', marginLeft: 5, display: showSearchBox ? 'block' : 'none' }}
onChange={(value: string) => { onChange={(value: string) => {
// console.log(`selected ${value}`); // console.log(`selected ${value}`);
// const [part1, part2] = value.split(':'); // const [part1, part2] = value.split(':');
@ -1393,7 +1405,7 @@ export default function Index() {
<Select <Select
allowClear allowClear
value={projRemindId} value={projRemindId}
style={{ height: '31px', width: '130px', marginLeft: 20, display: showSearchBox ? 'block' : 'none' }} style={{ height: '31px', width: '130px', marginLeft: 5, display: showSearchBox ? 'block' : 'none' }}
onChange={(value: string) => { onChange={(value: string) => {
// console.log(`selected ${value}`); // console.log(`selected ${value}`);
setprojRemindId(value) setprojRemindId(value)
@ -1428,7 +1440,7 @@ export default function Index() {
allowClear allowClear
value={payStatus} value={payStatus}
style={{ height: '31px', width: '130px', marginLeft: 20, display: showSearchBox ? 'block' : 'none' }} style={{ height: '31px', width: '130px', marginLeft: 5, display: showSearchBox ? 'block' : 'none' }}
onChange={(value: string) => { onChange={(value: string) => {
setpayStatus(value) setpayStatus(value)
nav('/home', { nav('/home', {
@ -1457,9 +1469,34 @@ export default function Index() {
placeholder={'选择付款类型'} placeholder={'选择付款类型'}
/> />
<Select
allowClear
value={authorId}
style={{ height: '31px', width: '150px', marginLeft: 5, display: showSearchBox ? 'block' : 'none' }}
onChange={(value: string) => {
setauthorId(value)
nav('/home', {
state: {
keyword: keywords,
type: type,
chargeAdditionals: chargeAdditionals,
tagDataId: tagDataId,
authorId: value,
payStatus: payStatus,
projRemindId: projRemindId,
// tagNot
}
})
}}
options={belongArrayList}
placeholder={'选择所属者'}
/>
<Button onClick={() => { <Button onClick={() => {
init() init()
}} style={{ marginLeft: 10, display: showSearchBox ? 'block' : 'none', height: 31 }} }} style={{ marginLeft: 5, display: showSearchBox ? 'block' : 'none', height: 31 }}
// type="primary" // type="primary"
icon={<ClearOutlined />}> icon={<ClearOutlined />}>
@ -1497,13 +1534,13 @@ export default function Index() {
style={{ style={{
width: '200px', width: '200px',
height: '31px', height: '31px',
marginLeft: 10 marginLeft: 5
}} }}
allowClear allowClear
/> />
<Select <Select
value={applyStatus} value={applyStatus}
style={{ height: '31px', width: '150px', marginLeft: 10 }} style={{ height: '31px', width: '150px', marginLeft: 5 }}
onChange={(value: string) => { onChange={(value: string) => {
setapplyStatus(value) setapplyStatus(value)
nav('/refun', { nav('/refun', {
@ -1526,9 +1563,31 @@ export default function Index() {
placeholder={'选择状态'} placeholder={'选择状态'}
allowClear allowClear
/> />
<Select
allowClear
value={authorId}
style={{ height: '31px', width: '150px', marginLeft: 5}}
onChange={(value: string) => {
setauthorId(value)
nav('/refun', {
state: {
keywords: refunKeywords,
applyStatus: applyStatus,
authorId: value,
}
})
}}
options={belongArrayList}
placeholder={'选择所属者'}
/>
<Button onClick={() => { <Button onClick={() => {
refunInit() refunInit()
}} style={{ marginLeft: 10, height: 31 }} }} style={{ marginLeft: 5, height: 31 }}
// type="primary" // type="primary"
icon={<ClearOutlined />}> icon={<ClearOutlined />}>
@ -1565,13 +1624,13 @@ export default function Index() {
style={{ style={{
width: '160px', width: '160px',
height: '31px', height: '31px',
marginLeft: 10 marginLeft: 5
}} }}
allowClear allowClear
/> />
<Select <Select
value={correctionNumType} value={correctionNumType}
style={{ height: '31px', width: '110px', marginLeft: 10 }} style={{ height: '31px', width: '110px', marginLeft: 5 }}
onChange={(value: string) => { onChange={(value: string) => {
setcorrectionNumType(value) setcorrectionNumType(value)
@ -1597,7 +1656,7 @@ export default function Index() {
allowClear allowClear
/> />
<Select <Select
style={{ height: '31px', width: '130px', marginLeft: 10 }} style={{ height: '31px', width: '130px', marginLeft: 5 }}
value={correctionType} value={correctionType}
onChange={(value: string) => { onChange={(value: string) => {
setcorrectionType(value) setcorrectionType(value)
@ -1626,7 +1685,7 @@ export default function Index() {
/> />
<Select <Select
value={correctionApplyStatus} value={correctionApplyStatus}
style={{ height: '31px', width: '120px', marginLeft: 10 }} style={{ height: '31px', width: '120px', marginLeft: 5 }}
onChange={(value: string) => { onChange={(value: string) => {
setcorrectionApplyStatus(value) setcorrectionApplyStatus(value)
nav('/correction', { nav('/correction', {
@ -1654,7 +1713,7 @@ export default function Index() {
/> />
<Select <Select
value={tagCor} value={tagCor}
style={{ height: '31px', width: '120px', marginLeft: 10 }} style={{ height: '31px', width: '120px', marginLeft: 5 }}
onChange={(value: string) => { onChange={(value: string) => {
setTagCor(value) setTagCor(value)
nav('/correction', { nav('/correction', {
@ -1676,9 +1735,34 @@ export default function Index() {
placeholder={'选择标签'} placeholder={'选择标签'}
allowClear allowClear
/> />
<Select
allowClear
value={authorId}
style={{ height: '31px', width: '150px', marginLeft: 5}}
onChange={(value: string) => {
setauthorId(value)
nav('/correction', {
state: {
keywords: correctionKeywords,
correctionNumType: correctionNumType,
correctionType: correctionType,
applyStatus: applyStatus,
authorId: value,
tagCor: tagCor,
// tagNot
}
})
}}
options={belongArrayList}
placeholder={'选择所属者'}
/>
<Button onClick={() => { <Button onClick={() => {
correctionInit() correctionInit()
}} style={{ marginLeft: 10, height: 31 }} }} style={{ marginLeft: 5, height: 31 }}
// type="primary" // type="primary"
icon={<ClearOutlined />}> icon={<ClearOutlined />}>

View File

@ -190,8 +190,8 @@
.gps-now { .gps-now {
/* background-color: red; */ /* background-color: red; */
min-width: 122px; /* min-width: 122px;
margin-left: -10px; margin-left: -10px; */
} }
.index .right .top .gps img { .index .right .top .gps img {
@ -456,7 +456,7 @@
.gps-now { .gps-now {
/* background-color: red; */ /* background-color: red; */
min-width: 122px; /* min-width: 122px; */
} }
.index .right .top .gps img { .index .right .top .gps img {
@ -733,7 +733,7 @@
.gps-now { .gps-now {
/* background-color: red; */ /* background-color: red; */
min-width: 122px; /* min-width: 122px; */
} }
.index .right .top .gps img { .index .right .top .gps img {