From c9752a2ca5e7ac20b78dee37a23ac3bca8d4b893 Mon Sep 17 00:00:00 2001
From: bootx <xxm1995@outlook.com>
Date: Tue, 11 Nov 2025 18:16:19 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=95=86=E6=88=B7=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/merchant/info/MerchantCreate.vue    |  2 +-
 .../admin/merchant/info/MerchantList.vue      | 11 --------
 .../daxpay/merchant/info/MerchantInfo.vue     | 26 +------------------
 3 files changed, 2 insertions(+), 37 deletions(-)

diff --git a/src/views/daxpay/admin/merchant/info/MerchantCreate.vue b/src/views/daxpay/admin/merchant/info/MerchantCreate.vue
index 7ad426fd7..039875620 100644
--- a/src/views/daxpay/admin/merchant/info/MerchantCreate.vue
+++ b/src/views/daxpay/admin/merchant/info/MerchantCreate.vue
@@ -19,7 +19,7 @@
         :wrapper-col="wrapperCol"
       >
         <template v-if="isAdmin()">
-          <a-form-item label="服务商" name="providerNo">
+          <a-form-item label="服务商" name="isvNo">
             <a-select
               style="width: 100%"
               v-model:value="form.isvNo"
diff --git a/src/views/daxpay/admin/merchant/info/MerchantList.vue b/src/views/daxpay/admin/merchant/info/MerchantList.vue
index 8bcdade14..ece81f2ac 100644
--- a/src/views/daxpay/admin/merchant/info/MerchantList.vue
+++ b/src/views/daxpay/admin/merchant/info/MerchantList.vue
@@ -39,17 +39,6 @@
               <span v-else color="red">禁用</span>
             </template>
           </vxe-column>
-          <vxe-column field="profileAuth" title="主体信息认证" :min-width="120" align="center">
-            <template #default="{ row }">
-              <a-tag v-if="row.profileAuth === 'success'" color="green">已认证</a-tag>
-              <a-tooltip v-else-if="row.profileAuth === 'failed'" placement="top">
-                <template #title>{{ row.profileAuthErrorMsg }}</template>
-                <a-tag color="red">认证失败</a-tag>
-              </a-tooltip>
-              <a-tag v-else-if="row.profileAuth === 'waiting'" color="orange">待认证</a-tag>
-              <a-tag v-else>未认证</a-tag>
-            </template>
-          </vxe-column>
           <vxe-column field="isvName" title="服务商名称" :min-width="150" />
           <vxe-column field="createTime" title="创建时间" :min-width="140" />
           <vxe-column fixed="right" :width="120" :showOverflow="false" title="操作" align="center">
diff --git a/src/views/daxpay/merchant/info/MerchantInfo.vue b/src/views/daxpay/merchant/info/MerchantInfo.vue
index 01c872238..7f98ba410 100644
--- a/src/views/daxpay/merchant/info/MerchantInfo.vue
+++ b/src/views/daxpay/merchant/info/MerchantInfo.vue
@@ -31,7 +31,7 @@
           <a-col :span="12">
             <div class="action-buttons">
               <a-row :gutter="[16, 16]">
-                <a-col :span="12">
+                <a-col :span="24">
                   <a-button type="primary" size="large" block @click="showCredentialConfig">
                     <template #icon>
                       <Icon icon="ant-design:setting-outlined" />
@@ -39,30 +39,6 @@
                     对接配置
                   </a-button>
                 </a-col>
-                <a-col :span="12">
-                  <a-button size="large" block @click="showMainBody">
-                    <template #icon>
-                      <Icon icon="ant-design:user-outlined" />
-                    </template>
-                    主体信息
-                  </a-button>
-                </a-col>
-                <a-col :span="12">
-                  <a-button size="large" block @click="showShopInfo">
-                    <template #icon>
-                      <Icon icon="ant-design:shop-outlined" />
-                    </template>
-                    经营信息
-                  </a-button>
-                </a-col>
-                <a-col :span="12">
-                  <a-button size="large" block @click="showSettleInfo">
-                    <template #icon>
-                      <Icon icon="ant-design:bank-outlined" />
-                    </template>
-                    结算信息
-                  </a-button>
-                </a-col>
               </a-row>
             </div>
           </a-col>