Skip to content

Commit

Permalink
Merge branch 'feat/0418' into canary
Browse files Browse the repository at this point in the history
  • Loading branch information
longbridgeyueyue committed Jun 20, 2024
2 parents 58d402b + 632f946 commit 9a8acd7
Show file tree
Hide file tree
Showing 14 changed files with 630 additions and 33 deletions.
8 changes: 8 additions & 0 deletions components/dot-list/index.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,13 @@
}
@screen lg {
grid-template-columns: repeat(var(--cols-lg, 1), minmax(0, 1fr));
&.lg-with-flex {
@apply flex gap-0;
.list-item {
.content {
@apply w-auto;
}
}
}
}
}
5 changes: 3 additions & 2 deletions components/dot-list/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ export interface IDotListProps {
sm?: number
xs?: number
}
dot?: ReactNode
}
export default function DotList({ list, className, cols }: IDotListProps) {
export default function DotList({ list, className, cols, dot }: IDotListProps) {
return (
<ul
className={classNames(className, 'text-base', styles['dot-list'])}
Expand All @@ -25,7 +26,7 @@ export default function DotList({ list, className, cols }: IDotListProps) {
>
{list.map((subItem, subIndex) => (
<li className="list-item" key={subIndex}>
<span className="dot"></span>
{dot || <span className="dot"></span>}
<span className="content">{subItem}</span>
</li>
))}
Expand Down
9 changes: 6 additions & 3 deletions features/header/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ function useNavs() {
const [reports] = useReports()

const i18n = useTranslation('common')
const seoI18n = useTranslation('seo')
return useMemo(() => {
return [
{
Expand Down Expand Up @@ -74,7 +73,7 @@ function useNavs() {
},
{
value: '/account',
label: i18n.t('features_header_index_891125'),
label: i18n.t('pages_virtual_assets40'),
},
],
},
Expand All @@ -96,7 +95,11 @@ function useNavs() {
},
{
value: '/solutions/us-stock',
label: seoI18n.t('us-stock.title'),
label: i18n.t('pages_us_stock80'),
},
{
value: '/solutions/wealth-management',
label: i18n.t('pages_wm0_2'),
},
// {
// value: '/solutions/brokerages',
Expand Down
2 changes: 1 addition & 1 deletion features/product/Advantage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export const HorizontalAdvantage: FC<IAdvantageProps> = ({ data }) => {
<img className="w-12 h-12 mr-5" src={item.icon} alt="" />
<div className="flex-1">
<div className="text-xl font-semibold text-text_color_1 mb-3">{item.title}</div>
<div className="space-y-4 md:flex md:space-x-10 md:space-y-0">
<div className="space-y-4 md:flex md:space-x-10 md:space-y-0 en:block en:md:space-y-4 en:space-x-0">
{item.list.map((text, index) => {
return (
<div key={index} className="flex">
Expand Down
14 changes: 1 addition & 13 deletions features/solutions/brokerages.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@ export const BrokeragesTabs = () => {
<div className={styles['tabs-wrapper']}>
<Tabs
items={tabs.map(tab => {
const titleParagraphs = tab.title.split('<br />')

return {
label: tab.tabTitle,
key: tab.key,
Expand All @@ -78,17 +76,7 @@ export const BrokeragesTabs = () => {
<div className="flex-1">
<div className="text-xl text-brand_color mb-2">{tab.label}</div>
<div className="text-2xl lg:text-3xl xl:text-4xl font-semibold mb-8">
<div className="hidden lg:block">
{titleParagraphs.map((item, index) => {
return (
<>
{item}
{index !== titleParagraphs.length - 1 && <br />}
</>
)
})}
</div>
<div className="lg:hidden">{tab.title.replaceAll('<br />', '')}</div>
<div className="whitespace-pre-line">{tab.title}</div>
</div>
<div>
<DotList list={tab.features} />
Expand Down
2 changes: 1 addition & 1 deletion features/solutions/combine.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export const ProductsTable = ({ products: propsProducts, className }: IProductsT
const i18n = useTranslation('common')
const products = propsProducts || [
{
label: i18n.t('whale-delivery-system-028'),
label: i18n.t('footer_table_1'),
list: [
{
title: i18n.t('pages_virtual_assets34'),
Expand Down
23 changes: 23 additions & 0 deletions features/solutions/wealth-management.module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
:local(.tabs-wrapper) {
.ant-tabs {
.ant-tabs-tab {
@apply text-base font-medium text-text_color_2 pt-0;

&.ant-tabs-tab-active {
.ant-tabs-tab-btn {
@apply text-text-color-1;
}
}
}
.ant-tabs-ink-bar {
@apply bg-brand_color scale-x-75;
}
.ant-tabs-nav {
@apply mb-10;
}

.ant-tabs-nav-more {
@apply hidden;
}
}
}
131 changes: 131 additions & 0 deletions features/solutions/wealth-management.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
import { Tabs } from 'antd'
import styles from './wealth-management.module.scss'
import DotList from '@/components/dot-list'
import { useTranslation } from 'react-i18next'

const tabImg = [
{
'en': 'https://assets.lbkrs.com/uploads/be84ff7b-7d9d-4d25-8c8c-216b949a0b88/user_c_en.png',
'zh-CN': 'https://assets.lbkrs.com/uploads/48737a97-32bd-4a99-83a3-065b93caa1fa/user_c_cn.png',
'zh-HK': 'https://assets.lbkrs.com/uploads/1cfe3fb0-c17e-41f5-a5e1-526c2df85b52/user_c_hk.png',
},
{
'en': 'https://assets.lbkrs.com/uploads/62056ed9-ab9d-4b66-ba6f-290627f3afec/tab_2_en.png',
'zh-CN': 'https://assets.lbkrs.com/uploads/96871090-485d-447a-8c0a-ba4b5d6002c1/tab_2_cn.png',
'zh-HK': 'https://assets.lbkrs.com/uploads/a60e12c7-61fb-4e64-8a63-30da8929a425/tab_2_hk.png',
},
{
'en': 'https://assets.lbkrs.com/uploads/cd6cbe66-d21f-4bae-a847-1a34fadbc52e/tab3_en.png',
'zh-CN': 'https://assets.lbkrs.com/uploads/f85896d6-a158-4d98-be36-3f35bf903ffa/tab3_cn.png',
'zh-HK': 'https://assets.lbkrs.com/uploads/140b936e-d5fa-4838-8862-384d07ccb6ca/tab3_hk.png',
},
{
'en': 'https://assets.lbkrs.com/uploads/0487d579-09e7-41b9-bc17-5831d992f399/tab4_en.png',
'zh-CN': 'https://assets.lbkrs.com/uploads/d35734da-3914-4db1-9c21-67090313bd14/tab4_cn.png',
'zh-HK': 'https://assets.lbkrs.com/uploads/f6954967-ae9f-4cd9-bd73-e65989d5ddba/tab4_hk.png',
},
{
'en': 'https://assets.lbkrs.com/uploads/f43bb647-9414-43e5-9f70-7fd60b06a8e2/tab5_en.png',
'zh-CN': 'https://assets.lbkrs.com/uploads/ab5a6810-dcdc-41ec-bd9f-7ae703a7f008/tab5_cn.png',
'zh-HK': 'https://assets.lbkrs.com/uploads/9dd6659c-033e-4061-a407-838e4764b0b3/tab5_hk.png',
},
{
'en': '',
'zh-CN': '',
'zh-HK': '',
},
] as any[]

export const WealthManagementTabs = () => {
const i18n = useTranslation('common')

const tabs = [
{
tabTitle: i18n.t('pages_wm49'),
title: i18n.t('pages_wm49'),
desc: i18n.t('pages_wm50'),
features: [
i18n.t('pages_wm51'),
i18n.t('pages_wm52'),
i18n.t('pages_wm53'),
i18n.t('pages_wm54'),
i18n.t('pages_wm55'),
],
},
{
tabTitle: i18n.t('pages_wm56'),
title: i18n.t('pages_wm56'),
desc: i18n.t('pages_wm57'),
features: [i18n.t('pages_wm58'), i18n.t('pages_wm59'), i18n.t('pages_wm60'), i18n.t('pages_wm53')],
},
{
tabTitle: i18n.t('pages_wm62'),
title: i18n.t('pages_wm62'),
desc: i18n.t('pages_wm63'),
features: [i18n.t('pages_wm64'), i18n.t('pages_wm65'), i18n.t('pages_wm66'), i18n.t('pages_wm67')],
},
{
tabTitle: i18n.t('pages_wm68'),
title: i18n.t('pages_wm68'),
desc: i18n.t('pages_wm69'),
features: [
i18n.t('pages_wm70'),
i18n.t('pages_wm71'),
i18n.t('pages_wm72'),
i18n.t('pages_wm73'),
i18n.t('pages_wm74'),
],
},
{
tabTitle: i18n.t('pages_wm75'),
title: i18n.t('pages_wm75'),
desc: i18n.t('pages_wm76'),
features: [
<>
<span className="font-medium">{i18n.t('pages_wm77')} </span>
{i18n.t('pages_wm78')}
</>,
],
},
{
tabTitle: i18n.t('pages_wm79'),
title: i18n.t('pages_wm79'),
},
]
return (
<div className={styles['tabs-wrapper']}>
<Tabs
items={tabs.map((tab, index) => {
return {
label: tab.tabTitle,
key: tab.title,
children: (
<div className="md:flex justify-between items-center">
{tab.features && (
<div className="flex-1">
<div className="text-2xl lg:text-3xl xl:text-4xl font-semibold mb-8">
<div className="whitespace-pre-line">{tab.title}</div>
</div>
<div>
{tab.features.length === 1 ? (
<div className="text-base">{tab.features}</div>
) : (
<DotList list={tab.features} />
)}
</div>
</div>
)}
<div className="flex-1 mt-10 md:mt-0 md:ml-20 xl:ml-[140px]">
<img
alt={tab.title}
src={typeof tabImg[index] === 'string' ? tabImg[index] : tabImg[index][i18n.i18n.language as never]}
/>
</div>
</div>
),
}
})}
></Tabs>
</div>
)
}
2 changes: 1 addition & 1 deletion pages/[locale]/solutions/virtual-assets.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ const VirtualAssets = () => {
<Box className="lg:py-20">
<>
<Title
label={i18n.t('pages_locale_solutions_virtual_assets_891133')}
label={i18n.t('pages_locale_solutions_virtual_assets_23')}
title={i18n.t('pages_virtual_assets39')}
></Title>
<TextPictureSecondary
Expand Down
Loading

0 comments on commit 9a8acd7

Please sign in to comment.