Commit 9db2165e authored by 张子雨's avatar 张子雨

Merge branch 'master' into feat/sentry

* master:
  feat: 调用仅退款(未发货)审核逻辑
  feat: 售后订单管理-仅退款(发货中)-添加审核按钮
  feat: 添加大额支付标签
  feat: 售后订单管理:添加仅退款(发货中)字段
  feat: 回归测试
  feat: 售后订单管理添加仅退款(发货中)字段
parents 7bd40f0f e111857f
......@@ -257,13 +257,16 @@ export const getColumns = props => {
</span>
);
}
if (+serviceType === 4) {
return <span style={{ color: '#ff1616' }}> 仅退款(发货中)</span>;
}
return <span>退货退款</span>;
},
},
{
title: '售后单ID',
dataIndex: 'serviceNo',
width: 310,
width: 300,
render: (serviceNo, r) => (
<div>
{r.timeout ? <Tag color="red">{serviceNo}</Tag> : serviceNo}
......@@ -513,8 +516,8 @@ export const getColumns = props => {
}
}
// 实物商品-仅退款未发货 serviceType = 0
if (serviceType === 0) {
// 实物商品-仅退款未发货 serviceType = 0, 仅退款(发货中) serviceType = 4
if (serviceType === 0 || serviceType === 4) {
// 待商户审核14 待审核0
if ([14, 0].includes(status)) {
return [cancelAuditBtn, cancelDetailBtn, viewLogBtn];
......
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