Skip to content

加入会员类型信息和加入时间信息 #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 10, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 20 additions & 6 deletions source/data/members-china.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,36 +3,50 @@
"name": "三六零科技集团有限公司",
"logo": "https://p3.ssl.qhimg.com/t011e94f0b9ed8e66b0.png",
"link": "https://www.360.cn/",
"representatives": ["李智杰", "王先坤"]
"membership": "Associate",
"startDate": "2019-06",
"gaRep": "李智杰",
"gaAlt": "王先坤"
},
{
"name": "阿里巴巴(中国)有限公司",
"logo": "https://docs.alibabagroup.com/assets2/images/cn/global/logo_header.png",
"link": "https://www.alibabagroup.com/",
"representatives": ["郑叶飞"]
"membership": "Associate",
"startDate": "2019-12",
"gaRep": "郑叶飞"
},
{
"name": "腾讯",
"logo": "https://www.tencent.com/img/index/tencent_logo.png",
"link": "https://www.tencent.com/",
"representatives": ["郑苏波"]
"membership": "Associate",
"startDate": "2020-06",
"gaRep": "郑苏波"
},
{
"name": "华为技术有限公司",
"logo": "https://www-file.huawei.com/-/media/corporate/images/home/logo/huawei_logo.png",
"link": "https://www.huawei.com/",
"representatives": ["侯凡", "王亚举"]
"membership": "Associate",
"startDate": "2019-12",
"gaRep": "侯凡",
"gaAlt": "王亚举"
},
{
"name": "Sujitech",
"logo": "https://www.ecma-international.org/wp-content/uploads/Sujitech-logo.gif",
"link": "https://sujitech.com/",
"representatives": ["刘怿斯"]
"membership": "SPC",
"startDate": "2019-12",
"gaRep": "刘怿斯"
},
{
"name": "北京字节跳动网络技术有限公司",
"logo": "https://www.ecma-international.org/wp-content/uploads/beijing_bytedance-logo.gif",
"link": "https://www.bytedance.com/",
"representatives": ["张荣剑"]
"membership": "Associate",
"startDate": "2021-06",
"gaRep": "张荣剑"
}
]
8 changes: 5 additions & 3 deletions source/page/Organization.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
import { createCell, Fragment } from 'web-cell';
import { Image } from 'boot-cell/source/Media/Image';
import { Card, CardFooter } from 'boot-cell/source/Content/Card';
import { formatDate } from 'web-utility/source/date';

import organizations from '../data/members-china.json';

export function OrganizationPage() {
return (
<>
<h1 className="my-5 text-center">TC39 中国会员单位</h1>
<h1 className="my-5 text-center">Ecma国际 中国会员单位</h1>

<ul className="list-unstyled row">
{organizations.map(({ logo, link, name, representatives }) => (
{organizations.map(({ logo, link, name, gaRep, gaAlt, membership, startDate }) => (
<li className="col-12 col-sm-6 col-md-3 px-2 my-2 d-flex">
<Card
className="shadow-sm flex-fill"
Expand All @@ -36,7 +37,8 @@ export function OrganizationPage() {
}
>
<CardFooter className="small">
ECMA 大会代表:{representatives.join('、')}
<div>自{formatDate(startDate, 'YYYY年M月')}成为{membership}会员</div>
<div>会员大会代表:{gaRep}{gaAlt && `、${gaAlt}`}</div>
</CardFooter>
</Card>
</li>
Expand Down