From 59d180075b96becec656de1f66e8552009cef35b Mon Sep 17 00:00:00 2001 From: speakeloudest Date: Tue, 12 Aug 2025 16:59:25 -0700 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dashboard/user/[id]/user-profile/basic-info-form.tsx | 7 ++++++- .../user/app/(main)/(content)/(user)/dashboard/content.tsx | 2 +- apps/user/app/(main)/(content)/(user)/subscribe/page.tsx | 2 +- apps/user/components/main/OfferDialog/index.tsx | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/apps/admin/app/dashboard/user/[id]/user-profile/basic-info-form.tsx b/apps/admin/app/dashboard/user/[id]/user-profile/basic-info-form.tsx index 76e4048..c2e1ccd 100644 --- a/apps/admin/app/dashboard/user/[id]/user-profile/basic-info-form.tsx +++ b/apps/admin/app/dashboard/user/[id]/user-profile/basic-info-form.tsx @@ -248,7 +248,12 @@ export function BasicInfoForm({ user, refetch }: { user: API.User; refetch: () = {t('password')} - + diff --git a/apps/user/app/(main)/(content)/(user)/dashboard/content.tsx b/apps/user/app/(main)/(content)/(user)/dashboard/content.tsx index 68d06c5..0c738ce 100644 --- a/apps/user/app/(main)/(content)/(user)/dashboard/content.tsx +++ b/apps/user/app/(main)/(content)/(user)/dashboard/content.tsx @@ -180,7 +180,7 @@ export default function Content() { {t('online')} - {userSubscribe?.[0]?.subscribe.device_limit} + {data?.online_device} / {userSubscribe?.[0]?.subscribe.device_limit}
diff --git a/apps/user/app/(main)/(content)/(user)/subscribe/page.tsx b/apps/user/app/(main)/(content)/(user)/subscribe/page.tsx index 8dd0da6..79b8f94 100644 --- a/apps/user/app/(main)/(content)/(user)/subscribe/page.tsx +++ b/apps/user/app/(main)/(content)/(user)/subscribe/page.tsx @@ -33,7 +33,7 @@ export default function Page() { origin_price: unitConversion('centsToDollars', item.unit_price * 12).toString(), // 原价 discount_price: unitConversion( 'centsToDollars', - item.unit_price * ((100 - discountItem?.discount || 100) / 100) * 12, + item.unit_price * ((discountItem?.discount || 100) / 100) * 12, ).toString(), // 优惠价格 }; } else { diff --git a/apps/user/components/main/OfferDialog/index.tsx b/apps/user/components/main/OfferDialog/index.tsx index 1268169..4a3defe 100644 --- a/apps/user/components/main/OfferDialog/index.tsx +++ b/apps/user/components/main/OfferDialog/index.tsx @@ -372,7 +372,7 @@ const OfferDialog = forwardRef((props, ref) => { origin_price: unitConversion('centsToDollars', item.unit_price * 12).toString(), // 原价 discount_price: unitConversion( 'centsToDollars', - item.unit_price * ((100 - discountItem?.discount || 100) / 100) * 12, + item.unit_price * ((discountItem?.discount || 100) / 100) * 12, ).toString(), // 优惠价格 }; } else {