forked from gxwebsoft/mp-10550
feat(tickets): 优化水票页面显示和订单状态逻辑
- 集成 dayjs 库用于时间格式化 - 将下单时间格式化为 YYYY年MM月DD日 HH:mm:ss 格式 - 重新设计水票数量展示布局,突出显示可用、已用和剩余赠票 - 更新核销记录标题为票号显示 - 修改二维码扫描页面显示票号而非模板名称 - 添加订单完成状态判断函数 - 在待发货和待收货状态中排除已完成订单 - 移除已完成订单状态下的操作按钮
This commit is contained in:
@@ -149,6 +149,8 @@ function OrderList(props: OrderListProps) {
|
||||
return '未知状态';
|
||||
};
|
||||
|
||||
const isOrderCompleted = (order: ShopOrder) => order.orderStatus === 1 || order.formId === 10074;
|
||||
|
||||
// 获取订单状态颜色
|
||||
const getOrderStatusColor = (order: ShopOrder) => {
|
||||
// 优先检查订单状态
|
||||
@@ -812,7 +814,7 @@ function OrderList(props: OrderListProps) {
|
||||
)}
|
||||
|
||||
{/* 待发货状态:显示申请退款 */}
|
||||
{item.payStatus && item.deliveryStatus === 10 && item.orderStatus !== 2 && item.orderStatus !== 4 && (
|
||||
{item.payStatus && item.deliveryStatus === 10 && item.orderStatus !== 2 && item.orderStatus !== 4 && !isOrderCompleted(item) && (
|
||||
<Button size={'small'} onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
applyRefund(item);
|
||||
@@ -820,7 +822,7 @@ function OrderList(props: OrderListProps) {
|
||||
)}
|
||||
|
||||
{/* 待收货状态:显示查看物流和确认收货 */}
|
||||
{item.deliveryStatus === 20 && (!item.riderId || !!item.sendEndTime) && item.orderStatus !== 2 && item.orderStatus !== 6 && (
|
||||
{item.deliveryStatus === 20 && (!item.riderId || !!item.sendEndTime) && item.orderStatus !== 2 && item.orderStatus !== 6 && !isOrderCompleted(item) && (
|
||||
<Space>
|
||||
{/*<Button size={'small'} onClick={(e) => {*/}
|
||||
{/* e.stopPropagation();*/}
|
||||
@@ -833,25 +835,6 @@ function OrderList(props: OrderListProps) {
|
||||
</Space>
|
||||
)}
|
||||
|
||||
{/* 已完成状态:显示再次购买、评价商品、申请退款 */}
|
||||
{item.orderStatus === 1 && (
|
||||
<Space>
|
||||
<Button size={'small'} onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
buyAgain(item);
|
||||
}}>再次购买</Button>
|
||||
{/*<Button size={'small'} onClick={(e) => {*/}
|
||||
{/* e.stopPropagation();*/}
|
||||
{/* evaluateGoods(item);*/}
|
||||
{/*}}>评价商品</Button>*/}
|
||||
|
||||
<Button size={'small'} onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
applyRefund(item);
|
||||
}}>申请退款</Button>
|
||||
</Space>
|
||||
)}
|
||||
|
||||
{/* 退款/售后状态:显示查看进度和撤销申请 */}
|
||||
{(item.orderStatus === 4 || item.orderStatus === 7) && (
|
||||
<Space>
|
||||
|
||||
Reference in New Issue
Block a user