diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index 0c6cef2..485b7a8 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -176,14 +176,15 @@ export default { 'identity.realname': 'Real Name', 'identity.nationality': 'Nationality', 'identity.idtype': 'ID Type', - 'identity.idcode': 'ID Code', + 'identity.idNo': 'ID Number', 'identity.idphoto': 'ID Photo', 'identity.idtypes': {idcard:'id card', passport:'passport'}, 'identity.chooseIdtype': 'Type of id cards', + 'identity.chooseNation': 'Choose Nation', 'identity.kyc1btn': 'Submit', 'identity.kyc1btn2': 'Go to 2nd level of KYC', 'identity.kyc2btc': 'Submit', - + 'system.title': 'Settings', 'system.language': 'Language', 'system.currency': 'Currency', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 6992e38..c895811 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -176,10 +176,11 @@ export default { 'identity.realname': '实名', 'identity.nationality': '国籍', 'identity.idtype': '证件类型', - 'identity.idcode': '证件编号', + 'identity.idNo': '证件编号', 'identity.idphoto': '证件照片', 'identity.idtypes': {idcard:'身份证', passport:'护照'}, 'identity.chooseIdtype': '选择证件类型', + 'identity.chooseNation': '选择国籍', 'identity.kyc1btn': '提交', 'identity.kyc1btn2': '进入二级实名认证', 'identity.kyc2btn': '提交', diff --git a/src/pages/identity/index.tsx b/src/pages/identity/index.tsx index 03aabfa..6fd4190 100644 --- a/src/pages/identity/index.tsx +++ b/src/pages/identity/index.tsx @@ -43,7 +43,7 @@ function getObjectURL(file) { const IdentityPage: React.FC = ({ dispatch, user, - kyc1success, + kyc1status, nameInput, kyc1Submitting }) => { @@ -74,7 +74,7 @@ const IdentityPage: React.FC dispatch({ type: 'user/onUpdateState', payload: key }); }; const onNationSelected = (key: string) => { - setIdtypesVisible(false); + setNationVisible(false); dispatch({ type: 'user/onUpdateState', payload: key }); }; @@ -97,7 +97,7 @@ const IdentityPage: React.FC onItemSelected={onNationSelected} visible={nationVisible} onCancel={() => setNationVisible(false)} - title={formatMessage({ id: 'identity.chooseIdtype' })} + title={formatMessage({ id: 'identity.chooseNation' })} /> ); const submitHandler = async () => { @@ -110,8 +110,13 @@ const IdentityPage: React.FC formData.append('pic2', pic2); formData.append('realname', realname); formData.append('idNo', idNo); - // const data = await http.post('/user/verify', formData); - // console.log(data); + if (!realname || !idNo) { + alert('缺少必要信息,请继续填写') + return + } + const data = await http.post('/user/verify', formData); + alert(data.msg) +// console.log(data) } return (
@@ -121,8 +126,14 @@ const IdentityPage: React.FC /> {user &&
setRealname(e.target.value)} + /> + setIdNo(e.target.value)} /> @@ -140,12 +151,6 @@ const IdentityPage: React.FC preview(2)}/>
- setRealname(e.target.value)} - /> {/* onClick={() => setIdtypesVisible(true)} /> */} -
+ {/*
一级认证未能通过审核,原因为:
后台返回的理由
请重新提交。
-
+
*/} + + >{formatMessage({ id: (user.kyc1status==='verifying'||user.kyc1status==='verified') ? 'identity.kyc1btn2' : 'identity.kyc1btn' })} } {idtypeModal} {nationModal} diff --git a/src/pages/identity/model.ts b/src/pages/identity/model.ts index ca3aa88..89d2fed 100644 --- a/src/pages/identity/model.ts +++ b/src/pages/identity/model.ts @@ -3,7 +3,7 @@ import { kyc1 } from './service'; import { message } from 'antd'; export interface IdentityModelState { - kyc1success: boolean; + kyc1status: string; nameInput: string; kyc1Submitting: boolean; formData: any; @@ -13,7 +13,7 @@ const model: Model = { namespace: 'identity', state: { - kyc1success: false, + kyc1status: 'none', nameInput: '', kyc1Submitting: false, formData: '' @@ -21,11 +21,11 @@ const model: Model = { effects: { *kyc1submit(_, { put, all, call, select }) { - const { realname, idcode } = yield select((state:any) => state.identity) - if (!idcode || !realname) return + const { realname, idNo } = yield select((state:any) => state.identity) + if (!idNo || !realname) return yield put({ type: 'onUpdateState', kyc1Submitting: true }) try { - yield call(kyc1, {idcode:idcode, realname:realname}) + yield call(kyc1, {idNo:idNo, realname:realname}) /* yield all([ put({ type: 'onUpdateState', nameInput: '', nameEditable: false }), diff --git a/src/pages/identity/service.ts b/src/pages/identity/service.ts index 73c9b9a..de41d69 100644 --- a/src/pages/identity/service.ts +++ b/src/pages/identity/service.ts @@ -3,7 +3,7 @@ import http from '@/utils/http'; export async function kyc1(kyc1info: object) { // console.info('进入了 service.ts 调用 kyc1......') - const { ok, msg } = await http.post('/user/kyc1', kyc1info); + const { ok, msg } = await http.post('/user/verify', kyc1info); if (ok) { return true; } diff --git a/src/pages/identity/style.less b/src/pages/identity/style.less index c5b2bcf..300b096 100644 --- a/src/pages/identity/style.less +++ b/src/pages/identity/style.less @@ -50,6 +50,9 @@ max-height: 200px; } .uploadBox { + box-sizing:border-box; + width:50%; + padding: 8px; flex: 1 0 auto; position: relative; text-align: center; diff --git a/src/types/common.ts b/src/types/common.ts index a0d29de..0f8d189 100644 --- a/src/types/common.ts +++ b/src/types/common.ts @@ -14,10 +14,10 @@ export interface User { inviteCode: string; inviter: string; realname?: string; - idcode?: string; + idNo?: string; idtype?: string; nationality?: string; - kyc1success?: boolean; + kyc1status?: boolean; } export enum SendCodeType {