diff --git a/apps/user/app/(main)/(content)/(user)/profile/change-password.tsx b/apps/user/app/(main)/(content)/(user)/profile/change-password.tsx
index 24d1b25..305c5b9 100644
--- a/apps/user/app/(main)/(content)/(user)/profile/change-password.tsx
+++ b/apps/user/app/(main)/(content)/(user)/profile/change-password.tsx
@@ -2,6 +2,7 @@
import { updateUserPassword } from '@/services/user/user';
import { zodResolver } from '@hookform/resolvers/zod';
+import { AiroButton } from '@workspace/airo-ui/components/AiroButton';
import { Button } from '@workspace/airo-ui/components/button';
import { Card } from '@workspace/airo-ui/components/card';
import {
@@ -100,16 +101,14 @@ export default function ChangePassword() {
-
+
);
diff --git a/apps/user/app/(main)/(content)/(user)/profile/notify-settings.tsx b/apps/user/app/(main)/(content)/(user)/profile/notify-settings.tsx
index b03aaee..efc0aa2 100644
--- a/apps/user/app/(main)/(content)/(user)/profile/notify-settings.tsx
+++ b/apps/user/app/(main)/(content)/(user)/profile/notify-settings.tsx
@@ -5,6 +5,8 @@ import { updateUserNotify } from '@/services/user/user';
import { zodResolver } from '@hookform/resolvers/zod';
import { Button } from '@workspace/airo-ui/components/button';
import { Card } from '@workspace/airo-ui/components/card';
+
+import { AiroButton } from '@workspace/airo-ui/components/AiroButton';
import {
Form,
FormControl,
@@ -102,16 +104,13 @@ export default function NotifySettings() {
-
+
);
diff --git a/apps/user/app/(main)/(content)/(user)/subscribe/page.tsx b/apps/user/app/(main)/(content)/(user)/subscribe/page.tsx
index 79b8f94..db1051e 100644
--- a/apps/user/app/(main)/(content)/(user)/subscribe/page.tsx
+++ b/apps/user/app/(main)/(content)/(user)/subscribe/page.tsx
@@ -30,10 +30,10 @@ export default function Page() {
const discountItem = item.discount?.find((v) => v.quantity === 12);
return {
...item,
- origin_price: unitConversion('centsToDollars', item.unit_price * 12).toString(), // 原价
+ origin_price: unitConversion('centsToDollars', item.unit_price).toString(), // 原价
discount_price: unitConversion(
'centsToDollars',
- item.unit_price * ((discountItem?.discount || 100) / 100) * 12,
+ item.unit_price * ((discountItem?.discount || 100) / 100),
).toString(), // 优惠价格
};
} else {
diff --git a/apps/user/app/(main)/(content)/(user)/ticket/page.tsx b/apps/user/app/(main)/(content)/(user)/ticket/page.tsx
index 6a0eb90..7b3d954 100644
--- a/apps/user/app/(main)/(content)/(user)/ticket/page.tsx
+++ b/apps/user/app/(main)/(content)/(user)/ticket/page.tsx
@@ -158,7 +158,7 @@ export default function Page() {
}}
renderItem={(item) => {
return (
-
+
diff --git a/apps/user/components/affiliate/components/AffiliateDialog.tsx b/apps/user/components/affiliate/components/AffiliateDialog.tsx
index 746832e..8262f06 100644
--- a/apps/user/components/affiliate/components/AffiliateDialog.tsx
+++ b/apps/user/components/affiliate/components/AffiliateDialog.tsx
@@ -1,6 +1,7 @@
'use client';
import { Empty } from '@/components/empty';
+import { ProList } from '@/components/pro-list';
import { queryUserAffiliateList } from '@/services/user/user';
import {
Dialog,
@@ -8,7 +9,6 @@ import {
DialogHeader,
DialogTitle,
} from '@workspace/airo-ui/components/dialog';
-import { ProList } from '@workspace/airo-ui/custom-components/pro-list/pro-list';
import { formatDate } from '@workspace/airo-ui/utils';
import { useTranslations } from 'next-intl';
import { useImperativeHandle, useState } from 'react';
@@ -55,7 +55,7 @@ export const AffiliateDialog = ({ ref }: AffiliateDialogProps) => {
}}
renderItem={(invite) => {
return (
-
+
{t('userIdentifier')}
{invite.identifier}
diff --git a/apps/user/components/main/OfferDialog/index.tsx b/apps/user/components/main/OfferDialog/index.tsx
index 25b61d1..734abe0 100644
--- a/apps/user/components/main/OfferDialog/index.tsx
+++ b/apps/user/components/main/OfferDialog/index.tsx
@@ -179,7 +179,7 @@ const PlanCard = forwardRef<
return (
{/* 套餐名称 */}
{plan.name}
@@ -237,8 +237,8 @@ export const PlanList = ({
if (plans.length === 0) return
;
return (
-
-
+
+
{plans.map((plan, index) => (
((props, ref) => {
const discountItem = item.discount?.find((v) => v.quantity === 12);
return {
...item,
- origin_price: unitConversion('centsToDollars', item.unit_price * 12).toString(), // 原价
+ origin_price: unitConversion('centsToDollars', item.unit_price).toString(), // 原价
discount_price: unitConversion(
'centsToDollars',
- item.unit_price * ((discountItem?.discount || 100) / 100) * 12,
+ item.unit_price * ((discountItem?.discount || 100) / 100),
).toString(), // 优惠价格
};
} else {
@@ -338,14 +338,16 @@ const OfferDialog = forwardRef((props, ref) => {