From 23eb9dc467c87f445926dad22c2a83f68bcc56fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=9D=B0?= Date: Thu, 26 Feb 2026 17:56:42 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=80=80=E6=AC=BE=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E9=80=80=E6=AC=BE=E9=87=91=E9=A2=9D=E3=80=81=E7=90=83=E5=B1=80?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E6=A0=B7=E5=BC=8F=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detail/components/OrganizerInfo/index.tsx | 10 ++++---- src/order_pages/orderList/index.tsx | 23 +++++++++++++------ 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/src/game_pages/detail/components/OrganizerInfo/index.tsx b/src/game_pages/detail/components/OrganizerInfo/index.tsx index 857e1bc..da0fbd4 100644 --- a/src/game_pages/detail/components/OrganizerInfo/index.tsx +++ b/src/game_pages/detail/components/OrganizerInfo/index.tsx @@ -48,8 +48,8 @@ function genRecommendGames(games, location, avatar) { formatNtrpDisplay(skill_level_max) || "-" }` : skill_level_min === "1" - ? "无要求" - : `${formatNtrpDisplay(skill_level_min)}以上`, + ? "无要求" + : `${formatNtrpDisplay(skill_level_min)}以上`, playType: play_type, }; }); @@ -220,7 +220,9 @@ export default function OrganizerInfo(props) { > {game.venue} · - {game.venueType} + + {game.venueType} + · {game.distance} @@ -247,7 +249,7 @@ export default function OrganizerInfo(props) { styles[ "recommend-games-list-item-addon-message-applications" ], - styles.joinMsg + styles.joinMsg, )} > 已加入 diff --git a/src/order_pages/orderList/index.tsx b/src/order_pages/orderList/index.tsx index 53b98f6..3b011b0 100644 --- a/src/order_pages/orderList/index.tsx +++ b/src/order_pages/orderList/index.tsx @@ -9,6 +9,7 @@ import orderService, { OrderStatus, CancelType, refundTextMap, + RefundStatus, } from "@/services/orderService"; import { getStorage, removeStorage, setStorage } from "@/store/storage"; import { useGlobalStore } from "@/store/global"; @@ -101,7 +102,7 @@ const OrderList = () => { newList.splice( index, clear ? newList.length - index : 1, - addPageInfo(res.data.rows, page) + addPageInfo(res.data.rows, page), ); return newList; }); @@ -316,7 +317,7 @@ const OrderList = () => { item.order_status === OrderStatus.PENDING && item.cancel_type === CancelType.NONE; const canceled = [CancelType.USER, CancelType.TIMEOUT].includes( - item.cancel_type + item.cancel_type, ); const { game_info } = item; @@ -349,7 +350,7 @@ const OrderList = () => { @@ -358,7 +359,15 @@ const OrderList = () => { : refundTextMap.get(item.refund_status)} {" "} - ¥ {item.amount} + ¥{" "} + + {[ + RefundStatus.PENDING, + RefundStatus.SUCCESS, + ].includes(item.refund_status) + ? item.refund_amount + : item.amount} + )} @@ -370,7 +379,7 @@ const OrderList = () => { {insertDotInTags([location_name, court_type, "3.5km"]).map( (text, index) => ( {text} - ) + ), )} @@ -426,12 +435,12 @@ const OrderList = () => { handlePayNow, handleViewGame, }, - "list" + "list", )?.map((obj) => ( {obj.text}