feat: 修复用户手动取消订单的状态显示、修复支付过程中订单支付按钮一直展示的问题

This commit is contained in:
2025-10-19 18:40:58 +08:00
parent a3c3087e46
commit 2772e7f1df
7 changed files with 92 additions and 28 deletions

View File

@@ -11,6 +11,7 @@ import orderService, {
refundTextMap,
} from "@/services/orderService";
import { getStorage, removeStorage, setStorage } from "@/store/storage";
import { useGlobalStore } from "@/store/global";
import { handleCustomerService } from "@/services/userService";
import { withAuth, RefundPopup, GeneralNavbar } from "@/components";
import { payOrder, generateOrderActions } from "@/utils";
@@ -256,8 +257,14 @@ const OrderList = () => {
const flatList = list.flat();
const { statusNavbarHeightInfo } = useGlobalStore();
const { totalHeight } = statusNavbarHeightInfo;
return (
<View className={styles.container}>
<View
className={styles.container}
style={{ paddingTop: `${totalHeight + 8}px` }}
>
<GeneralNavbar
title="订单列表"
backgroundColor="transparent"
@@ -278,7 +285,9 @@ const OrderList = () => {
const unPay =
item.order_status === OrderStatus.PENDING &&
item.cancel_type === CancelType.NONE;
const timeout = item.cancel_type === CancelType.TIMEOUT;
const canceled = [CancelType.USER, CancelType.TIMEOUT].includes(
item.cancel_type
);
const { game_info } = item;
const {
@@ -300,7 +309,7 @@ const OrderList = () => {
>
<View className={styles.gameTitle}>
<View className={styles.title}>{item?.game_info?.title}</View>
{!timeout && (
{!canceled && (
<View
className={classnames(
styles.payNum,