diff --git a/package.json b/package.json index 5907c6c..d843b6d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "vue-admin", "private": true, - "version": "1.2.31", + "version": "1.2.34", "type": "module", "scripts": { "dev": "vite", diff --git a/src/views/organization/components/authentication.vue b/src/views/organization/components/authentication.vue index fabd40d..5bc3c57 100644 --- a/src/views/organization/components/authentication.vue +++ b/src/views/organization/components/authentication.vue @@ -147,144 +147,10 @@ const form = reactive({ id: '', merchantcode: route.query.merchantcode, userid: route.query.id, - username: route.query.name, - loginname: route.query.account, - idCard: { - id: '', - userid: '', - certname: '', - certno: '', - certstarttime: '', - certendtime: '', - imgpositive: '', - imgnegative: '' - }, - bankCard: { - id: '', - userid: '', - bankcardno: '', - phone: '', - branchprovince: '', - branchcity: '', - brancharea: '', - bankname: '', - contactline: '', - imgurl: '', - branchProvinceCode: '', - branchCityCode: '', - branchAreaCode: '' - } -}) - -const rules = reactive({ - username: [ - { - required: true, - message: '', - trigger: 'blur' - } - ], - loginname: [ - { - required: true, - message: '', - trigger: 'blur' - } - ], - idCard: { - certname: [ - { - required: true, - message: '', - trigger: 'blur' - } - ], - certno: [ - { - required: true, - message: '', - trigger: 'blur' - } - ], - certstarttime: [ - { - required: true, - message: '', - trigger: 'blur' - } - ], - certendtime: [ - { - required: true, - message: '', - trigger: 'blur' - } - ], - imgpositive: [ - { - required: true, - message: '请选择身份证正面照片', - trigger: 'change' - } - ], - imgnegative: [ - { - required: true, - message: '请选择身份证反面照片', - trigger: 'change' - } - ] - }, - bankCard: { - bankcardno: [ - { - required: true, - message: '', - trigger: 'blur' - } - ], - phone: [ - { - required: true, - message: '', - trigger: 'blur' - } - ], - bankname: [ - { - required: true, - message: '', - trigger: 'blur' - } - ], - bank: [ - { - required: true, - validator: (rule, value, callback) => { - if (!form.bankCard.branchprovince || !form.bankCard.branchcity || !form.bankCard.brancharea) { - return callback(new Error('请完善开户行地区信息')) - } else { - callback() - } - }, - trigger: 'change' - } - ], - contactline: [ - { - required: true, - message: '', - trigger: 'change' - } - ], - imgurl: [ - { - required: true, - message: '请选择银行卡照片', - trigger: 'blur' - } - ] - } + username: '', + loginname: '', + idCard: {}, + bankCard: {} }) // 获取省市区 @@ -347,8 +213,10 @@ async function merchantInfoDetailAjax() { await banknameChange(res.bankCard.bankname, res.bankCard.branchcity) form.id = res.id form.status = res.status - form.bankCard = res.bankCard + form.username = res.username + form.loginname = res.loginname form.idCard = res.idCard + form.bankCard = res.bankCard idCardRef1.value.pselectFile({ url: res.idCard.imgpositive }) idCardRef2.value.pselectFile({ url: res.idCard.imgnegative }) uploadBank.value.pselectFile({ url: res.bankCard.imgurl })