fix: 退款展示退款金额、球局详情页样式修复

This commit is contained in:
2026-02-26 17:56:42 +08:00
parent 44f971b1c2
commit 23eb9dc467
2 changed files with 22 additions and 11 deletions

View File

@@ -48,8 +48,8 @@ function genRecommendGames(games, location, avatar) {
formatNtrpDisplay(skill_level_max) || "-" formatNtrpDisplay(skill_level_max) || "-"
}` }`
: skill_level_min === "1" : skill_level_min === "1"
? "无要求" ? "无要求"
: `${formatNtrpDisplay(skill_level_min)}以上`, : `${formatNtrpDisplay(skill_level_min)}以上`,
playType: play_type, playType: play_type,
}; };
}); });
@@ -220,7 +220,9 @@ export default function OrganizerInfo(props) {
> >
<Text>{game.venue}</Text> <Text>{game.venue}</Text>
<Text>·</Text> <Text>·</Text>
<Text>{game.venueType}</Text> <Text style={{ whiteSpace: "nowrap" }}>
{game.venueType}
</Text>
<Text>·</Text> <Text>·</Text>
<Text>{game.distance}</Text> <Text>{game.distance}</Text>
</View> </View>
@@ -247,7 +249,7 @@ export default function OrganizerInfo(props) {
styles[ styles[
"recommend-games-list-item-addon-message-applications" "recommend-games-list-item-addon-message-applications"
], ],
styles.joinMsg styles.joinMsg,
)} )}
> >
<Text></Text> <Text></Text>

View File

@@ -9,6 +9,7 @@ import orderService, {
OrderStatus, OrderStatus,
CancelType, CancelType,
refundTextMap, refundTextMap,
RefundStatus,
} from "@/services/orderService"; } from "@/services/orderService";
import { getStorage, removeStorage, setStorage } from "@/store/storage"; import { getStorage, removeStorage, setStorage } from "@/store/storage";
import { useGlobalStore } from "@/store/global"; import { useGlobalStore } from "@/store/global";
@@ -101,7 +102,7 @@ const OrderList = () => {
newList.splice( newList.splice(
index, index,
clear ? newList.length - index : 1, clear ? newList.length - index : 1,
addPageInfo(res.data.rows, page) addPageInfo(res.data.rows, page),
); );
return newList; return newList;
}); });
@@ -316,7 +317,7 @@ const OrderList = () => {
item.order_status === OrderStatus.PENDING && item.order_status === OrderStatus.PENDING &&
item.cancel_type === CancelType.NONE; item.cancel_type === CancelType.NONE;
const canceled = [CancelType.USER, CancelType.TIMEOUT].includes( const canceled = [CancelType.USER, CancelType.TIMEOUT].includes(
item.cancel_type item.cancel_type,
); );
const { game_info } = item; const { game_info } = item;
@@ -349,7 +350,7 @@ const OrderList = () => {
<View <View
className={classnames( className={classnames(
styles.payNum, styles.payNum,
styles[unPay ? "pending" : "paid"] styles[unPay ? "pending" : "paid"],
)} )}
> >
<Text> <Text>
@@ -358,7 +359,15 @@ const OrderList = () => {
: refundTextMap.get(item.refund_status)} : refundTextMap.get(item.refund_status)}
</Text>{" "} </Text>{" "}
<View className={styles.amount}> <View className={styles.amount}>
¥ <Text>{item.amount}</Text> ¥{" "}
<Text>
{[
RefundStatus.PENDING,
RefundStatus.SUCCESS,
].includes(item.refund_status)
? item.refund_amount
: item.amount}
</Text>
</View> </View>
</View> </View>
)} )}
@@ -370,7 +379,7 @@ const OrderList = () => {
{insertDotInTags([location_name, court_type, "3.5km"]).map( {insertDotInTags([location_name, court_type, "3.5km"]).map(
(text, index) => ( (text, index) => (
<Text key={index}>{text}</Text> <Text key={index}>{text}</Text>
) ),
)} )}
</View> </View>
<View className={styles.gameOtherInfo}> <View className={styles.gameOtherInfo}>
@@ -426,12 +435,12 @@ const OrderList = () => {
handlePayNow, handlePayNow,
handleViewGame, handleViewGame,
}, },
"list" "list",
)?.map((obj) => ( )?.map((obj) => (
<View <View
className={classnames( className={classnames(
styles.button, styles.button,
styles[obj.className] styles[obj.className],
)} )}
> >
<Text className={styles.buttonText}>{obj.text}</Text> <Text className={styles.buttonText}>{obj.text}</Text>