diff --git a/miniprogram/pages/addMember/addMember.ts b/miniprogram/pages/addMember/addMember.ts index f38f985..f66a697 100644 --- a/miniprogram/pages/addMember/addMember.ts +++ b/miniprogram/pages/addMember/addMember.ts @@ -218,8 +218,6 @@ Page({ const name = e.detail.value this.setData({ 'form.name': name, - 'form.gender': '', - 'form.age': '', serverResult: null, hasQueried: false, readonly: false @@ -231,16 +229,19 @@ Page({ onIdCardInput(e: WechatMiniprogram.Input) { const idCard = (e.detail.value || '').trim().toUpperCase() - this.setData({ - 'form.idCard': idCard, - 'form.gender': '', - 'form.age': '', - serverResult: null, - hasQueried: false, - readonly: false - }) - if (this.data.form.name.trim() && this.isIdCardValid(idCard)) { - this.fetchUserInfoByIdCard(this.data.form.name.trim(), idCard) + if (this.isIdCardValid(idCard)) { + const parsed = this.parseIdCard(idCard) + this.setData({ + 'form.idCard': idCard, + 'form.gender': parsed.gender, + 'form.age': parsed.age, + }) + } else { + this.setData({ + 'form.idCard': idCard, + 'form.gender': '', + 'form.age': '', + }) } }, diff --git a/miniprogram/pages/editMember/editMember.ts b/miniprogram/pages/editMember/editMember.ts index 601f84c..95f2227 100644 --- a/miniprogram/pages/editMember/editMember.ts +++ b/miniprogram/pages/editMember/editMember.ts @@ -140,8 +140,6 @@ Page({ const name = e.detail.value this.setData({ 'form.name': name, - 'form.gender': '', - 'form.age': '', serverResult: null, hasQueried: false, readonly: false @@ -153,16 +151,15 @@ Page({ onIdCardInput(e: WechatMiniprogram.Input) { const idCard = (e.detail.value || '').trim().toUpperCase() - this.setData({ - 'form.idCard': idCard, - 'form.gender': '', - 'form.age': '', - serverResult: null, - hasQueried: false, - readonly: false - }) - if (this.data.isFamily && this.data.form.name.trim() && this.isIdCardValid(idCard)) { - this.fetchUserInfoByIdCard(this.data.form.name.trim(), idCard) + if (!this.data.isFamily) { + this.setData({ 'form.idCard': idCard }) + return + } + if (this.isIdCardValid(idCard)) { + const parsed = this.parseIdCard(idCard) + this.setData({ 'form.idCard': idCard, 'form.gender': parsed.gender, 'form.age': parsed.age }) + } else { + this.setData({ 'form.idCard': idCard, 'form.gender': '', 'form.age': '' }) } },