From 09e7735391f47c8095b58177d8b74b45fdede3c7 Mon Sep 17 00:00:00 2001
From: lzhizhao <790086754@qq.com>
Date: Fri, 12 Sep 2025 13:10:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../permission/merchant-account/index.vue      | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/operation-management/permission/merchant-account/index.vue b/src/views/modules/operation-management/permission/merchant-account/index.vue
index 3651747..f1f0277 100644
--- a/src/views/modules/operation-management/permission/merchant-account/index.vue
+++ b/src/views/modules/operation-management/permission/merchant-account/index.vue
@@ -202,13 +202,6 @@
             >重置密码</el-button
           >
         </el-form-item>
-        <el-form-item label="状态">
-          <el-switch
-            v-model="form.enable"
-            active-text="启用"
-            inactive-text="禁用"
-          ></el-switch>
-        </el-form-item>
       </template>
 
       <el-form-item label="权限分配" prop="permissionCodes">
@@ -551,7 +544,7 @@ export default {
       )
       if (accountDetails) {
         this.form.permissionCodes = accountDetails.permissionCodes || []
-        this.form.enable = accountDetails.enabled
+        this.form.enable = accountDetails.status === 1
         this.$nextTick(() => {
           this.$refs.permissionTree.setCheckedKeys(this.form.permissionCodes)
         })
@@ -606,8 +599,15 @@ export default {
               this.$message.error('请先选择要更新的商户账号')
               return
             }
+            const selectedAccount = this.merchantAccountList.find(
+              item => item.merchantId === this.form.merchantId
+            )
+            if (!selectedAccount) {
+              this.$message.error('无法找到所选商户的详细信息')
+              return
+            }
             const permissionsData = {
-              merchantAccountId: this.form.merchantId,
+              merchantAccountId: selectedAccount.merchantAccountId,
               permissionCodes: this.form.permissionCodes,
               marketId
             }