Merge branch 'dev' into test

src/pages/transaction/components/orderDeleveRecord/index.tsx

@@ -258,9 +258,13 @@ const OrderDeleveRecord:React.FC<OrderDeleveRecordProps> = (props) => {
     
   }
   return (
+    <>
+    {
+      (orderReceivingStatisticsResponses?.length > 0 || orderDeliveryDetailsResponses?.length > 0) && 
       <MellowCard style={{marginTop: 24}} bordered={false} id='deleveBox'>
         <Tabs defaultActiveKey="2">
-        <Tabs.TabPane tab='订单收货统计' key="1">
+          {
+            orderReceivingStatisticsResponses?.length > 0 && <Tabs.TabPane tab='订单收货统计' key="1">
               <Table
                 columns={outOrderCols}
                 dataSource={orderReceivingStatisticsResponses}
@@ -268,7 +272,9 @@ const OrderDeleveRecord:React.FC<OrderDeleveRecordProps> = (props) => {
                 rowKey="productId"
               />
             </Tabs.TabPane>
-        <Tabs.TabPane tab='订单收货明细' key="2">
+          }
+          {
+            orderDeliveryDetailsResponses?.length > 0 && <Tabs.TabPane tab='订单收货明细' key="2">
               <NestTable
                 NestColumns={[sideOrderCols, sideChildrenCols]}
                 rowKey='id'
@@ -276,8 +282,11 @@ const OrderDeleveRecord:React.FC<OrderDeleveRecordProps> = (props) => {
                 dataSource={orderDeliveryDetailsResponses}
               />
             </Tabs.TabPane>
+          }
         </Tabs>
       </MellowCard>
+    }
+    </>
   )
 }
 

src/pages/transaction/components/orderSaleRecord/index.tsx

@@ -255,9 +255,13 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
     }
   }
   return (
+    <>
+    {
+      (orderReceivingStatisticsResponses?.length > 0 || orderDeliveryDetailsResponses?.length > 0) &&
       <MellowCard style={{marginTop: 24}} bordered={false} id='deleveBox'>
         <Tabs defaultActiveKey="2" animated={false}>
-        <Tabs.TabPane tab='订单发货统计' key="1">
+          {
+            orderReceivingStatisticsResponses?.length > 0 && <Tabs.TabPane tab='订单发货统计' key="1">
               <Table
                 columns={outOrderCols}
                 dataSource={orderReceivingStatisticsResponses}
@@ -265,7 +269,9 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
                 rowKey="id"
               />
             </Tabs.TabPane>
-        <Tabs.TabPane tab='订单发货明细' key="2">
+          }
+          {
+            orderDeliveryDetailsResponses?.length > 0 && <Tabs.TabPane tab='订单发货明细' key="2">
               <NestTable
                 NestColumns={[sideOrderCols, sideChildrenCols]}
                 rowKey='id'
@@ -273,8 +279,11 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
                 dataSource={orderDeliveryDetailsResponses}
               />
             </Tabs.TabPane>
+          }
         </Tabs>
       </MellowCard>
+    }
+    </>
   )
 }