zhangshu
/
hiCity-nft
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

合并冲突

This commit is contained in:
myf 2022-05-09 17:42:51 +08:00
parent a6d55098d6
commit 7326594b79
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/locales/zh-CN.json
View File

@ -1127,9 +1127,6 @@
"capital pool": "资金池", "capital pool": "资金池",
"Unclaimed income": "待领取收益", "Unclaimed income": "待领取收益",
"pledge": "质押", "pledge": "质押",
<<<<<<< HEAD "Invite": "邀请",
"top": "置顶" "top": "置顶"
=======
"Invite": "邀请"
>>>>>>> dev
} }

29
src/views/Board/components/BoardCard/BoardCard.tsx
View File

@ -85,6 +85,9 @@ const CardDiv = styled.div`
flex-direction: column; flex-direction: column;
justify-content: space-around; justify-content: space-around;
` `
const ContentDiv = styled.div`
padding: 0 20px;
`
interface NodeCardProps { interface NodeCardProps {
board: any board: any
@ -123,18 +126,20 @@ const BoardCard: React.FC<NodeCardProps> = ({ board, account }) => {
return ( return (
<FCard> <FCard>
<CardHeading name={t(board.name)} img={board.img} tokenSymbol={board.tokenSymbol} /> <CardHeading name={t(board.name)} img={board.img} tokenSymbol={board.tokenSymbol} />
{account && ( <ContentDiv>
<div> {account && (
<FlexText name={t('HCC Currency amount')} value={board.userData?.amount} /> <div>
{board.userData?.name === 'Board' ? ( <FlexText name={t('HCC Currency amount')} value={board.userData?.amount} />
<FlexText name={t('Lock up time')} value={board.userData?.unlockTime} /> {board.userData?.name === 'Board' ? (
) : ( <FlexText name={t('Lock up time')} value={board.userData?.unlockTime} />
'' ) : (
)} ''
<FlexText name={t('possess LP')} value={board.userData?.rewardDebt} /> )}
</div> <FlexText name={t('possess LP')} value={board.userData?.rewardDebt} />
)} </div>
<CardActionsContainer board={board} account={account} /> )}
<CardActionsContainer board={board} account={account} />
</ContentDiv>
{/* <Divider /> {/* <Divider />
<ExpandableSectionButton <ExpandableSectionButton
onClick={() => setShowExpandableSection(!showExpandableSection)} onClick={() => setShowExpandableSection(!showExpandableSection)}