diff --git a/src/modules/auth/api/auth.ts b/src/modules/auth/api/auth.ts index 564968a..cb3cdec 100644 --- a/src/modules/auth/api/auth.ts +++ b/src/modules/auth/api/auth.ts @@ -7,7 +7,7 @@ export interface RegisterMerchantRequest { displayName: string companyName: string legalPerson: string - legalPhone: string + phone: string contactEmail?: string countryCode?: string address?: string diff --git a/src/modules/auth/views/AuthViews.test.mjs b/src/modules/auth/views/AuthViews.test.mjs index a41ff01..6adc8fb 100644 --- a/src/modules/auth/views/AuthViews.test.mjs +++ b/src/modules/auth/views/AuthViews.test.mjs @@ -50,10 +50,13 @@ test('persists both rotating tokens according to the remember choice', () => { }) test('implements every backend registration field and real submission', () => { - for (const field of ['username', 'companyName', 'displayName', 'legalPerson', 'legalPhone', 'contactEmail', 'countryCode', 'address', 'password', 'agreement']) { + for (const field of ['username', 'companyName', 'displayName', 'legalPerson', 'phone', 'contactEmail', 'countryCode', 'address', 'password', 'agreement']) { assert.match(registerSource, new RegExp(`prop="${field}"`)) } - assert.match(registerSource, /label="登录手机号" prop="legalPhone"/) + assert.match(registerSource, /label="登录手机号" prop="phone"/) + assert.doesNotMatch(registerSource, /legalPhone/) + assert.match(authApiSource, /phone: string/) + assert.doesNotMatch(authApiSource, /legalPhone/) assert.match(registerSource, /注册时同时初始化公司联系电话;注册后两者可分别修改,互不联动/) assert.match(registerSource, /registerMerchant\(/) assert.match(registerSource, /4–64 位/) diff --git a/src/modules/auth/views/RegisterView.vue b/src/modules/auth/views/RegisterView.vue index 3e683e0..4068b5e 100644 --- a/src/modules/auth/views/RegisterView.vue +++ b/src/modules/auth/views/RegisterView.vue @@ -11,7 +11,7 @@ interface RegisterForm { companyName: string displayName: string legalPerson: string - legalPhone: string + phone: string contactEmail: string countryCode: string address: string @@ -24,7 +24,7 @@ const formRef = ref() const submitting = ref(false) const submitted = ref(false) const submittedAt = ref('') -const form = reactive({ username: '', companyName: '', displayName: '', legalPerson: '', legalPhone: '', contactEmail: '', countryCode: 'CN', address: '', password: '', agreement: false }) +const form = reactive({ username: '', companyName: '', displayName: '', legalPerson: '', phone: '', contactEmail: '', countryCode: 'CN', address: '', password: '', agreement: false }) const rules: FormRules = { username: [ @@ -46,7 +46,7 @@ const rules: FormRules = { contactEmail: [ { type: 'email', message: '请输入有效的邮箱地址', trigger: 'blur' }, ], - legalPhone: [ + phone: [ { required: true, message: '请输入手机号', trigger: 'blur' }, { pattern: /^1[3-9]\d{9}$/, message: '请输入有效的中国大陆手机号', trigger: 'blur' }, ], @@ -74,7 +74,7 @@ async function submit() { displayName: form.displayName.trim(), companyName: form.companyName.trim(), legalPerson: form.legalPerson.trim(), - legalPhone: form.legalPhone.trim(), + phone: form.phone.trim(), contactEmail: form.contactEmail.trim() || undefined, countryCode: form.countryCode, address: form.address.trim() || undefined, @@ -131,7 +131,7 @@ async function submit() {

联系信息

- 注册时同时初始化公司联系电话;注册后两者可分别修改,互不联动。 + 注册时同时初始化公司联系电话;注册后两者可分别修改,互不联动。