Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
merchant-manage-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ui
merchant-manage-ui
Commits
a7fa05db
Commit
a7fa05db
authored
Oct 31, 2022
by
李腾
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修复售后订单管理样式
parent
30ba12f0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
45 additions
and
28 deletions
+45
-28
data.js
src/pages/AfterSaleManage/data.js
+4
-8
index.jsx
src/pages/AfterSaleManage/index.jsx
+32
-18
index.less
src/pages/AfterSaleManage/index.less
+9
-2
No files found.
src/pages/AfterSaleManage/data.js
View file @
a7fa05db
...
...
@@ -417,8 +417,7 @@ export const getColumns = props => {
// 驳回按钮
let
refuseBtn
=
(
<
Button
key
=
"
link3
"
onClick
=
{()
=>
reject
(
record
)}
{...
btnProps
}
disabled
=
{
!
showRefuse
}
>
{
'
'
}
驳回
{
'
'
}
驳回
<
/Button
>
);
// 物流拦截按钮
...
...
@@ -429,8 +428,7 @@ export const getColumns = props => {
{...
btnProps
}
disabled
=
{
serviceType
!==
1
||
(
serviceType
===
1
&&
intercept
)}
>
{
'
'
}
物流拦截
{
'
'
}
物流拦截
<
/Button
>
);
// 订单详情
...
...
@@ -447,15 +445,13 @@ export const getColumns = props => {
{...
btnProps
}
disabled
=
{
!
showLogistics
}
>
{
'
'
}
退货物流
{
'
'
}
退货物流
<
/Button
>
);
// 查看记录
const
viewLogBtn
=
(
<
Button
key
=
"
link6
"
onClick
=
{()
=>
viewLog
(
record
)}
{...
btnProps
}
>
{
'
'
}
查看记录
{
'
'
}
查看记录
<
/Button
>
);
...
...
src/pages/AfterSaleManage/index.jsx
View file @
a7fa05db
...
...
@@ -316,18 +316,13 @@ const AfterSale = props => {
toolBarRender
:
null
,
};
const
getPendingNum
=
async
()
=>
{
const
params
=
{
startDate
:
new
Date
(
'
2020/01/01 00:00:00
'
),
endDate
:
new
Date
(),
};
const
res
=
await
getAfterPendingNum
(
params
);
console
.
log
(
res
);
};
const
TabCountElement
=
({
count
,
text
})
=>
(
<
span
>
{
text
}
{
count
}
</
span
>
);
useEffect
(()
=>
{
getPendingNum
();
},
[]);
return
(
<
PageHeaderWrapper
>
<
FormSearch
{
...
FormSearchProps
}
/>
...
...
@@ -336,17 +331,36 @@ const AfterSale = props => {
activeKey=
{
currentTab
}
onChange=
{
tabChange
}
size=
"large"
tabBarStyle=
{
{
padding
:
'
0 30px
'
}
}
tabBarStyle=
{
{
padding
:
'
0 30px
0 15px
'
,
border
:
'
none
'
}
}
>
<
TabPane
key=
""
tab=
"全部"
></
TabPane
>
<
TabPane
key=
"1"
tab=
{
`仅退款(未发货)待审核${tabInfoData.cancelOrderPendingAuditNum}`
}
></
TabPane
>
<
TabPane
key=
"2"
tab=
{
`仅退款待审核${tabInfoData.refundPendingAuditNum}`
}
></
TabPane
>
<
TabPane
key=
"3"
tab=
{
`退货退款待审核${tabInfoData.returnPendingAuditNum}`
}
></
TabPane
>
<
TabPane
key=
"4"
tab=
{
`退货入库待审核${tabInfoData.returnWaitAuditNum}`
}
></
TabPane
>
<
TabPane
key=
"5"
tab=
{
`已完成${tabInfoData.afterSalseDoneNum}`
}
></
TabPane
>
tab=
{
<
TabCountElement
text=
"仅退款(未发货)待审核"
count=
{
tabInfoData
.
cancelOrderPendingAuditNum
}
/>
}
/>
<
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
>
</
div
>
<
ProTable
...
...
src/pages/AfterSaleManage/index.less
View file @
a7fa05db
...
...
@@ -32,6 +32,13 @@
}
.tab-box {
margin-top: 20px;
background-color: #fff;
position: relative;
z-index: 2;
width: calc(100% - 100px);
// margin-top: 20px;
// background-color: #fff;
margin-bottom: -80px;
:global .ant-tabs-nav::before {
display: none;
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment