diff --git a/app/challenges/[id].tsx b/app/challenges/[id].tsx index 574d1bd..defe784 100644 --- a/app/challenges/[id].tsx +++ b/app/challenges/[id].tsx @@ -19,6 +19,7 @@ import { } from '@/store/challengesSlice'; import { Toast } from '@/utils/toast.utils'; import { Ionicons } from '@expo/vector-icons'; +import dayjs from 'dayjs'; import { BlurView } from 'expo-blur'; import { LinearGradient } from 'expo-linear-gradient'; import { useLocalSearchParams, useRouter } from 'expo-router'; @@ -321,25 +322,14 @@ export default function ChallengeDetailScreen() { > - {progress.badge ? ( - isHttpUrl(progress.badge) ? ( - - ) : ( - - {progress.badge} - - ) - ) : ( - - 打卡中 - - )} + + 打卡中 + {challenge.title} - {progress.subtitle ? {progress.subtitle} : null} - 剩余 {progress.remaining} 天 + 剩余 {dayjs(challenge.endAt).diff(dayjs(), 'd') || 0} 天 @@ -368,7 +358,7 @@ export default function ChallengeDetailScreen() { })} - {isJoined ? ( + {/* {isJoined ? ( <> {progressActionError} ) : null} - ) : null} + ) : null} */} diff --git a/services/challengesApi.ts b/services/challengesApi.ts index 745f5f2..caf8261 100644 --- a/services/challengesApi.ts +++ b/services/challengesApi.ts @@ -5,9 +5,7 @@ export type ChallengeStatus = 'upcoming' | 'ongoing' | 'expired'; export type ChallengeProgressDto = { completed: number; target: number; - remaining: number; - badge: string; - subtitle?: string; + remaining: number }; export type RankingItemDto = { @@ -35,6 +33,7 @@ export type ChallengeListItemDto = { isJoined: boolean; startAt?: string; endAt?: string; + minimumCheckInDays: number; // 最小打卡天数 }; export type ChallengeDetailDto = ChallengeListItemDto & {