Commit 380d1018 authored by 前端-钟卫鹏's avatar 前端-钟卫鹏

fix:简单流程订单添加发货信息显示

parent 73dd81d0
...@@ -7,6 +7,7 @@ import StatusColors from '../../../components/StatusColors' ...@@ -7,6 +7,7 @@ import StatusColors from '../../../components/StatusColors'
import { PublicApi } from '@/services/api' import { PublicApi } from '@/services/api'
import { PayOutWorkState } from '@/constants' import { PayOutWorkState } from '@/constants'
import { Link } from 'umi' import { Link } from 'umi'
import moment from 'moment'
export interface OrderPayTabsProps {} export interface OrderPayTabsProps {}
...@@ -48,6 +49,9 @@ const OrderPayTabs:React.FC<OrderPayTabsProps> = (props) => { ...@@ -48,6 +49,9 @@ const OrderPayTabs:React.FC<OrderPayTabsProps> = (props) => {
const { data } = useContext(OrderDetailContext) const { data } = useContext(OrderDetailContext)
const [payList, setPaylist] = useState<any[]>([]) const [payList, setPaylist] = useState<any[]>([])
// 简单流程为24
const processEnum = data.processEnum
useEffect(() => { useEffect(() => {
PublicApi.getPayPayWayList({memberId: data.supplyMembersId, memberRoleId: data.supplyMembersRoleId}).then(res => { PublicApi.getPayPayWayList({memberId: data.supplyMembersId, memberRoleId: data.supplyMembersRoleId}).then(res => {
const { code, data } = res const { code, data } = res
...@@ -56,25 +60,55 @@ const OrderPayTabs:React.FC<OrderPayTabsProps> = (props) => { ...@@ -56,25 +60,55 @@ const OrderPayTabs:React.FC<OrderPayTabsProps> = (props) => {
} }
}) })
}, []) }, [])
return ( return (
<MellowCard style={{marginTop: 24}} bordered={false}> <Row gutter={24} style={{marginTop: 24}}>
<Tabs defaultActiveKey='1'> <Col span={processEnum === 24 ? 12 : 24}>
{ data.paymentInformationResponses && data.paymentInformationResponses.map(v => <TabPane key={v.id} tab={<TabHeader dataSource={v}/>}> <MellowCard bordered={false} fullHeight>
<Row> {/* <Row gutter={24}> */}
<Col className={style.fontGray} span={4}>支付环节: </Col> <Tabs defaultActiveKey='1'>
<Col>{v.payNode}</Col> { data.paymentInformationResponses && data.paymentInformationResponses.map(v => <TabPane key={v.id} tab={<TabHeader dataSource={v}/>}>
</Row> <Row>
<Row> <Col className={style.fontGray} span={4}>支付环节: </Col>
<Col className={style.fontGray} span={4}>支付方式: </Col> <Col>{v.payNode}</Col>
<Col>{payTextList[v.payWay]}</Col> </Row>
</Row> <Row>
<Row> <Col className={style.fontGray} span={4}>支付方式: </Col>
<Col className={style.fontGray} span={4}>支付渠道: </Col> <Col>{payTextList[v.payWay]}</Col>
<Col>{payList.find(j => j.id === v.channel)?.way}</Col> </Row>
</Row> <Row>
</TabPane>) } <Col className={style.fontGray} span={4}>支付渠道: </Col>
</Tabs> <Col>{payList.find(j => j.id === v.channel)?.way || (v.channel === 0 && '积分支付')}</Col>
</MellowCard> </Row>
</TabPane>) }
</Tabs>
{/* </Row> */}
</MellowCard>
</Col>
{
processEnum === 24 && data &&
<Col span={12}>
<MellowCard title="发货信息" fullHeight>
{data.name && <Row className={style['card-list']}>
<Col span={6}><p>发货地址: </p></Col>
<Col><p>{data.name}</p></Col>
</Row>}
{data?.deliverTime && <Row className={style['card-list']}>
<Col span={6}><p>发货时间: </p></Col>
<Col><p>{data?.deliverTime && moment(data.deliverTime).format('YYYY-MM-DD')}</p></Col>
</Row>}
{data.deliverNo && <Row className={style['card-list']}>
<Col span={6}><p>物流单号: </p></Col>
<Col><p><a href={`https://www.kuaidi100.com/chaxun?nu=${data.deliverNo}`} target="_blank">{data.deliverNo}</a></p></Col>
</Row>}
{data.logisticsCompany && <Row className={style['card-list']}>
<Col span={6}><p>物流公司: </p></Col>
<Col><p>{data.logisticsCompany}</p></Col>
</Row>}
</MellowCard>
</Col>
}
</Row>
) )
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment