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}