联赛筛选
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
import { HomeHeader } from "@/components/home-header";
|
||||
import { MatchCard } from "@/components/match-card";
|
||||
import { MatchCardLeague } from "@/components/match-card-league";
|
||||
import { MatchesByLeague } from "@/components/matches-by-league";
|
||||
import { SelectionModal } from "@/components/selection-modal";
|
||||
import { CalendarModal } from "@/components/simple-calendar";
|
||||
import { ThemedText } from "@/components/themed-text";
|
||||
@@ -341,7 +341,7 @@ export default function HomeScreen() {
|
||||
let merged: Match[] = list.map((m) => ({
|
||||
...m,
|
||||
date: (m as any).date || selectedStr,
|
||||
sport: (m as any).sport ?? sportId,
|
||||
sportId: (m as any).sportId ?? sportId,
|
||||
}));
|
||||
|
||||
if (shouldMergeLive) {
|
||||
@@ -374,7 +374,7 @@ export default function HomeScreen() {
|
||||
away: item.event_away_team,
|
||||
scoreText: item.event_final_result || "0 - 0",
|
||||
fav: false,
|
||||
sport: sportId,
|
||||
sportId: sportId,
|
||||
isLive: true,
|
||||
};
|
||||
});
|
||||
@@ -556,17 +556,13 @@ export default function HomeScreen() {
|
||||
<ActivityIndicator size="large" color={Colors[theme].tint} />
|
||||
<ThemedText style={{ marginTop: 10 }}>{t("home.loading")}</ThemedText>
|
||||
</View>
|
||||
) : (
|
||||
) : filterMode === "time" ? (
|
||||
<FlatList
|
||||
data={matches}
|
||||
keyExtractor={(item) => item.id}
|
||||
renderItem={({ item }) =>
|
||||
filterMode === "time" ? (
|
||||
<MatchCard match={item} onFavoriteToggle={handleFavoriteToggle} />
|
||||
) : (
|
||||
<MatchCardLeague match={item} onFavoriteToggle={handleFavoriteToggle} />
|
||||
)
|
||||
}
|
||||
renderItem={({ item }) => (
|
||||
<MatchCard match={item} onFavoriteToggle={handleFavoriteToggle} />
|
||||
)}
|
||||
contentContainerStyle={styles.listContent}
|
||||
ListEmptyComponent={
|
||||
<View style={styles.center}>
|
||||
@@ -574,6 +570,11 @@ export default function HomeScreen() {
|
||||
</View>
|
||||
}
|
||||
/>
|
||||
) : (
|
||||
<MatchesByLeague
|
||||
matches={matches}
|
||||
onFavoriteToggle={handleFavoriteToggle}
|
||||
/>
|
||||
)}
|
||||
|
||||
{/* Modals - 条件渲染,只在可见时渲染 */}
|
||||
|
||||
Reference in New Issue
Block a user