-
- {section2Data.items?.map((item: { title: string; content: string }, index: number) => (
-
-
-
{item.title}
-
{item.content}
-
-
- ))}
+
+
+
+
+
+ {section2Data.items?.map((item: { title: string; content: string }, index: number) => (
+
+
+
{item.title}
+
{item.content}
+
+
+ ))}
+
)}
{section3Data && (
-
+
{section3Data.items?.map((item: { logo: string; title: string }, index: number) => (
-
-

-
{item.title}
-
+
+

+
{item.title}
+
))}
@@ -76,10 +84,10 @@ export default function InvestGroup() {
height="100vh"
>
-
-
{section4Data.title}
-
{section4Data.content}
-
+
+
{section4Data.title}
+
{section4Data.content}
+
diff --git a/src/pages/Business/RealtyGroup.tsx b/src/pages/Business/RealtyGroup.tsx
index b9d684d..abb29ff 100644
--- a/src/pages/Business/RealtyGroup.tsx
+++ b/src/pages/Business/RealtyGroup.tsx
@@ -18,9 +18,8 @@ export default function RealtyGroup() {
const section2Data = data.section2Data;
const section3Data = data.section3Data;
const section4Data = data.section4Data;
- const section5Data = data.section5Data;
- const topTabsData = section2Data ? { tabItems: section2Data.tabItems ?? [] } : null;
+ const topTabsData = section2Data
const rowAccordionData = section3Data
? {
@@ -46,7 +45,6 @@ export default function RealtyGroup() {
{topTabsData &&
}
{rowAccordionData &&
}
{section4Data &&
}
- {section5Data &&
}
);
}
diff --git a/src/pages/Business/RuijingGroup.tsx b/src/pages/Business/RuijingGroup.tsx
index 414e06f..959d9e7 100644
--- a/src/pages/Business/RuijingGroup.tsx
+++ b/src/pages/Business/RuijingGroup.tsx
@@ -21,15 +21,7 @@ export default function RuijingGroup() {
const section4Data = data.section4Data;
const swiperCardData = section2Data
- ? {
- title: section2Data.title,
- cardItems: section2Data.cardItems?.map((c: { title: string; content: string; backgroundImage?: string }) => ({
- title: c.title,
- content: c.content,
- backgroundImage: c.backgroundImage,
- })) ?? [],
- }
- : null;
+
return (
@@ -48,15 +40,17 @@ export default function RuijingGroup() {
title={section3Data.title}
subtitle={section3Data.subtitle}
titleColor="#fff"
- background="/images/bg-overview.png"
+ background={section3Data.backgroundImage}
maskBackground="rgba(2,17,48,0.5)"
>
-
- {section3Data.content}
-
- {section3Data.statsData && (
-
- )}
+
+
+ {section3Data.content}
+
+ {section3Data.statsData && (
+
+ )}
+
)}
diff --git a/src/pages/Home/Home.module.css b/src/pages/Home/Home.module.css
index 8c15082..ca0578d 100644
--- a/src/pages/Home/Home.module.css
+++ b/src/pages/Home/Home.module.css
@@ -311,8 +311,9 @@
.newsGrid {
gap: 1.25rem;
align-items: start;
- display: flex;
width: 72%;
+ display: grid;
+ grid-template-columns: 1fr 1fr;
margin: 0 auto;
}
diff --git a/src/pages/Join/Campus.tsx b/src/pages/Join/Campus.tsx
index bd0bce9..8c93226 100644
--- a/src/pages/Join/Campus.tsx
+++ b/src/pages/Join/Campus.tsx
@@ -110,7 +110,7 @@ export default function JoinCampus() {
/>
-
+
diff --git a/src/pages/Join/Culture.tsx b/src/pages/Join/Culture.tsx
index 0f48a6d..707062b 100644
--- a/src/pages/Join/Culture.tsx
+++ b/src/pages/Join/Culture.tsx
@@ -20,16 +20,16 @@ export default function Culture() {
title={banner?.title ?? ""}
content={(banner as BannerConfig)?.content}
titleSize={(banner as BannerConfig)?.titleSize ?? "large"}
- backgroundImage={banner?.backgroundImage ?? "/images/bg-overview.png"}
+ backgroundImage={banner?.backgroundImage ?? ""}
/>
{section1Data && (
-
+
{section1Data.items?.map((item: any, index: number) => (
-
+
{section2Data.items?.map((item: { title: string; content?: string; icon?: string }, index: number) => (
diff --git a/src/pages/News/Media.tsx b/src/pages/News/Media.tsx
index d7126f5..aeb7f95 100644
--- a/src/pages/News/Media.tsx
+++ b/src/pages/News/Media.tsx
@@ -20,11 +20,11 @@ export default function Media() {
title={banner?.title ?? ""}
content={(banner as BannerConfig)?.content}
titleSize={(banner as BannerConfig)?.titleSize ?? "large"}
- backgroundImage={banner?.backgroundImage ?? "/images/bg-overview.png"}
+ backgroundImage={banner?.backgroundImage ?? ""}
/>
-
-
+
+
{items.map((item: { title: string; content?: string }, index: number) => (
{item.title}
diff --git a/src/pages/Social/Foundation.tsx b/src/pages/Social/Foundation.tsx
index d5032fa..d45faf9 100644
--- a/src/pages/Social/Foundation.tsx
+++ b/src/pages/Social/Foundation.tsx
@@ -28,10 +28,11 @@ export default function Foundation() {
return newsList.filter((item: any) => item.lang.toLowerCase() === locale.split('-')[0]);
}, [newsList, locale])
const getNewsList = useCallback(() => {
- appApi.getNewsList({ page: 1, size: 1000, sort: "create_time DESC",
+ appApi.getNewsList({
+ page: 1, size: 1000, sort: "create_time DESC",
category_id: String(categoryList?.find((item: any) => item.name.includes('【银泰公益基金会】公益传播'))?.id ?? ''),
- }).then((res:any) => {
- setNewsList(res.data.items.map((item:any) => {
+ }).then((res: any) => {
+ setNewsList(res.data.items.map((item: any) => {
return {
id: item.id,
title: item.title,
@@ -54,11 +55,11 @@ export default function Foundation() {
const getFileList = useCallback(async () => {
const res = await appApi.getDocList({
- page: 1,
+ page: 1,
size: 1000,
// category_id: String(categoryList?.find((item: any) => item.name.includes('社会责任报告'))?.id ?? '')
})
- const items = res.data.items.filter((item:any) => item.category_name.includes("信息公开"))
+ const items = res.data.items.filter((item: any) => item.category_name.includes("信息公开"))
console.log("------items-----", items)
setFileList(items)
}, [])
@@ -85,10 +86,10 @@ export default function Foundation() {
{section2Data && (
-
+
{localNewsList?.map((item: any, index: number) => (
))}
+
-
)}
@@ -110,19 +111,19 @@ export default function Foundation() {
maskBackground="rgba(255,255,255,0.1)"
height="47.5rem"
>
-
+
{localFileList
- .filter((item:any) => item.category_name.includes(
- section3Data.tabItems?.[activeIndex]?.tabName ?? ''
- ))
- .map((item: any, index: number) => (
-
-
window.open(item.path, '_blank')}>
- {item.name}
-
-
- ))}
+ .filter((item: any) => item.category_name.includes(
+ section3Data.tabItems?.[activeIndex]?.tabName ?? ''
+ ))
+ .map((item: any, index: number) => (
+
+
window.open(item.path, '_blank')}>
+ {item.name}
+
+
+ ))}
-
+
{section4Data.items?.map((item: any, index: number) => (
-
-

-
+
+

+
))}
diff --git a/src/pages/Social/Sustainability.tsx b/src/pages/Social/Sustainability.tsx
index 452b0b5..e2b70f7 100644
--- a/src/pages/Social/Sustainability.tsx
+++ b/src/pages/Social/Sustainability.tsx
@@ -83,7 +83,7 @@ export default function Sustainability() {
}, [reportItems, locale])
const getReportList = useCallback(async () => {
const res = await appApi.getDocList({
- page,
+ page,
size,
category_id: String(categoryList?.find((item: any) => item.name.includes('社会责任报告'))?.id ?? '')
})
@@ -93,7 +93,7 @@ export default function Sustainability() {
const resItems: any[] = []
// 去重 id lang 相同
items.forEach((item: any) => {
- if(!resItems.some((i: any) => i.id === item.id && i.lang === item.lang)) {
+ if (!resItems.some((i: any) => i.id === item.id && i.lang === item.lang)) {
resItems.push(item)
}
})
@@ -121,29 +121,31 @@ export default function Sustainability() {
{section1Data && (
+
)}
-
{section3Data && (
-
- {section3Data.content}
-
-
- {localNewsItems?.map((item: any, index: number) => (
-
-
-
-
- ))}
+
+
+ {section3Data.content}
+
+
+ {localNewsItems?.map((item: any, index: number) => (
+
+
+
+
+ ))}
+
)}
@@ -154,6 +156,7 @@ export default function Sustainability() {
background=""
maskBackground="#F7FBFF"
>
+
{localReportItems?.map((item: any, index: number) => (
{
- if(localReportItems.length < total) {
+ if (localReportItems.length < total) {
setPage(page + 1)
} else {
setReportItems(prev => [...prev.slice(0, 8)])
@@ -186,6 +189,7 @@ export default function Sustainability() {
>
{localReportItems.length < total ? "了解更多" : "收起"}
+
)}