diff --git a/apps/user/app/(main)/(content)/(user)/payment/page.tsx b/apps/user/app/(main)/(content)/(user)/payment/page.tsx index b7aab8d..35f484c 100644 --- a/apps/user/app/(main)/(content)/(user)/payment/page.tsx +++ b/apps/user/app/(main)/(content)/(user)/payment/page.tsx @@ -80,7 +80,7 @@ export default function Page() { ); return ( -
+
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) => { -
- {t('selectPlan')} -
-
- {t('selectYourPlan')} +
+
+ {t('selectPlan')} +
+
+ {t('selectYourPlan')} +
{t('logout')} diff --git a/apps/user/locales/en-US/common.json b/apps/user/locales/en-US/common.json index 68d6afc..3d4b668 100644 --- a/apps/user/locales/en-US/common.json +++ b/apps/user/locales/en-US/common.json @@ -12,7 +12,7 @@ "This empty space is waiting for its protagonist to take the stage!" ], "list": { - "pageInfo": "Page {current} of {total}", + "pageInfo": "Page {current} / {total}", "rowsPerPage": "Rows per page", "selectedItems": "{total} items selected" }, diff --git a/apps/user/locales/en-US/components.json b/apps/user/locales/en-US/components.json index 1374cdd..6a770af 100644 --- a/apps/user/locales/en-US/components.json +++ b/apps/user/locales/en-US/components.json @@ -21,7 +21,7 @@ "loading": "Loading...", "loadFailed": "Failed to load, please try again", "reload": "Reload", - "perYear": "/year", + "perYear": "/Month", "yearlyDiscount": "Enjoy a 20% discount on annual payment", "subscribe": "Subscribe", "availableNodes": "Available Nodes", diff --git a/apps/user/locales/en-US/profile.json b/apps/user/locales/en-US/profile.json index f4334e6..063bca0 100644 --- a/apps/user/locales/en-US/profile.json +++ b/apps/user/locales/en-US/profile.json @@ -16,7 +16,7 @@ "login": "Login", "notificationSettings": "Notification Settings", "notificationTypes": "Notification Types", - "save": "Save Changes", + "save": "Save", "subscribe": "Subscribe", "updateSuccess": "Update Successful", "description": "Enable or disable email notifications" diff --git a/apps/user/locales/zh-CN/common.json b/apps/user/locales/zh-CN/common.json index 091030e..08dbbe1 100644 --- a/apps/user/locales/zh-CN/common.json +++ b/apps/user/locales/zh-CN/common.json @@ -12,7 +12,7 @@ "这片空地在等它的主角登场!" ], "list": { - "pageInfo": "第 {current} 页,共 {total} 页", + "pageInfo": "第 {current} / {total} 页", "rowsPerPage": "每页行数", "selectedItems": "已选择 {total} 行" }, diff --git a/apps/user/locales/zh-CN/components.json b/apps/user/locales/zh-CN/components.json index b010600..c0cfe0b 100644 --- a/apps/user/locales/zh-CN/components.json +++ b/apps/user/locales/zh-CN/components.json @@ -21,7 +21,7 @@ "loading": "加载中...", "loadFailed": "加载失败,请重试", "reload": "重新加载", - "perYear": "/年", + "perYear": "/月", "yearlyDiscount": "年付享受8折优惠", "subscribe": "订阅", "availableNodes": "可用节点", diff --git a/apps/user/locales/zh-CN/profile.json b/apps/user/locales/zh-CN/profile.json index 705848c..d4ec761 100644 --- a/apps/user/locales/zh-CN/profile.json +++ b/apps/user/locales/zh-CN/profile.json @@ -16,7 +16,7 @@ "login": "登录", "notificationSettings": "通知设置", "notificationTypes": "通知类型", - "save": "保存更改", + "save": "保存", "subscribe": "订阅", "updateSuccess": "更新成功", "description": "是否邮箱通知推送" diff --git a/packages/airo-ui/src/custom-components/pro-list/pagination.tsx b/packages/airo-ui/src/custom-components/pro-list/pagination.tsx index 14e39f0..4d12a4e 100644 --- a/packages/airo-ui/src/custom-components/pro-list/pagination.tsx +++ b/packages/airo-ui/src/custom-components/pro-list/pagination.tsx @@ -26,14 +26,14 @@ interface PaginationProps { export function Pagination({ table, text }: PaginationProps) { return ( -
-
+
+
{text?.textPageOf?.(table.getState().pagination.pageIndex + 1, table.getPageCount()) || `Page ${table.getState().pagination.pageIndex + 1} of ${table.getPageCount()}`}
-
-
-

{text?.textRowsPerPage || 'Rows per page'}

+
+ {/*
+

{text?.textRowsPerPage || 'Rows per page'}

-
+
*/}