Skip to content

J
jinfa-platform
Commit a65f1b18 authored by XieZhiXiong's avatar XieZhiXiong
Browse files
Options

fix: 没有退货、换货发货信息就不展示相应的区块

parent c8d9ed11
Hide whitespace changes
Inline Side-by-side
Showing with 108 additions and 72 deletions
src/pages/afterService/exchangeApplication/components/DetailInfo/index.tsx
View file @ a65f1b18
......@@ -343,32 +343,44 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
</Suspense>
</Col>
<Col span={24}>
{/* 退货发货信息 */}
<Suspense fallback={null}>
<ExchangeReceivedInfo
summary={detailInfo && detailInfo.returnStatisticsList ? detailInfo.returnStatisticsList : []}
detailed={detailInfo && detailInfo.returnDeliveryGoodsList ? detailInfo.returnDeliveryGoodsList : []}
onConfirmReturnDeliver={handleReceivedConfirmReturnDeliver}
onConfirmReturnBack={handleConfirmReturnBack}
isPurchaser={true}
innerStatus={detailInfo?.innerStatus}
/>
</Suspense>
</Col>
{
detailInfo &&
detailInfo.returnDeliveryGoodsList &&
detailInfo.returnDeliveryGoodsList.length > 0 && (
<Col span={24}>
{/* 退货发货信息 */}
<Suspense fallback={null}>
<ExchangeReceivedInfo
summary={detailInfo && detailInfo.returnStatisticsList ? detailInfo.returnStatisticsList : []}
detailed={detailInfo && detailInfo.returnDeliveryGoodsList ? detailInfo.returnDeliveryGoodsList : []}
onConfirmReturnDeliver={handleReceivedConfirmReturnDeliver}
onConfirmReturnBack={handleConfirmReturnBack}
isPurchaser={true}
innerStatus={detailInfo?.innerStatus}
/>
</Suspense>
</Col>
)
}
<Col span={24}>
{/* 换货收货信息 */}
<Suspense fallback={null}>
<ExchangeDeliverInfo
summary={detailInfo && detailInfo.replaceStatisticsList ? detailInfo.replaceStatisticsList : []}
detailed={detailInfo && detailInfo.replaceDeliveryGoodsList ? detailInfo.replaceDeliveryGoodsList : []}
onConfirmExchangeReceive={handleConfirmExchangeReceive}
isPurchaser={true}
innerStatus={detailInfo?.innerStatus}
/>
</Suspense>
</Col>
{
detailInfo &&
detailInfo.replaceDeliveryGoodsList &&
detailInfo.replaceDeliveryGoodsList.length > 0 && (
<Col span={24}>
{/* 换货收货信息 */}
<Suspense fallback={null}>
<ExchangeDeliverInfo
summary={detailInfo && detailInfo.replaceStatisticsList ? detailInfo.replaceStatisticsList : []}
detailed={detailInfo && detailInfo.replaceDeliveryGoodsList ? detailInfo.replaceDeliveryGoodsList : []}
onConfirmExchangeReceive={handleConfirmExchangeReceive}
isPurchaser={true}
innerStatus={detailInfo?.innerStatus}
/>
</Suspense>
</Col>
)
}
<Col span={24}>
<Row
......
src/pages/afterService/exchangeManage/components/DetailInfo/index.tsx
View file @ a65f1b18
......@@ -398,30 +398,42 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
</Suspense>
</Col>
<Col span={24}>
{/* 退货发货信息 */}
<Suspense fallback={null}>
<ExchangeReceivedInfo
summary={detailInfo && detailInfo.returnStatisticsList ? detailInfo.returnStatisticsList : []}
detailed={detailInfo && detailInfo.returnDeliveryGoodsList ? detailInfo.returnDeliveryGoodsList : []}
onConfirmReturnReceive={handleReceivedConfirmReturnReceive}
innerStatus={detailInfo?.innerStatus}
/>
</Suspense>
</Col>
{
detailInfo &&
detailInfo.returnDeliveryGoodsList &&
detailInfo.returnDeliveryGoodsList.length > 0 && (
<Col span={24}>
{/* 退货发货信息 */}
<Suspense fallback={null}>
<ExchangeReceivedInfo
summary={detailInfo && detailInfo.returnStatisticsList ? detailInfo.returnStatisticsList : []}
detailed={detailInfo && detailInfo.returnDeliveryGoodsList ? detailInfo.returnDeliveryGoodsList : []}
onConfirmReturnReceive={handleReceivedConfirmReturnReceive}
innerStatus={detailInfo?.innerStatus}
/>
</Suspense>
</Col>
)
}
<Col span={24}>
{/* 换货发货信息 */}
<Suspense fallback={null}>
<ExchangeDeliverInfo
summary={detailInfo && detailInfo.replaceStatisticsList ? detailInfo.replaceStatisticsList : []}
detailed={detailInfo && detailInfo.replaceDeliveryGoodsList ? detailInfo.replaceDeliveryGoodsList : []}
onConfirmExchangeDeliver={handleConfirmExchangeDeliver}
onConfirmExchangeBack={handleConfirmExchangeBack}
innerStatus={detailInfo?.innerStatus}
/>
</Suspense>
</Col>
{
detailInfo &&
detailInfo.replaceDeliveryGoodsList &&
detailInfo.replaceDeliveryGoodsList.length > 0 && (
<Col span={24}>
{/* 换货发货信息 */}
<Suspense fallback={null}>
<ExchangeDeliverInfo
summary={detailInfo && detailInfo.replaceStatisticsList ? detailInfo.replaceStatisticsList : []}
detailed={detailInfo && detailInfo.replaceDeliveryGoodsList ? detailInfo.replaceDeliveryGoodsList : []}
onConfirmExchangeDeliver={handleConfirmExchangeDeliver}
onConfirmExchangeBack={handleConfirmExchangeBack}
innerStatus={detailInfo?.innerStatus}
/>
</Suspense>
</Col>
)
}
<Col span={24}>
<Row
......
src/pages/afterService/returnApplication/components/DetailInfo/index.tsx
View file @ a65f1b18
......@@ -381,19 +381,25 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
</Suspense>
</Col>
<Col span={24}>
<Suspense fallback={null}>
{/* 退货发货信息 */}
<ReturnAnalysis
summary={detailInfo && detailInfo.returnStatisticsList ? detailInfo.returnStatisticsList : []}
detailed={detailInfo && detailInfo.returnDeliveryGoodsList ? detailInfo.returnDeliveryGoodsList : []}
onConfirmReturnDeliver={handleReceivedConfirmReturnDeliver}
onConfirmReturnBack={handleConfirmReturnBack}
isPurchaser={true}
innerStatus={detailInfo?.innerStatus}
/>
</Suspense>
</Col>
{
detailInfo &&
detailInfo.returnDeliveryGoodsList &&
detailInfo.returnDeliveryGoodsList.length > 0 && (
<Col span={24}>
<Suspense fallback={null}>
{/* 退货发货信息 */}
<ReturnAnalysis
summary={detailInfo && detailInfo.returnStatisticsList ? detailInfo.returnStatisticsList : []}
detailed={detailInfo && detailInfo.returnDeliveryGoodsList ? detailInfo.returnDeliveryGoodsList : []}
onConfirmReturnDeliver={handleReceivedConfirmReturnDeliver}
onConfirmReturnBack={handleConfirmReturnBack}
isPurchaser={true}
innerStatus={detailInfo?.innerStatus}
/>
</Suspense>
</Col>
)
}
{/* 退款明细信息 */}
{
......
src/pages/afterService/returnManage/components/DetailInfo/index.tsx
View file @ a65f1b18
......@@ -430,17 +430,23 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
</Suspense>
</Col>
<Col span={24}>
<Suspense fallback={null}>
{/* 退货发货信息 */}
<ReturnAnalysis
summary={detailInfo && detailInfo.returnStatisticsList ? detailInfo.returnStatisticsList : []}
detailed={detailInfo && detailInfo.returnDeliveryGoodsList ? detailInfo.returnDeliveryGoodsList : []}
onConfirmReturnReceive={handleReceivedConfirmReturnReceive}
innerStatus={detailInfo?.innerStatus}
/>
</Suspense>
</Col>
{
detailInfo &&
detailInfo.returnDeliveryGoodsList &&
detailInfo.returnDeliveryGoodsList.length > 0 && (
<Col span={24}>
<Suspense fallback={null}>
{/* 退货发货信息 */}
<ReturnAnalysis
summary={detailInfo && detailInfo.returnStatisticsList ? detailInfo.returnStatisticsList : []}
detailed={detailInfo && detailInfo.returnDeliveryGoodsList ? detailInfo.returnDeliveryGoodsList : []}
onConfirmReturnReceive={handleReceivedConfirmReturnReceive}
innerStatus={detailInfo?.innerStatus}
/>
</Suspense>
</Col>
)
}
{/* 退款明细信息 */}
{
......
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