diff --git a/app/(tabs)/owner.tsx b/app/(tabs)/owner.tsx index b3fa3a0..0281b91 100644 --- a/app/(tabs)/owner.tsx +++ b/app/(tabs)/owner.tsx @@ -119,7 +119,7 @@ export default function OwnerPage() { {/* 会员卡 */} - + {/* 分类 */} diff --git a/app/(tabs)/rights.tsx b/app/(tabs)/rights.tsx index ed2c1d7..eb2693c 100644 --- a/app/(tabs)/rights.tsx +++ b/app/(tabs)/rights.tsx @@ -37,9 +37,10 @@ export default function Rights() { requestProducts, ErrorCode } = useIAP(); - const { pro } = useLocalSearchParams<{ + const { points, pro } = useLocalSearchParams<{ credit: string; - pro: string; + points: string; + pro: string }>(); // 用户勾选协议 const [agree, setAgree] = useState(false); @@ -226,7 +227,7 @@ export default function Rights() { - {pro} + {points} @@ -266,8 +267,6 @@ export default function Rights() { padding: 16, paddingBottom: 32, backgroundColor: '#fff', - borderTopWidth: 1, - borderTopColor: '#eee', position: 'absolute', bottom: 0, left: 0, @@ -303,8 +302,8 @@ export default function Rights() { }} activeOpacity={0.8} > - - {t('rights.subscribe', { ns: 'personal' })} + + {t('rights.subscribe', { ns: 'personal' })} {payType?.split('_')[payType?.split('_')?.length - 1]} @@ -365,8 +364,8 @@ const styles = StyleSheet.create({ }, goPay: { backgroundColor: '#E2793F', - borderRadius: 24, - paddingVertical: 10, + borderRadius: 32, + paddingVertical: 16, display: "flex", alignItems: "center", width: "100%", @@ -379,9 +378,9 @@ const styles = StyleSheet.create({ marginBottom: 16 }, switchButtonItem: { - width: "48%", + width: "47%", borderRadius: 24, - paddingVertical: 6, + paddingVertical: 8, display: "flex", alignItems: "center", borderWidth: 1 @@ -390,7 +389,7 @@ const styles = StyleSheet.create({ marginHorizontal: 16, marginVertical: 16, padding: 16, - borderRadius: 12, + borderRadius: 32, backgroundColor: '#fff', shadowColor: '#000', shadowOffset: { @@ -421,7 +420,7 @@ const styles = StyleSheet.create({ marginHorizontal: 16, marginVertical: 16, backgroundColor: '#FFB645', - borderRadius: 12, + borderRadius: 32, }, cardContent: { position: 'absolute', @@ -440,7 +439,7 @@ const styles = StyleSheet.create({ fontWeight: '700', color: '#E2793F', backgroundColor: '#fff', - paddingHorizontal: 8, + paddingHorizontal: 16, paddingVertical: 2, borderRadius: 20, textAlign: 'center', @@ -450,12 +449,12 @@ const styles = StyleSheet.create({ display: 'flex', flexDirection: 'row', alignItems: 'center', - gap: 4 + gap: 8 }, cardPointsText: { fontSize: 32, fontWeight: '700', color: '#4C320C', - lineHeight: 32 + lineHeight: 36 } }); \ No newline at end of file diff --git a/components/owner/category.tsx b/components/owner/category.tsx index 0d14b23..fdefbb6 100644 --- a/components/owner/category.tsx +++ b/components/owner/category.tsx @@ -67,7 +67,7 @@ const CategoryComponent = ({ title, data, bgSvg, style, width }: CategoryProps) {item.title} - + {item?.title === "Length" ? ( typeof item.number === 'object' ? ( renderTimeDisplay(item.number) diff --git a/components/owner/rights/memberCard.tsx b/components/owner/rights/memberCard.tsx index 4e9d398..f72bdf0 100644 --- a/components/owner/rights/memberCard.tsx +++ b/components/owner/rights/memberCard.tsx @@ -6,14 +6,20 @@ import { Dimensions, StyleSheet, TouchableOpacity, View } from "react-native"; import CardBg from './cardBg'; import IpSvg from './ipSvg'; -const MemberCard = ({ pro }: { pro: string }) => { +const MemberCard = ({ pro, points }: { pro: string, points: number }) => { const { t } = useTranslation(); const proPng = require("@/assets/images/png/owner/pro.png"); const width = Dimensions.get("window").width; const router = useRouter(); return ( - router.push("/rights")}> + router.push({ + pathname: '/rights', + params: { + points: points, + pro: pro + } + })}> {/* 背景图 */} diff --git a/components/owner/rights/normal.tsx b/components/owner/rights/normal.tsx index c526156..ee5e7f9 100644 --- a/components/owner/rights/normal.tsx +++ b/components/owner/rights/normal.tsx @@ -50,7 +50,7 @@ const styles = StyleSheet.create({ goPro: { backgroundColor: '#E2793F', borderRadius: 24, - paddingVertical: 6, + paddingVertical: 12, display: "flex", alignItems: "center", width: "100%", diff --git a/components/owner/rights/premium.tsx b/components/owner/rights/premium.tsx index 6492705..9dd80a2 100644 --- a/components/owner/rights/premium.tsx +++ b/components/owner/rights/premium.tsx @@ -64,10 +64,10 @@ const Premium = (props: Props) => { - + {item.product_code?.split('_')[item.product_code?.split('_')?.length - 1]} - + $ {(Number(item.unit_price.amount) - Number(item.discount_amount.amount)).toFixed(2)}