Commit a7fa05db authored by 李腾's avatar 李腾

fix: 修复售后订单管理样式

parent 30ba12f0
...@@ -417,8 +417,7 @@ export const getColumns = props => { ...@@ -417,8 +417,7 @@ export const getColumns = props => {
// 驳回按钮 // 驳回按钮
let refuseBtn = ( let refuseBtn = (
<Button key="link3" onClick={() => reject(record)} {...btnProps} disabled={!showRefuse}> <Button key="link3" onClick={() => reject(record)} {...btnProps} disabled={!showRefuse}>
{' '} 驳回
驳回{' '}
</Button> </Button>
); );
// 物流拦截按钮 // 物流拦截按钮
...@@ -429,8 +428,7 @@ export const getColumns = props => { ...@@ -429,8 +428,7 @@ export const getColumns = props => {
{...btnProps} {...btnProps}
disabled={serviceType !== 1 || (serviceType === 1 && intercept)} disabled={serviceType !== 1 || (serviceType === 1 && intercept)}
> >
{' '} 物流拦截
物流拦截{' '}
</Button> </Button>
); );
// 订单详情 // 订单详情
...@@ -447,15 +445,13 @@ export const getColumns = props => { ...@@ -447,15 +445,13 @@ export const getColumns = props => {
{...btnProps} {...btnProps}
disabled={!showLogistics} disabled={!showLogistics}
> >
{' '} 退货物流
退货物流{' '}
</Button> </Button>
); );
// 查看记录 // 查看记录
const viewLogBtn = ( const viewLogBtn = (
<Button key="link6" onClick={() => viewLog(record)} {...btnProps}> <Button key="link6" onClick={() => viewLog(record)} {...btnProps}>
{' '} 查看记录
查看记录{' '}
</Button> </Button>
); );
......
...@@ -316,18 +316,13 @@ const AfterSale = props => { ...@@ -316,18 +316,13 @@ const AfterSale = props => {
toolBarRender: null, toolBarRender: null,
}; };
const getPendingNum = async () => { const TabCountElement = ({ count, text }) => (
const params = { <span>
startDate: new Date('2020/01/01 00:00:00'), {text}
endDate: new Date(), {count}
}; </span>
const res = await getAfterPendingNum(params); );
console.log(res);
};
useEffect(() => {
getPendingNum();
}, []);
return ( return (
<PageHeaderWrapper> <PageHeaderWrapper>
<FormSearch {...FormSearchProps} /> <FormSearch {...FormSearchProps} />
...@@ -336,17 +331,36 @@ const AfterSale = props => { ...@@ -336,17 +331,36 @@ const AfterSale = props => {
activeKey={currentTab} activeKey={currentTab}
onChange={tabChange} onChange={tabChange}
size="large" size="large"
tabBarStyle={{ padding: '0 30px' }} tabBarStyle={{ padding: '0 30px 0 15px', border: 'none' }}
> >
<TabPane key="" tab="全部"></TabPane> <TabPane key="" tab="全部"></TabPane>
<TabPane <TabPane
key="1" key="1"
tab={`仅退款(未发货)待审核${tabInfoData.cancelOrderPendingAuditNum}`} tab={
></TabPane> <TabCountElement
<TabPane key="2" tab={`仅退款待审核${tabInfoData.refundPendingAuditNum}`}></TabPane> text="仅退款(未发货)待审核"
<TabPane key="3" tab={`退货退款待审核${tabInfoData.returnPendingAuditNum}`}></TabPane> count={tabInfoData.cancelOrderPendingAuditNum}
<TabPane key="4" tab={`退货入库待审核${tabInfoData.returnWaitAuditNum}`}></TabPane> />
<TabPane key="5" tab={`已完成${tabInfoData.afterSalseDoneNum}`}></TabPane> }
/>
<TabPane
key="2"
tab={<TabCountElement text="仅退款待审核" count={tabInfoData.refundPendingAuditNum} />}
/>
<TabPane
key="3"
tab={
<TabCountElement text="退货退款待审核" count={tabInfoData.returnPendingAuditNum} />
}
/>
<TabPane
key="4"
tab={<TabCountElement text="退货入库待审核" count={tabInfoData.returnWaitAuditNum} />}
/>
<TabPane
key="5"
tab={<TabCountElement text="已完成" count={tabInfoData.afterSalseDoneNum} />}
/>
</Tabs> </Tabs>
</div> </div>
<ProTable <ProTable
......
...@@ -32,6 +32,13 @@ ...@@ -32,6 +32,13 @@
} }
.tab-box { .tab-box {
margin-top: 20px; position: relative;
background-color: #fff; z-index: 2;
width: calc(100% - 100px);
// margin-top: 20px;
// background-color: #fff;
margin-bottom: -80px;
:global .ant-tabs-nav::before {
display: none;
}
} }
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