From 569f842c65e5d4cfe90aa35fdafacfc1901602fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E7=8E=89=E5=BC=BA?= <875626088@qq.com>
Date: Tue, 17 Oct 2023 09:47:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=93=B6=E8=A1=8C=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   2 +-
 .../components/authentication.vue             | 146 +-----------------
 2 files changed, 8 insertions(+), 140 deletions(-)

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 })