forked from gxwebsoft/mp-10550
feat(dealer): 添加订单解冻状态和订单状态显示功能
- 在订单模型中新增佣金解冻字段和订单状态字段 - 扩展订单状态判断逻辑支持解冻状态和订单取消状态 - 更新订单状态颜色映射适配新的状态类型 - 修改订单组件中的状态显示以支持新字段 - 优化订单状态文本和颜色渲染逻辑
This commit is contained in:
@@ -94,15 +94,19 @@ const DealerOrders: React.FC = () => {
|
||||
}
|
||||
}, [fetchOrders])
|
||||
|
||||
const getStatusText = (isSettled?: number, isInvalid?: number) => {
|
||||
const getStatusText = (isSettled?: number, isInvalid?: number, isUnfreeze?: number, orderStatus?: number) => {
|
||||
if (orderStatus === 2 || orderStatus === 5 || orderStatus === 6) return '已取消'
|
||||
if (isInvalid === 1) return '已失效'
|
||||
if (isUnfreeze === 1) return '已解冻'
|
||||
if (isSettled === 1) return '已结算'
|
||||
return '待结算'
|
||||
}
|
||||
|
||||
const getStatusColor = (isSettled?: number, isInvalid?: number) => {
|
||||
const getStatusColor = (isSettled?: number, isInvalid?: number, isUnfreeze?: number, orderStatus?: number) => {
|
||||
if (orderStatus === 2 || orderStatus === 5 || orderStatus === 6) return 'default'
|
||||
if (isInvalid === 1) return 'danger'
|
||||
if (isSettled === 1) return 'success'
|
||||
if (isUnfreeze === 1) return 'success'
|
||||
if (isSettled === 1) return 'info'
|
||||
return 'warning'
|
||||
}
|
||||
|
||||
@@ -120,8 +124,8 @@ const DealerOrders: React.FC = () => {
|
||||
<Text className="font-semibold text-gray-800">
|
||||
订单号:{order.orderNo || '-'}
|
||||
</Text>
|
||||
<Tag type={getStatusColor(order.isSettled, order.isInvalid)}>
|
||||
{getStatusText(order.isSettled, order.isInvalid)}
|
||||
<Tag type={getStatusColor(order.isSettled, order.isInvalid, order.isUnfreeze,order.orderStatus)}>
|
||||
{getStatusText(order.isSettled, order.isInvalid, order.isUnfreeze,order.orderStatus)}
|
||||
</Tag>
|
||||
</View>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user