From 6a865fce8a5f13b720df7596e0583cde2e97b344 Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Wed, 30 Aug 2023 13:50:30 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=A7=84=E8=8C=83=E5=9F=8E=E5=B8=82?=
 =?UTF-8?q?=E9=93=B6=E8=A1=8C=E4=BB=A3=E7=A0=81=E6=96=87=E4=BB=B6=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jsowell-ui/src/assets/json/bank_code.json                  | 2 +-
 jsowell-ui/src/views/financial/financeDetail.vue           | 7 ++++---
 .../src/views/pile/merchant/components/adapayMember.vue    | 6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/jsowell-ui/src/assets/json/bank_code.json b/jsowell-ui/src/assets/json/bank_code.json
index 0645ee77c..bc27feb97 100644
--- a/jsowell-ui/src/assets/json/bank_code.json
+++ b/jsowell-ui/src/assets/json/bank_code.json
@@ -1,5 +1,5 @@
 {
-    "cityList":[
+    "bankList":[
         {
             "bankCode": "31379104",
             "bankName": "长安银行股份有限公司"
diff --git a/jsowell-ui/src/views/financial/financeDetail.vue b/jsowell-ui/src/views/financial/financeDetail.vue
index 2a79b46aa..9bcfb2a5f 100644
--- a/jsowell-ui/src/views/financial/financeDetail.vue
+++ b/jsowell-ui/src/views/financial/financeDetail.vue
@@ -401,8 +401,8 @@ export default {
     // 银行编码
     cityBankCode(code) {
       // if (code === undefined) return;
-      const cityList = text.cityList;
-      let arr = cityList.find((item) => item.bankCode === code);
+      const bankList = text.bankList;
+      let arr = bankList.find((item) => item.bankCode === code);
       // console.log("银行编码对应的银行名称 arr", arr);
       return arr.bankName;
     },
@@ -422,7 +422,7 @@ export default {
           // 对公返回的结果 商家性质：
           this.merchantNature = this.operationStatus.bankAcctType;
           console.log("对公信息", this.adapayCorpMember);
-          if (response.data.settleAccountList !== null) {
+          if (response.data.settleAccountList != null) {
             // 个人账户
             this.adapayCorpMember = response.data.adapayMember;
             this.settleAccountList = response.data.settleAccountList;
@@ -432,6 +432,7 @@ export default {
           if (response.data.adapayCorpMember != null)
             return (this.adapayCorpMember = response.data.adapayCorpMember);
         }
+        this.loading = false;
       });
     },
     getAdapayBalance() {
diff --git a/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue b/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue
index 2940189e0..dd87e02fd 100644
--- a/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue
+++ b/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue
@@ -243,7 +243,7 @@
                             placeholder="请选择"
                         >
                             <el-option
-                                v-for="item in cityList"
+                                v-for="item in bankList"
                                 :key="item.bankCode"
                                 :label="item.bankName"
                                 :value="item.bankCode"
@@ -756,7 +756,7 @@ export default {
             legalCertIdChecked: false, // 身份证长期
             areaList: [],
             bankValue: "",
-            cityList: [], // 银行代码JSON数据
+            bankList: [], // 银行代码JSON数据
             showAdapayCorp: null,
             updateDialog: false,
             adapayCorpRules: {
@@ -1520,7 +1520,7 @@ export default {
     created() {
         this.selectAdapayMember();
         this.jsonHttp();
-        this.cityList = text.cityList;
+        this.bankList = text.bankList;
     },
 };
 </script>