perf: pay ui

labring · Aug 27, 2024 · 5c8bc20 · 5c8bc20
1 parent 2af77c0
commit 5c8bc20
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 30 deletions.
diff --git a/packages/global/support/wallet/sub/constants.ts b/packages/global/support/wallet/sub/constants.ts
@@ -72,15 +72,3 @@ export const standardSubLevelMap = {
     weight: 5
   }
 };
-
-export enum PackageChangeStatusEnum {
-  buy = 'buy',
-  renewal = 'renewal',
-  upgrade = 'upgrade'
-}
-
-export const packagePayTextMap = {
-  [PackageChangeStatusEnum.buy]: i18nT('common:pay.package_tip.buy'),
-  [PackageChangeStatusEnum.renewal]: i18nT('common:pay.package_tip.renewal'),
-  [PackageChangeStatusEnum.upgrade]: i18nT('common:pay.package_tip.upgrade')
-};
diff --git a/projects/app/src/components/support/wallet/QRCodePayModal.tsx b/projects/app/src/components/support/wallet/QRCodePayModal.tsx
@@ -75,7 +75,7 @@ const QRCodePayModal = ({
     <MyModal isOpen title={t('common:user.Pay')} iconSrc="/imgs/modal/pay.svg">
       <ModalBody textAlign={'center'} py={6} whiteSpace={'pre'}>
         {tip && (
-          <Box textAlign={'left'} whiteSpace={'normal'} mb={3}>
+          <Box fontSize={'sm'} whiteSpace={'normal'} mb={3}>
             {tip}
           </Box>
         )}

diff --git a/projects/app/src/components/support/wallet/StandardPlanContentList.tsx b/projects/app/src/components/support/wallet/StandardPlanContentList.tsx
@@ -43,7 +43,7 @@ const StandardPlanContentList = ({
   }, [subPlans?.standard, level, mode]);
 
   return planContent ? (
-    <Grid gap={4} fontSize={'sm'}>
+    <Grid gap={4} fontSize={'sm'} fontWeight={500}>
       <Flex alignItems={'center'}>
         <MyIcon name={'price/right'} w={'16px'} mr={3} />
         <Box color={'myGray.600'}>

diff --git a/projects/app/src/pages/account/components/Info/standardDetailModal.tsx b/projects/app/src/pages/account/components/Info/standardDetailModal.tsx
@@ -16,7 +16,6 @@ import {
 } from '@chakra-ui/react';
 import MyModal from '@fastgpt/web/components/common/MyModal';
 import { useTranslation } from 'next-i18next';
-import { useQuery } from '@tanstack/react-query';
 import { useLoading } from '@fastgpt/web/hooks/useLoading';
 import MyIcon from '@fastgpt/web/components/common/Icon';
 import { getTeamPlans } from '@/web/support/user/team/api';
@@ -25,7 +24,6 @@ import {
   standardSubLevelMap,
   SubTypeEnum
 } from '@fastgpt/global/support/wallet/sub/constants';
-import { TeamSubSchema } from '@fastgpt/global/support/wallet/sub/type';
 import { formatTime2YMDHM } from '@fastgpt/global/common/string/time';
 import { useSystemStore } from '@/web/common/system/useSystemStore';
 import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
@@ -71,7 +69,7 @@ const StandDetailModal = ({ onClose }: { onClose: () => void }) => {
       isCentered
     >
       <ModalCloseButton onClick={onClose} />
-      <ModalBody px={'3.25rem'} py={'2rem'}>
+      <ModalBody px={[4, 8]} py={[2, 6]}>
         <TableContainer mt={2} position={'relative'} minH={'300px'}>
           <Table>
             <Thead>
@@ -100,7 +98,6 @@ const StandDetailModal = ({ onClose }: { onClose: () => void }) => {
                     ? subPlans?.standard?.[currentSubLevel]
                     : undefined;
                   const datasetSize = standardPlan?.maxDatasetSize || currentExtraDatasetSize;
-                  const now = new Date();
 
                   return (
                     <Tr key={_id} fontWeight={500} fontSize={'mini'} color={'myGray.900'}>

diff --git a/projects/app/src/pages/price/components/Standard.tsx b/projects/app/src/pages/price/components/Standard.tsx
@@ -2,12 +2,7 @@ import React, { useMemo, useState } from 'react';
 import MyIcon from '@fastgpt/web/components/common/Icon';
 import { Box, Button, Flex, Grid, HStack } from '@chakra-ui/react';
 import { useTranslation } from 'next-i18next';
-import {
-  StandardSubLevelEnum,
-  SubModeEnum,
-  PackageChangeStatusEnum,
-  packagePayTextMap
-} from '@fastgpt/global/support/wallet/sub/constants';
+import { StandardSubLevelEnum, SubModeEnum } from '@fastgpt/global/support/wallet/sub/constants';
 import { useSystemStore } from '@/web/common/system/useSystemStore';
 import { standardSubLevelMap } from '@fastgpt/global/support/wallet/sub/constants';
 import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
@@ -16,8 +11,12 @@ import QRCodePayModal, { type QRPayProps } from '@/components/support/wallet/QRC
 import { getWxPayQRCode } from '@/web/support/wallet/bill/api';
 import { BillTypeEnum } from '@fastgpt/global/support/wallet/bill/constants';
 import StandardPlanContentList from '@/components/support/wallet/StandardPlanContentList';
-import { useRouter } from 'next/router';
-import { useToast } from '@fastgpt/web/hooks/useToast';
+
+export enum PackageChangeStatusEnum {
+  buy = 'buy',
+  renewal = 'renewal',
+  upgrade = 'upgrade'
+}
 
 const Standard = ({
   standardPlan: myStandardPlan,
@@ -27,8 +26,13 @@ const Standard = ({
   refetchTeamSubPlan: () => void;
 }) => {
   const { t } = useTranslation();
-  const router = useRouter();
-  const { toast } = useToast();
+
+  const packagePayTextMap = {
+    [PackageChangeStatusEnum.buy]: t('common:pay.package_tip.buy'),
+    [PackageChangeStatusEnum.renewal]: t('common:pay.package_tip.renewal'),
+    [PackageChangeStatusEnum.upgrade]: t('common:pay.package_tip.upgrade')
+  };
+
   const [packageChange, setPackageChange] = useState<PackageChangeStatusEnum>();
   const { subPlans, feConfigs } = useSystemStore();
   const [selectSubMode, setSelectSubMode] = useState<`${SubModeEnum}`>(SubModeEnum.month);
@@ -177,7 +181,8 @@ const Standard = ({
                         boxShadow={'0'}
                         cursor={'default'}
                         w={'100%'}
-                        variant={isCurrentPlan ? 'whiteBase' : 'solid'}
+                        isDisabled
+                        variant={'whiteBase'}
                       >
                         {t('common:free')}
                       </Button>
@@ -265,7 +270,7 @@ const Standard = ({
         </Grid>
 
         {!!qrPayData && packageChange && (
-          <QRCodePayModal tip={t(packagePayTextMap[packageChange])} {...qrPayData} />
+          <QRCodePayModal tip={packagePayTextMap[packageChange]} {...qrPayData} />
         )}
       </Flex>
       <HStack mt={8} color={'blue.700'} ml={8}>