Commit 1a4cd9d1 authored by 前端-钟卫鹏's avatar 前端-钟卫鹏

fix:订单确认获取支付方式添加memberId字段,订单详情对收货无数据做隐藏处理

parent 35b39a64
......@@ -50,7 +50,7 @@ export interface ShopInfo {
type: number;
environment: number;
logoUrl: string;
describe?: any;
describe: string;
state: number;
url: string;
}
......
......@@ -241,26 +241,35 @@ const OrderDeleveRecord:React.FC<OrderDeleveRecordProps> = (props) => {
}
return (
<MellowCard style={{marginTop: 24}} bordered={false} id='deleveBox'>
<Tabs defaultActiveKey="2" animated={false}>
<Tabs.TabPane tab='订单收货统计' key="1">
<Table
columns={outOrderCols}
dataSource={orderReceivingStatisticsResponses}
pagination={false}
rowKey="productId"
/>
</Tabs.TabPane>
<Tabs.TabPane tab='订单收货明细' key="2">
<NestTable
NestColumns={[sideOrderCols, sideChildrenCols]}
rowKey='id'
childrenDataKey='orderDeliveryProducts'
dataSource={orderDeliveryDetailsResponses}
/>
</Tabs.TabPane>
</Tabs>
</MellowCard>
<>
{
(orderReceivingStatisticsResponses?.length > 0 || orderDeliveryDetailsResponses?.length > 0) &&
<MellowCard style={{marginTop: 24}} bordered={false} id='deleveBox'>
<Tabs defaultActiveKey="2" animated={false}>
{
orderReceivingStatisticsResponses?.length > 0 && <Tabs.TabPane tab='订单收货统计' key="1">
<Table
columns={outOrderCols}
dataSource={orderReceivingStatisticsResponses}
pagination={false}
rowKey="productId"
/>
</Tabs.TabPane>
}
{
orderDeliveryDetailsResponses?.length > 0 && <Tabs.TabPane tab='订单收货明细' key="2">
<NestTable
NestColumns={[sideOrderCols, sideChildrenCols]}
rowKey='id'
childrenDataKey='orderDeliveryProducts'
dataSource={orderDeliveryDetailsResponses}
/>
</Tabs.TabPane>
}
</Tabs>
</MellowCard>
}
</>
)
}
......
......@@ -49,7 +49,7 @@ const OrderPayTabs:React.FC<OrderPayTabsProps> = (props) => {
const [payList, setPaylist] = useState<any[]>([])
useEffect(() => {
PublicApi.getPayPayWayList().then(res => {
PublicApi.getPayPayWayList({memberId: data.supplyMembersId}).then(res => {
const { code, data } = res
if (code === 1000) {
setPaylist(data)
......
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