diff --git a/baedalmate/src/components/molecules/Detail/DeliveryFeeModal.tsx b/baedalmate/src/components/molecules/Detail/DeliveryFeeModal.tsx index e44cc0e..bd23b24 100644 --- a/baedalmate/src/components/molecules/Detail/DeliveryFeeModal.tsx +++ b/baedalmate/src/components/molecules/Detail/DeliveryFeeModal.tsx @@ -113,7 +113,7 @@ const DeliveryFeeModal = ({item}: {item: RecruitItemProps | undefined}) => { style={{ marginTop: 10, marginBottom: 10, - paddingBottom: 30, + // paddingBottom: 30, borderBottomWidth: 1, borderBottomColor: LINE_GRAY_COLOR, }}> @@ -122,35 +122,61 @@ const DeliveryFeeModal = ({item}: {item: RecruitItemProps | undefined}) => { fontSize: 18, lineHeight: 22, color: PRIMARY_COLOR, + marginBottom: 8, }}> 배달비 상세정보 + + 배달팁 계산 시, 나누어 떨어지지 않는 경우 1원이 추가되어 + 계산됩니다. + - - 주문금액 - 배달팁 - - {item?.shippingFeeDetail.map((v, i) => ( + {item?.shippingFeeDetail && ( + 주문금액 + 배달팁 + + )} + + {item?.shippingFeeDetail ? ( + item?.shippingFeeDetail.map((v, i) => ( + + + {formPrice(v.lowerPrice)}원 이상 + + + {formPrice(v.shippingFee)}원 + + + )) + ) : ( + - - {formPrice(v.lowerPrice)}원 이상 - - - {formPrice(v.shippingFee)}원 - + + 배달비 없음 + - ))} + )} { const navigation = useNavigation(); + const [rating, setRating] = useState(0); + useEffect(() => { + item?.userInfo.score && setRating(item?.userInfo.score); + }, [item]); + return ( { marginLeft: 11, justifyContent: 'space-around', }}> - {item?.userInfo.nickname} - - - + + {item?.userInfo.nickname} + + + {}} + starSize={20} + color={PRIMARY_COLOR} + starStyle={{ + width: 14, + marginRight: 3, + display: 'flex', + // borderWidth: 1, + justifyContent: 'flex-end', + alignItems: 'flex-end', + }} + animationConfig={{ + scale: 1, + duration: 0, + delay: 0, + easing: Easing.elastic(1), + }} + /> + {item?.userInfo.score ? Math.round(item?.userInfo.score * 10) / 10 : 0} @@ -65,7 +113,13 @@ const UserInfo = ({item}: {item: RecruitItemProps | undefined}) => { {!item?.host && ( { - navigation.navigate('게시글 신고하기' as never); + navigation.navigate( + '게시글 신고하기' as never, + { + item: item, + userInfo: item?.userInfo, + } as never, + ); }} style={{ borderBottomWidth: 1,