From f1af3c0a28a11175f7e95a1d8fb284fae8c53caa Mon Sep 17 00:00:00 2001 From: myf <> Date: Sun, 24 Apr 2022 19:31:01 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E5=86=9B=E5=9B=A2=E9=95=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Referral/components/BuyNftModal.tsx | 13 +++---- src/views/Referral/components/Connected.tsx | 36 ++++++++++++++++--- src/views/Referral/components/Regimental.tsx | 36 ++++++++++++++++--- src/views/Referral/index.tsx | 22 ++++++++---- 4 files changed, 83 insertions(+), 24 deletions(-) diff --git a/src/views/Referral/components/BuyNftModal.tsx b/src/views/Referral/components/BuyNftModal.tsx index dcf6f69..8d9668a 100644 --- a/src/views/Referral/components/BuyNftModal.tsx +++ b/src/views/Referral/components/BuyNftModal.tsx @@ -1,10 +1,10 @@ import React from 'react' import styled from 'styled-components' import { useTranslation } from 'contexts/Localization' +import { useReferralNormalConfigInfo } from 'state/referral/hooks' import { Flex, Button, Modal, Image } from '@pancakeswap/uikit' import TextFlex from './TextFlex' import FlexCom from './FlexCom' -import { useBuyTransaction } from '../hooks' const ModalDiv = styled(Modal)` width: 80%; @@ -50,11 +50,8 @@ const ImageDiv = styled(Image)` const BuyNftModal: React.FC = () => { const { t } = useTranslation() - const sendBuyTransaction = useBuyTransaction() + const referralRewardInfo = useReferralNormalConfigInfo() // const onDismiss = () => {} - const handleBuy = () => { - sendBuyTransaction() - } return ( @@ -66,8 +63,8 @@ const BuyNftModal: React.FC = () => { /> - - + + @@ -75,7 +72,7 @@ const BuyNftModal: React.FC = () => { - {t('Buy It Now')} + {t('Buy It Now')} ) diff --git a/src/views/Referral/components/Connected.tsx b/src/views/Referral/components/Connected.tsx index 5a4550f..e89a475 100644 --- a/src/views/Referral/components/Connected.tsx +++ b/src/views/Referral/components/Connected.tsx @@ -2,6 +2,8 @@ import React from 'react' import styled from 'styled-components' import { useTranslation } from 'contexts/Localization' import { Button, useModal, Text } from '@pancakeswap/uikit' +import { inviteReceive } from 'services/referral' +import { useReferralNormalConfigInfo, useReferralRewardInfo } from 'state/referral/hooks' import FlexCom from './FlexCom' import BuyNftModal from './BuyNftModal' import HeaderMain from './HeaderMain' @@ -13,6 +15,13 @@ const ButtonDiv = styled(Button)` border: 1px solid ${({ theme }) => theme.colors.textDisabled}; color: ${({ theme }) => theme.colors.textDisabled}; ` +const ButtonGet = styled(Button)` + width: 100%; + margin: 20px auto 0px auto; + border-radius: 50px; + border: 1px solid #1fc7d4; + color: #1fc7d4; +` const UpBtn = styled(Button)` width: 100%; @@ -41,17 +50,34 @@ const TextDiv = styled(Text)` const ConnectedCom: React.FC = () => { const { t } = useTranslation() const [onBuyModal] = useModal() - + const referralNormalConfigInfo = useReferralNormalConfigInfo() + console.log('referralNormalConfigInfo:', referralNormalConfigInfo) + const referralRewardInfo = useReferralRewardInfo() + console.log('referralRewardInfo:', referralRewardInfo) + const getInviteReceive = async () => { + await inviteReceive() + } return ( <> - - - + + + - {t('No income is received temporarily')} + {referralNormalConfigInfo.receiveLimit <= + referralRewardInfo.inviteReward - referralRewardInfo.inviteRewardReceive ? ( + + {t('Claim now')} + + ) : ( + {t('No income is received temporarily')} + )} + {t('Upgrade commander')} diff --git a/src/views/Referral/components/Regimental.tsx b/src/views/Referral/components/Regimental.tsx index dabd677..74d0493 100644 --- a/src/views/Referral/components/Regimental.tsx +++ b/src/views/Referral/components/Regimental.tsx @@ -1,6 +1,8 @@ import React from 'react' import styled from 'styled-components' import { useTranslation } from 'contexts/Localization' +import { inviteReceive } from 'services/referral' +import { useReferralCommanderConfigInfo, useReferralRewardInfo } from 'state/referral/hooks' import { Text, Image, Button } from '@pancakeswap/uikit' import FlexCom from './FlexCom' import HeaderMain from './HeaderMain' @@ -12,6 +14,13 @@ const ButtonDiv = styled(Button)` border: 1px solid ${({ theme }) => theme.colors.textDisabled}; color: ${({ theme }) => theme.colors.textDisabled}; ` +const ButtonGet = styled(Button)` + width: 100%; + margin: 20px auto 0px auto; + border-radius: 50px; + border: 1px solid #1fc7d4; + color: #1fc7d4; +` const UpBtn = styled(Button)` width: 100%; @@ -65,6 +74,12 @@ const LogoImage = styled.div` const RegimentalCom: React.FC = () => { const { t } = useTranslation() + const referralCommanderConfigInfo = useReferralCommanderConfigInfo() + console.log(referralCommanderConfigInfo) + const referralRewardInfo = useReferralRewardInfo() + const getInviteReceive = async () => { + await inviteReceive() + } return ( @@ -79,7 +94,7 @@ const RegimentalCom: React.FC = () => { name={t('HCC total revenue percentage :10%')} paddings="0 10px" leftColor="textSubtle" - value="100000.00(HCC)" + value={`${referralCommanderConfigInfo.dividendFirst}%`} /> { leftColor="textSubtle" value="100000.00(HCC)" /> - - + + - {t('No income is received temporarily')} - {/* {t('Upgrade commander')} */} + {referralCommanderConfigInfo.receiveLimit <= + referralRewardInfo.inviteReward - referralRewardInfo.inviteRewardReceive ? ( + + {t('Claim now')} + + ) : ( + {t('No income is received temporarily')} + )} + + {/* {t('Upgrade commander')} */} {t('each time')} diff --git a/src/views/Referral/index.tsx b/src/views/Referral/index.tsx index 911f214..0826bcb 100644 --- a/src/views/Referral/index.tsx +++ b/src/views/Referral/index.tsx @@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react' import styled from 'styled-components' import { fetchReferralInfoAsync } from 'state/actions' import { useAccount } from 'state/userInfo/hooks' -import { useReferralCommanderConfigInfo } from 'state/referral/hooks' +import { useReferralIsCommander } from 'state/referral/hooks' import { useDispatch } from 'react-redux' import UnunitedCom from './components/UnunitedCom' import ConnectedCom from './components/Connected' @@ -37,20 +37,30 @@ const ContentDiv = styled.div` ` const Nft: React.FC = () => { - // 邀请false普通邀请 true军团长邀请 - const [type, setType] = useState(false) const dispatch = useDispatch() const account = useAccount() - const referralConfigInfo = useReferralCommanderConfigInfo() - console.log(referralConfigInfo) + const referralIsCommander = useReferralIsCommander() + // const referralIsCommander = true useEffect(() => { dispatch(fetchReferralInfoAsync(account)) }, [account]) return ( - {type ? : {account ? : }} + {referralIsCommander ? ( + <> + {account ? ( + + ) : ( + + + + )} + + ) : ( + {account ? : } + )} ) }