optimize payment process (#3517)

2025-01-03 10:44:41 +08:00
parent a401d4d612
commit 8b2be89350
17 changed files with 238 additions and 87 deletions
--- a/projects/app/src/pages/account/team/index.tsx
+++ b/projects/app/src/pages/account/team/index.tsx
@@ -21,6 +21,7 @@ import { TeamContext, TeamModalContextProvider } from './components/context';
 import dynamic from 'next/dynamic';
 import TeamTagModal from '@/components/support/user/team/TeamTagModal';
 import MemberTable from './components/MemberTable';
+import { TeamErrEnum } from '@fastgpt/global/common/error/code/team';

 const InviteModal = dynamic(() => import('./components/InviteModal'));
 const PermissionManage = dynamic(() => import('./components/PermissionManage/index'));
@@ -41,7 +42,7 @@ const Team = () => {
  const { toast } = useToast();
  const { t } = useTranslation();
  const { userInfo, teamPlanStatus } = useUserStore();
-  const { feConfigs } = useSystemStore();
+  const { feConfigs, setNotSufficientModalType } = useSystemStore();

  const {
    myTeams,
@@ -221,10 +222,11 @@ const Team = () => {
                  ) {
                    toast({
                      status: 'warning',
-                      title: t('user.team.Over Max Member Tip', {
+                      title: t('common:user.team.Over Max Member Tip', {
                        max: teamPlanStatus.standardConstants.maxTeamMember
                      })
                    });
+                    setNotSufficientModalType(TeamErrEnum.teamMemberOverSize);
                  } else {
                    onOpenInvite();
                  }
--- a/projects/app/src/pages/dataset/component/ApiDatasetForm.tsx
+++ b/projects/app/src/pages/dataset/component/ApiDatasetForm.tsx
@@ -135,7 +135,7 @@ const ApiDatasetForm = ({
            </Flex>
            <Input
              bg={'myWhite.600'}
-              placeholder={'Token'}
+              placeholder={'User ID'}
              maxLength={200}
              {...register('yuqueServer.userId', { required: true })}
            />
--- a/projects/app/src/pages/price/components/ExtraPlan.tsx
+++ b/projects/app/src/pages/price/components/ExtraPlan.tsx
@@ -1,4 +1,4 @@
-import { Box, Flex, Grid, Button } from '@chakra-ui/react';
+import { Box, Flex, Grid, Button, VStack } from '@chakra-ui/react';
 import { useTranslation } from 'next-i18next';
 import React, { useCallback, useState } from 'react';
 import { useSystemStore } from '@/web/common/system/useSystemStore';
@@ -11,7 +11,7 @@ import { BillTypeEnum } from '@fastgpt/global/support/wallet/bill/constants';
 import QRCodePayModal, { type QRPayProps } from '@/components/support/wallet/QRCodePayModal';
 import MyNumberInput from '@fastgpt/web/components/common/Input/NumberInput';

-const ExtraPlan = () => {
+const ExtraPlan = ({ onPaySuccess }: { onPaySuccess?: () => void }) => {
  const { t } = useTranslation();
  const { toast } = useToast();
  const { subPlans } = useSystemStore();
@@ -108,19 +108,8 @@ const ExtraPlan = () => {
  );

  return (
-    <Flex
-      mt={['40px', '100px']}
-      flexDirection={'column'}
-      alignItems={'center'}
-      position={'relative'}
-    >
-      <Box id={'extra-plan'} fontWeight={'bold'} fontSize={['24px', '36px']} color={'myGray.900'}>
-        {t('common:support.wallet.subscription.Extra plan')}
-      </Box>
-      <Box mt={2} mb={8} color={'myGray.600'} fontSize={'md'}>
-        {t('common:support.wallet.subscription.Extra plan tip')}
-      </Box>
-      <Grid mt={8} gridTemplateColumns={['1fr', '1fr 1fr']} gap={5} w={['100%', 'auto']}>
+    <VStack>
+      <Grid gridTemplateColumns={['1fr', '1fr 1fr']} gap={5} w={['100%', 'auto']}>
        <Box
          bg={'rgba(255, 255, 255, 0.90)'}
          px={'32px'}
@@ -284,8 +273,8 @@ const ExtraPlan = () => {
        </Box>
      </Grid>

-      {!!qrPayData && <QRCodePayModal {...qrPayData} />}
-    </Flex>
+      {!!qrPayData && <QRCodePayModal onSuccess={onPaySuccess} {...qrPayData} />}
+    </VStack>
  );
 };

--- a/projects/app/src/pages/price/components/Standard.tsx
+++ b/projects/app/src/pages/price/components/Standard.tsx
@@ -20,10 +20,10 @@ export enum PackageChangeStatusEnum {

 const Standard = ({
  standardPlan: myStandardPlan,
-  refetchTeamSubPlan
+  onPaySuccess
 }: {
  standardPlan?: TeamSubSchema;
-  refetchTeamSubPlan: () => void;
+  onPaySuccess?: () => void;
 }) => {
  const { t } = useTranslation();

@@ -78,14 +78,6 @@ const Standard = ({
  return (
    <>
      <Flex flexDirection={'column'} alignItems={'center'} position={'relative'}>
-        <Box fontWeight={'600'} color={'myGray.900'} fontSize={['24px', '36px']}>
-          {t('common:support.wallet.subscription.Sub plan')}
-        </Box>
-        <Box mt={8} mb={10} fontWeight={'500'} color={'myGray.600'} fontSize={'md'}>
-          {t('common:support.wallet.subscription.Sub plan tip', {
-            title: feConfigs?.systemTitle
-          })}
-        </Box>
        <Box>
          <RowTabs
            list={[
@@ -271,15 +263,13 @@ const Standard = ({
        </Grid>

        {!!qrPayData && packageChange && (
-          <QRCodePayModal tip={packagePayTextMap[packageChange]} {...qrPayData} />
+          <QRCodePayModal
+            tip={packagePayTextMap[packageChange]}
+            onSuccess={onPaySuccess}
+            {...qrPayData}
+          />
        )}
      </Flex>
-      <HStack mt={8} color={'blue.700'} ml={8}>
-        <MyIcon name={'infoRounded'} w={'1rem'} />
-        <Box fontSize={'sm'} fontWeight={'500'}>
-          {t('user:bill.standard_valid_tip')}
-        </Box>
-      </HStack>
    </>
  );
 };
--- a/projects/app/src/pages/price/index.tsx
+++ b/projects/app/src/pages/price/index.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { serviceSideProps } from '@fastgpt/web/common/system/nextjs';
-import { Box, Flex } from '@chakra-ui/react';
+import { Box, Flex, HStack, VStack } from '@chakra-ui/react';
 import { useUserStore } from '@/web/support/user/useUserStore';
 import { getTeamPlanStatus } from '@/web/support/user/team/api';
 import { useQuery } from '@tanstack/react-query';
@@ -12,17 +12,18 @@ import FAQ from './components/FAQ';
 import { getToken } from '@/web/support/user/auth';
 import Script from 'next/script';
 import { getWebReqUrl } from '@fastgpt/web/common/system/utils';
+import { useTranslation } from 'next-i18next';
+import MyIcon from '@fastgpt/web/components/common/Icon';
+import { useSystemStore } from '@/web/common/system/useSystemStore';

 const PriceBox = () => {
  const { userInfo } = useUserStore();
+  const { t } = useTranslation();
+  const { feConfigs } = useSystemStore();

-  const { data: teamSubPlan, refetch: refetchTeamSubPlan } = useQuery(
-    ['getTeamPlanStatus'],
-    getTeamPlanStatus,
-    {
-      enabled: !!getToken() || !!userInfo
-    }
-  );
+  const { data: teamSubPlan } = useQuery(['getTeamPlanStatus'], getTeamPlanStatus, {
+    enabled: !!getToken() || !!userInfo
+  });

  return (
    <>
@@ -39,12 +40,39 @@ const PriceBox = () => {
        backgroundRepeat={'no-repeat'}
      >
        {/* standard sub */}
-        <StandardPlan
-          standardPlan={teamSubPlan?.standard}
-          refetchTeamSubPlan={refetchTeamSubPlan}
-        />
+        <VStack>
+          <Box fontWeight={'600'} color={'myGray.900'} fontSize={['24px', '36px']}>
+            {t('common:support.wallet.subscription.Sub plan')}
+          </Box>
+          <Box mt={8} mb={10} fontWeight={'500'} color={'myGray.600'} fontSize={'md'}>
+            {t('common:support.wallet.subscription.Sub plan tip', {
+              title: feConfigs?.systemTitle
+            })}
+          </Box>
+          <StandardPlan standardPlan={teamSubPlan?.standard} />
+          <HStack mt={8} color={'blue.700'} ml={8}>
+            <MyIcon name={'infoRounded'} w={'1rem'} />
+            <Box fontSize={'sm'} fontWeight={'500'}>
+              {t('user:bill.standard_valid_tip')}
+            </Box>
+          </HStack>
+        </VStack>

-        <ExtraPlan />
+        {/* extra plan */}
+        <VStack mt={['40px', '100px']} mb={8}>
+          <Box
+            id={'extra-plan'}
+            fontWeight={'bold'}
+            fontSize={['24px', '36px']}
+            color={'myGray.900'}
+          >
+            {t('common:support.wallet.subscription.Extra plan')}
+          </Box>
+          <Box mt={2} mb={8} color={'myGray.600'} fontSize={'md'}>
+            {t('common:support.wallet.subscription.Extra plan tip')}
+          </Box>
+          <ExtraPlan />
+        </VStack>

        {/* points */}
        <PointsCard />