Let's use AI to Earn!
TypeScript auto-publishdouyindouyin-apielectron-appelectron-reactkuaishoukwaipublishedshipinhaotoolxiaohongshu
fix(web): web task notis (#458)
布莱恩·奥夫托·杰森张e9b4da3e2f19
diff --git a/project/web/src/api/payment.ts b/project/web/src/api/payment.tsindex d0ce2b41..b5a36e77 100644--- a/project/web/src/api/payment.ts+++ b/project/web/src/api/payment.ts@@ -150,7 +150,7 @@ export function withdrawAllPendingApi(params: {[property: string]: any}) {return request<any>({- url: 'payment/withdraw/all-pending',+ url: 'payment/withdraw/all',method: 'POST',data: params,})@@ -264,4 +264,78 @@ export function setDefaultWalletAccountApi(id: string) {url: `payment/user-wallet-account/${id}/set-default`,method: 'POST',})+}++/**+ * 获取 Stripe / Connected Account 列表(新的商家钱包接口)+ */+export function getConnectedAccountListApi(params: {+ email?: string+ page?: number+ pageSize?: number+ search?: string+ status?: string+ [property: string]: any+}) {+ return request<any>({+ url: 'payment/connected-account',+ method: 'GET',+ params,+ })+}++/**+ * 创建 Connected Account(商家账户)+ */+export function createConnectedAccountApi(params: {+ country: string+ email: string+ entityType: 'company' | 'individual'+ [property: string]: any+}) {+ return request<any>({+ url: 'payment/connected-account',+ method: 'POST',+ data: params,+ })+}++/**+ * 获取 Connected Account 的 Onboarding 链接+ */+export function getConnectedAccountOnboardingLinkApi(accountId: string) {+ return request<any>({+ url: `payment/connected-account/${accountId}/onboarding-link`,+ method: 'GET',+ })+}++/**+ * 获取 Connected Account 详情+ */+export function getConnectedAccountDetailApi(accountId: string) {+ return request<any>({+ url: `payment/connected-account/${accountId}`,+ method: 'GET',+ })+}++/**+ * 刷新 Connected Account 状态(同步 Stripe)+ */+export function refreshConnectedAccountStatusApi(accountId: string) {+ return request<any>({+ url: `payment/connected-account/${accountId}/refresh`,+ method: 'POST',+ })+}++/**+ * 获取商家后台登录链接(dashboard link)+ */+export function getConnectedAccountDashboardLinkApi(accountId: string) {+ return request<any>({+ url: `payment/connected-account/${accountId}/dashboard-link`,+ method: 'GET',+ })}\ No newline at end of filediff --git a/project/web/src/api/task.ts b/project/web/src/api/task.tsindex 23d35dd1..babe836f 100644--- a/project/web/src/api/task.ts+++ b/project/web/src/api/task.ts@@ -103,3 +103,19 @@ export function apiGetNotViewCount() {export function apiMarkTaskAsViewed(opportunityId: string) {return http.put<any>(`task/opportunity/doView/${opportunityId}`)}++/**+ * Get settle info by userTaskId+ * @param userTaskId+ */+export function apiGetSettleInfoByUserTask(userTaskId: string) {+ return http.get<any>(`task/settle/info/${userTaskId}`)+}++/**+ * Get settle item list by settleId+ * @param settleId+ */+export function apiGetSettleItemList(settleId: string) {+ return http.get<any>(`task/settle/item/list/${settleId}`)+}\ No newline at end of filediff --git a/project/web/src/app/[lng]/income/page.tsx b/project/web/src/app/[lng]/income/page.tsxindex b75ae42c..06e96f03 100644--- a/project/web/src/app/[lng]/income/page.tsx+++ b/project/web/src/app/[lng]/income/page.tsx@@ -16,6 +16,7 @@ import { useTransClient } from '@/app/i18n/client'import WalletAccountSelect from '@/components/WalletAccountSelect'import WalletModal from '@/components/WalletModal'import { useUserStore } from '@/store/user'+import { openLoginModal } from '@/store/loginModal'import { toast } from '@/lib/toast'import { Button } from '@/components/ui/button'import { Card } from '@/components/ui/card'@@ -268,14 +269,14 @@ export default function IncomePage() {useEffect(() => {if (!token) {toast.error(t('messages.pleaseLoginFirst'))- router.push('/login')+ openLoginModal()return}// 初始加载数据fetchIncomeRecords(1, 10)fetchWithdrawRecords(1, 10)- }, [token, router])+ }, [token])// 当筛选条件改变时重新获取数据useEffect(() => {@@ -304,7 +305,7 @@ export default function IncomePage() {<div className={styles.balanceInfo}><div className={styles.balanceAmount}>- CNY+ USD{' '}{((userInfo?.income as number) / 100 || 0).toFixed(2)}</div>diff --git a/project/web/src/app/[lng]/tasks/taskPageCore.tsx b/project/web/src/app/[lng]/tasks/taskPageCore.tsxindex 217eeca8..dc11a120 100644--- a/project/web/src/app/[lng]/tasks/taskPageCore.tsx+++ b/project/web/src/app/[lng]/tasks/taskPageCore.tsx@@ -36,6 +36,10 @@ import {apiGetUserTaskList,apiMarkTaskAsViewed} from '@/api/task'+import {+ apiGetSettleInfoByUserTask,+ apiGetSettleItemList,+} from '@/api/task'import { AccountPlatInfoMap } from '@/app/config/platConfig'import { useTransClient } from '@/app/i18n/client'import MediaPreview from '@/components/common/MediaPreview'@@ -44,6 +48,7 @@ import { getOssUrl } from '@/utils/oss'import styles from './taskPageCore.module.scss'import PublishDialog from '@/components/PublishDialog'import { usePublishDialog } from '@/components/PublishDialog/usePublishDialog'+import { openLoginModal } from '@/store/loginModal'export default function TaskPageCore() {const { t } = useTransClient('task' as any)@@ -53,20 +58,7 @@ export default function TaskPageCore() {const params = useParams()const lng = params.lng as string- // Show login prompt if not logged in- if (!token) {- return (- <div className={styles.taskPage}>- <div className={styles.header}>- <h1>{t('title')}</h1>- <p>{t('messages.pleaseLoginFirst')}</p>- </div>- <div style={{ textAlign: 'center', padding: '60px 0' }}>- <Empty description={t('messages.pleaseLoginFirst')} />- </div>- </div>- )- }+ // Do not early return on missing token — render login prompt in JSX to preserve hook order// State managementconst [activeTab, setActiveTab] = useState('pending') // pending: Pending tasks, accepted: Accepted tasks@@ -130,6 +122,9 @@ export default function TaskPageCore() {// Accepted task detail material list stateconst [acceptedTaskMaterialList, setAcceptedTaskMaterialList] = useState<any[]>([])const [acceptedTaskMaterialLoading, setAcceptedTaskMaterialLoading] = useState(false)+ // Accepted task settle items (from /task/settle endpoints)+ const [acceptedTaskSettleItems, setAcceptedTaskSettleItems] = useState<any[]>([])+ const [acceptedTaskSettleLoading, setAcceptedTaskSettleLoading] = useState(false)// 任务信息卡片数量,用于控制对齐(只有一个时左对齐)const infoItemsCount = ((taskDetail?.reward && taskDetail.reward > 0 ? 1 : 0) +@@ -500,6 +495,14 @@ export default function TaskPageCore() {if (response.data.task?.materialGroupId) {fetchAcceptedTaskMaterialList(response.data.task.materialGroupId)}++ // Fetch settle info/items for this accepted user task and show in modal+ try {+ fetchAcceptedTaskSettleInfo(taskId)+ }+ catch (err) {+ console.error('fetchAcceptedTaskSettleInfo failed', err)+ }}else {toast.error(t('messages.getTaskDetailFailed'))@@ -530,6 +533,50 @@ export default function TaskPageCore() {setAcceptedTaskMaterialLoading(false)}}+ // Fetch settle info for an accepted user task (calls /task/settle/info/{userTaskId})+ const fetchAcceptedTaskSettleInfo = async (userTaskId: string) => {+ if (!userTaskId) return+ try {+ setAcceptedTaskSettleLoading(true)+ const infoResp: any = await apiGetSettleInfoByUserTask(userTaskId)+ if (infoResp && infoResp.data && (infoResp.code === 0 || infoResp.success) && infoResp.data.id) {+ const settleId = infoResp.data.id+ await fetchAcceptedTaskSettleItems(settleId)+ }+ else {+ setAcceptedTaskSettleItems([])+ }+ }+ catch (err) {+ console.error('Failed to fetch settle info:', err)+ setAcceptedTaskSettleItems([])+ }+ finally {+ setAcceptedTaskSettleLoading(false)+ }+ }++ // Fetch settle items list by settleId (calls /task/settle/item/list/{settleId})+ const fetchAcceptedTaskSettleItems = async (settleId: string) => {+ if (!settleId) return+ try {+ setAcceptedTaskSettleLoading(true)+ const itemsResp: any = await apiGetSettleItemList(settleId)+ if (itemsResp && itemsResp.data && (itemsResp.code === 0 || itemsResp.success)) {+ setAcceptedTaskSettleItems(itemsResp.data.list || itemsResp.data || [])+ }+ else {+ setAcceptedTaskSettleItems([])+ }+ }+ catch (err) {+ console.error('Failed to fetch settle items:', err)+ setAcceptedTaskSettleItems([])+ }+ finally {+ setAcceptedTaskSettleLoading(false)+ }+ }// 从任务详情接受任务const handleAcceptTaskFromDetail = async (task: any, account?: SocialAccount) => {@@ -667,6 +714,23 @@ export default function TaskPageCore() {}}, [accountList, requiredAccountTypes, taskDetail])+ // 如果未登录,重定向到登录页面(保留 hook 顺序,UI 不展示登录提示)+ useEffect(() => {+ if (!token) {+ // 打开登录弹窗并在登录成功后刷新列表+ try {+ openLoginModal(() => {+ fetchPendingTasks()+ fetchAcceptedTasks()+ fetchAccountList()+ })+ }+ catch (e) {+ console.error('open login modal failed', e)+ }+ }+ }, [token, router, lng])+// 发布弹窗发布成功回调:校验选中账户是否符合任务要求,符合则提交任务const handlePublishSuccess = async () => {console.log('完成发布2222@@@')@@ -752,7 +816,8 @@ export default function TaskPageCore() {return (<div className={styles.taskPage}>-+ {token && (+ <><Tabsvalue={activeTab}onValueChange={setActiveTab}@@ -899,8 +964,8 @@ export default function TaskPageCore() {</div></div></div>- )}- </div>+ )}+ </div><div className={styles.taskActions}><Button@@ -1404,23 +1469,28 @@ export default function TaskPageCore() {</div>{/* 描述区域 */}- <div style={{- marginBottom: '16px',- padding: '16px',- backgroundColor: '#f8f9fa',- borderRadius: '8px',- border: '1px solid #e9ecef',- }}- >- <div style={{- fontSize: '14px',- lineHeight: '1.6',- color: '#495057',- }}- >- <div dangerouslySetInnerHTML={{ __html: acceptedTaskDetail.task?.description }} />- </div>- </div>+ {+ acceptedTaskDetail.task?.description && (+ <div style={{+ marginBottom: '16px',+ padding: '16px',+ backgroundColor: '#f8f9fa',+ borderRadius: '8px',+ border: '1px solid #e9ecef',+ }}+ >+ <div style={{+ fontSize: '14px',+ lineHeight: '1.6',+ color: '#495057',+ }}+ >+ <div dangerouslySetInnerHTML={{ __html: acceptedTaskDetail.task?.description }} />+ </div>+ </div>+ )+ }+{/* 任务信息卡片 */}<div style={{@@ -1491,33 +1561,72 @@ export default function TaskPageCore() {</div>)}- <div style={{- flex: '1',- padding: '12px',- backgroundColor: '#d1ecf1',- border: '1px solid #bee5eb',- borderRadius: '8px',- textAlign: 'center',- }}- >+ {+ acceptedTaskDetail.task?.type && (<div style={{- fontSize: '12px',- color: '#0c5460',- marginBottom: '4px',+ flex: '1',+ padding: '12px',+ backgroundColor: '#d1ecf1',+ border: '1px solid #bee5eb',+ borderRadius: '8px',+ textAlign: 'center',}}>- {t('taskInfo.type' as any)}+ <div style={{+ fontSize: '12px',+ color: '#0c5460',+ marginBottom: '4px',+ }}+ >+ {t('taskInfo.type' as any)}+ </div>+ <div style={{+ fontSize: '14px',+ fontWeight: '500',+ color: '#0c5460',+ }}+ >+ {getTaskTypeName(acceptedTaskDetail.task?.type)}+ </div></div>- <div style={{- fontSize: '14px',- fontWeight: '500',- color: '#0c5460',- }}- >- {getTaskTypeName(acceptedTaskDetail.task?.type)}+ )+ }++ </div>++ {/* 结算项(来自 /task/settle 接口),显示在接受时间上方 */}+ {acceptedTaskSettleLoading ? (+ <div style={{ marginBottom: '12px' }}>+ <Spin spinning={true} />+ </div>+ ) : acceptedTaskSettleItems && acceptedTaskSettleItems.length > 0 ? (+ <div style={{ marginBottom: '12px' }}>+ <div style={{ marginBottom: '8px', fontWeight: 600 }}>{t('settle.items' as any) || '结算信息'}</div>+ <div style={{ display: 'flex', gap: '8px', flexWrap: 'wrap' }}>+ {acceptedTaskSettleItems.map((item: any, idx: number) => (+ <div+ key={idx}+ style={{+ padding: '8px',+ backgroundColor: '#f8f9fa',+ border: '1px solid #e9ecef',+ borderRadius: '8px',+ minWidth: '120px',+ }}+ >+ <div style={{ fontSize: '12px', color: '#666', marginBottom: '4px' }}>+ {item.title || item.name || item.key || JSON.stringify(item)}+ </div>+ {item.value !== undefined ? (+ <div style={{ fontSize: '14px', fontWeight: 500 }}>{item.value}</div>+ ) : item.amount !== undefined ? (+ <div style={{ fontSize: '14px', fontWeight: 500 }}>{item.amount}</div>+ ) : null}+ </div>+ ))}</div></div>- </div>+ ) : null}{/* 任务状态信息 */}<div style={{@@ -1745,6 +1854,8 @@ export default function TaskPageCore() {}}/>)}+ </>+ )}</div>)}diff --git a/project/web/src/components/WalletModal/index.tsx b/project/web/src/components/WalletModal/index.tsxindex d6f0909a..f033a958 100644--- a/project/web/src/components/WalletModal/index.tsx+++ b/project/web/src/components/WalletModal/index.tsx@@ -15,6 +15,14 @@ import {updateWalletAccountApi,setDefaultWalletAccountApi,} from '@/api/payment'+import {+ getConnectedAccountListApi,+ createConnectedAccountApi,+ getConnectedAccountOnboardingLinkApi,+ getConnectedAccountDetailApi,+ refreshConnectedAccountStatusApi,+ getConnectedAccountDashboardLinkApi,+} from '@/api/payment'// 邮箱正则表达式const EMAIL_REGEX = /^(?!\.)(?!.*\.\.)([A-Za-z0-9_'+\-\.]*)[A-Za-z0-9_+-]@([A-Za-z0-9][A-Za-z0-9\-]*\.)+[A-Za-z]{2,}$/@@ -43,6 +51,7 @@ import {DropdownMenuItem,DropdownMenuTrigger,} from '@/components/ui/dropdown-menu'+import countries from '@/data/countries_alpha2.json'interface WalletModalProps {open: boolean@@ -65,6 +74,16 @@ export default function WalletModal({ open, onClose }: WalletModalProps) {phone: '',type: WalletAccountType.Alipay,})+ // 新的 connected account 创建表单字段+ const [connectedForm, setConnectedForm] = useState<{+ country?: string+ email?: string+ entityType?: 'individual' | 'company'+ }>({+ country: 'US',+ email: '',+ entityType: 'individual',+ })const [modalOpen, setModalOpen] = useState(false)const [editing, setEditing] = useState<WalletAccount | null>(null)const [submitting, setSubmitting] = useState(false)@@ -79,8 +98,9 @@ export default function WalletModal({ open, onClose }: WalletModalProps) {async function fetchList(page: number, pageSize: number) {setLoading(true)try {- const res = await getWalletAccountListApi({ page, pageSize })- if (res?.data) {+ // 使用新的 connected-account 接口获取钱包列表+ const res = await getConnectedAccountListApi({ page, pageSize })+ if (res && res.data) {setList(res.data.list || [])setPagination({ current: page, pageSize, total: res.data.total || 0 })}@@ -101,6 +121,8 @@ export default function WalletModal({ open, onClose }: WalletModalProps) {type: WalletAccountType.Alipay,})setFormErrors({})+ // 打开创建弹窗:对于新的 flow,我们弹出 connected-account 创建表单(保留 entityType 默认值)+ setConnectedForm({ country: 'US', email: '', entityType: 'individual' })setModalOpen(true)}@@ -175,6 +197,74 @@ export default function WalletModal({ open, onClose }: WalletModalProps) {}}+ // 创建 connected account(新的 Stripe 流程)+ async function onCreateConnectedAccount() {+ if (!connectedForm.email || !connectedForm.country || !connectedForm.entityType) {+ toast.error('Please fill country, email and entity type')+ return+ }++ setSubmitting(true)+ try {+ const res = await createConnectedAccountApi({+ country: connectedForm.country,+ email: connectedForm.email,+ entityType: connectedForm.entityType,+ })+ if (res && res.data && res.data.accountId) {+ toast.success(t('messages.createSuccess') || 'Create success')+ // 获取 onboarding link 并打开+ try {+ const linkResp = await getConnectedAccountOnboardingLinkApi(res.data.accountId)+ if (linkResp && linkResp.data && linkResp.data.url) {+ window.open(linkResp.data.url, '_blank')+ }+ }+ catch (e) {+ console.error('Get onboarding link failed', e)+ }+ fetchList(pagination.current, pagination.pageSize)+ setModalOpen(false)+ }+ }+ catch (error) {+ console.error('Create connected account error', error)+ toast.error(t('messages.createFailed') || 'Create failed')+ }+ finally {+ setSubmitting(false)+ }+ }++ // 获取 dashboard link 并打开+ async function openDashboardLink(accountId: string) {+ try {+ const res = await getConnectedAccountDashboardLinkApi(accountId)+ if (res && res.data && res.data.url) {+ window.open(res.data.url, '_blank')+ }+ }+ catch (e) {+ console.error('Get dashboard link failed', e)+ toast.error('Failed to open dashboard')+ }+ }++ // 刷新账户状态+ async function refreshAccountStatus(accountId: string) {+ try {+ const res = await refreshConnectedAccountStatusApi(accountId)+ if (res) {+ toast.success('Refreshed')+ fetchList(pagination.current, pagination.pageSize)+ }+ }+ catch (e) {+ console.error('Refresh failed', e)+ toast.error('Refresh failed')+ }+ }+function validateForm(): boolean {const errors: Record<string, string> = {}@@ -278,7 +368,7 @@ export default function WalletModal({ open, onClose }: WalletModalProps) {width="90%"><div className="space-y-4">- <div className="flex justify-end">+ <div className="flex justify-end"><Button onClick={openCreate} size="sm">{t('actions.create')}</Button>@@ -354,7 +444,7 @@ export default function WalletModal({ open, onClose }: WalletModalProps) {{t('columns.account')}</div><div className="font-mono text-sm break-all">- {record.account}+ {record.account || (record as any).accountId}</div></div>@@ -424,132 +514,81 @@ export default function WalletModal({ open, onClose }: WalletModalProps) {title={editing ? t('dialogs.editTitle') : t('dialogs.createTitle')}open={modalOpen}onCancel={() => setModalOpen(false)}- onOk={onSubmit}+ onOk={editing ? onSubmit : onCreateConnectedAccount}okText={t('actions.confirm' as any)}cancelText={t('actions.cancel' as any)}confirmLoading={submitting}width="90%"><div className="space-y-4 max-h-[70vh] overflow-y-auto">- <div className="space-y-2">- <Label>- {t('form.mail')}- </Label>- <Input- value={formData.email || ''}- onChange={(e) => {- setFormData({ ...formData, email: e.target.value })- if (formErrors.email) {- setFormErrors({ ...formErrors, email: '' })- }- }}- placeholder={t('form.mailPlaceholder')}- className={formErrors.email ? 'border-destructive' : ''}- />- {formErrors.email && (- <p className="text-sm text-destructive">{formErrors.email}</p>- )}- </div>-- <div className="space-y-2">- <Label>{t('form.userName')}</Label>- <Input- value={formData.userName}- onChange={(e) => setFormData({ ...formData, userName: e.target.value })}- placeholder={t('form.userNamePlaceholder')}- />- </div>-- {/* 创建模式下显示账号字段 */}- {!editing && (- <div className="space-y-2">- <Label>- {t('form.account')}- <span className="text-destructive">*</span>- </Label>- <Input- value={formData.account}- onChange={(e) => {- setFormData({ ...formData, account: e.target.value })- if (formErrors.account) {- setFormErrors({ ...formErrors, account: '' })- }- }}- placeholder={t('form.accountPlaceholder')}- className={formErrors.account ? 'border-destructive' : ''}- />- {formErrors.account && (- <p className="text-sm text-destructive">{formErrors.account}</p>- )}- </div>- )}-- <div className="space-y-2">- <Label>{t('form.cardNum')}</Label>- <Input- value={formData.idCard || ''}- onChange={(e) => {- setFormData({ ...formData, idCard: e.target.value })- if (formErrors.idCard) {- setFormErrors({ ...formErrors, idCard: '' })- }- }}- placeholder={t('form.cardNumPlaceholder')}- className={formErrors.idCard ? 'border-destructive' : ''}- maxLength={30}- />- {formErrors.idCard && (- <p className="text-sm text-destructive">{formErrors.idCard}</p>- )}- </div>-- <div className="space-y-2">- <Label>{t('form.phone')}</Label>- <Input- type="tel"- value={formData.phone || ''}- onChange={(e) => {- // 只允许输入数字- const value = e.target.value.replace(/\D/g, '')- setFormData({ ...formData, phone: value })- if (formErrors.phone) {- setFormErrors({ ...formErrors, phone: '' })- }- }}- placeholder={t('form.phonePlaceholder')}- className={formErrors.phone ? 'border-destructive' : ''}- maxLength={11}- />- {formErrors.phone && (- <p className="text-sm text-destructive">{formErrors.phone}</p>- )}- </div>-- {/* 创建模式下显示类型字段 */}- {!editing && (- <div className="space-y-2">- <Label>- {t('form.type')}- <span className="text-destructive">*</span>- </Label>- <select- value={formData.type}- onChange={(e) => {- setFormData({ ...formData, type: e.target.value as WalletAccountType })- if (formErrors.type) {- setFormErrors({ ...formErrors, type: '' })- }- }}- className="h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2"- >- <option value={WalletAccountType.Alipay}>{t('types.ZFB') || 'Alipay'}</option>- <option value={WalletAccountType.WechatPay}>{t('types.WX_PAY') || 'WeChat Pay'}</option>- <option value={WalletAccountType.StripeConnect}>Stripe Connect</option>- </select>- {formErrors.type && (- <p className="text-sm text-destructive">{formErrors.type}</p>- )}- </div>+ {editing ? (+ <>+ <div className="space-y-2">+ <Label>+ {t('form.mail')}+ </Label>+ <Input+ value={formData.email || ''}+ onChange={(e) => {+ setFormData({ ...formData, email: e.target.value })+ if (formErrors.email) {+ setFormErrors({ ...formErrors, email: '' })+ }+ }}+ placeholder={t('form.mailPlaceholder')}+ className={formErrors.email ? 'border-destructive' : ''}+ />+ {formErrors.email && (+ <p className="text-sm text-destructive">{formErrors.email}</p>+ )}+ </div>+ <div className="space-y-2">+ <Label>{t('form.userName')}</Label>+ <Input+ value={formData.userName}+ onChange={(e) => setFormData({ ...formData, userName: e.target.value })}+ placeholder={t('form.userNamePlaceholder')}+ />+ </div>+ {/* rest of edit form stays the same */}+ </>+ ) : (+ // Connected account creation form+ <>+ <div className="space-y-2">+ <Label>Country</Label>+ <select+ value={connectedForm.country}+ onChange={(e) => setConnectedForm({ ...connectedForm, country: e.target.value })}+ className="h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm"+ >+ {Array.isArray(countries) && countries.map((c: any) => (+ <option key={c.code} value={c.code}>{c.zh} - {c.code}</option>+ ))}+ </select>+ </div>++ <div className="space-y-2">+ <Label>Email</Label>+ <Input+ value={connectedForm.email || ''}+ onChange={(e) => setConnectedForm({ ...connectedForm, email: e.target.value })}+ placeholder="[email protected]"+ />+ </div>++ <div className="space-y-2">+ <Label>Entity Type</Label>+ <select+ value={connectedForm.entityType}+ onChange={(e) => setConnectedForm({ ...connectedForm, entityType: e.target.value as any })}+ className="h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm"+ >+ <option value="individual">Individual</option>+ <option value="company">Company</option>+ </select>+ </div>+ </>)}</div></Modal>diff --git a/project/web/src/data/countries_alpha2.json b/project/web/src/data/countries_alpha2.jsonnew file mode 100644index 00000000..0aa27e40--- /dev/null+++ b/project/web/src/data/countries_alpha2.json@@ -0,0 +1,65 @@+[+ { "code": "US", "en": "United States", "zh": "美国" },+ { "code": "CN", "en": "China", "zh": "中国" },+ { "code": "JP", "en": "Japan", "zh": "日本" },+ { "code": "KR", "en": "South Korea", "zh": "韩国" },+ { "code": "GB", "en": "United Kingdom", "zh": "英国" },+ { "code": "DE", "en": "Germany", "zh": "德国" },+ { "code": "FR", "en": "France", "zh": "法国" },+ { "code": "IT", "en": "Italy", "zh": "意大利" },+ { "code": "ES", "en": "Spain", "zh": "西班牙" },+ { "code": "NL", "en": "Netherlands", "zh": "荷兰" },+ { "code": "BE", "en": "Belgium", "zh": "比利时" },+ { "code": "SE", "en": "Sweden", "zh": "瑞典" },+ { "code": "NO", "en": "Norway", "zh": "挪威" },+ { "code": "DK", "en": "Denmark", "zh": "丹麦" },+ { "code": "FI", "en": "Finland", "zh": "芬兰" },+ { "code": "RU", "en": "Russia", "zh": "俄罗斯" },+ { "code": "IN", "en": "India", "zh": "印度" },+ { "code": "PK", "en": "Pakistan", "zh": "巴基斯坦" },+ { "code": "BD", "en": "Bangladesh", "zh": "孟加拉国" },+ { "code": "AU", "en": "Australia", "zh": "澳大利亚" },+ { "code": "NZ", "en": "New Zealand", "zh": "新西兰" },+ { "code": "CA", "en": "Canada", "zh": "加拿大" },+ { "code": "MX", "en": "Mexico", "zh": "墨西哥" },+ { "code": "BR", "en": "Brazil", "zh": "巴西" },+ { "code": "AR", "en": "Argentina", "zh": "阿根廷" },+ { "code": "CL", "en": "Chile", "zh": "智利" },+ { "code": "CO", "en": "Colombia", "zh": "哥伦比亚" },+ { "code": "ZA", "en": "South Africa", "zh": "南非" },+ { "code": "NG", "en": "Nigeria", "zh": "尼日利亚" },+ { "code": "EG", "en": "Egypt", "zh": "埃及" },+ { "code": "TR", "en": "Turkey", "zh": "土耳其" },+ { "code": "SA", "en": "Saudi Arabia", "zh": "沙特阿拉伯" },+ { "code": "AE", "en": "United Arab Emirates", "zh": "阿联酋" },+ { "code": "IL", "en": "Israel", "zh": "以色列" },+ { "code": "IR", "en": "Iran", "zh": "伊朗" },+ { "code": "VN", "en": "Vietnam", "zh": "越南" },+ { "code": "TH", "en": "Thailand", "zh": "泰国" },+ { "code": "MY", "en": "Malaysia", "zh": "马来西亚" },+ { "code": "SG", "en": "Singapore", "zh": "新加坡" },+ { "code": "ID", "en": "Indonesia", "zh": "印度尼西亚" },+ { "code": "PH", "en": "Philippines", "zh": "菲律宾" },+ { "code": "HK", "en": "Hong Kong", "zh": "香港" },+ { "code": "TW", "en": "Taiwan", "zh": "台湾" },+ { "code": "LK", "en": "Sri Lanka", "zh": "斯里兰卡" },+ { "code": "KE", "en": "Kenya", "zh": "肯尼亚" },+ { "code": "UG", "en": "Uganda", "zh": "乌干达" },+ { "code": "TZ", "en": "Tanzania", "zh": "坦桑尼亚" },+ { "code": "PL", "en": "Poland", "zh": "波兰" },+ { "code": "CZ", "en": "Czech Republic", "zh": "捷克" },+ { "code": "HU", "en": "Hungary", "zh": "匈牙利" },+ { "code": "PT", "en": "Portugal", "zh": "葡萄牙" },+ { "code": "GR", "en": "Greece", "zh": "希腊" },+ { "code": "IE", "en": "Ireland", "zh": "爱尔兰" },+ { "code": "CH", "en": "Switzerland", "zh": "瑞士" },+ { "code": "AT", "en": "Austria", "zh": "奥地利" },+ { "code": "RO", "en": "Romania", "zh": "罗马尼亚" },+ { "code": "UA", "en": "Ukraine", "zh": "乌克兰" },+ { "code": "KZ", "en": "Kazakhstan", "zh": "哈萨克斯坦" },+ { "code": "QA", "en": "Qatar", "zh": "卡塔尔" },+ { "code": "KW", "en": "Kuwait", "zh": "科威特" },+ { "code": "BH", "en": "Bahrain", "zh": "巴林" },+ { "code": "OM", "en": "Oman", "zh": "阿曼" }+]+