From c7343e485a2f81c53b224623cb73a01cdd5a2f11 Mon Sep 17 00:00:00 2001
From: lzhizhao <790086754@qq.com>
Date: Sat, 13 Sep 2025 23:00:12 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=95=86=E6=88=B7=E8=B4=A6=E5=8F=B7?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modules/merchant.js                   |  8 +---
 src/api/modules/subaccount.js                 |  9 +++++
 src/router/full-routers.js                    | 40 -------------------
 .../permission/merchant-account/index.vue     | 23 +++++++++--
 4 files changed, 29 insertions(+), 51 deletions(-)

diff --git a/src/api/modules/merchant.js b/src/api/modules/merchant.js
index 1cbf341..5b180b2 100644
--- a/src/api/modules/merchant.js
+++ b/src/api/modules/merchant.js
@@ -41,10 +41,4 @@ export function getMerchantList(params) {
   })
 }
 
-export function updatePassword(data) {
-  return request({
-    url: '/merchant-api/auth/update_password',
-    method: 'put',
-    data
-  })
-}
+
diff --git a/src/api/modules/subaccount.js b/src/api/modules/subaccount.js
index b68d65b..60c14ea 100644
--- a/src/api/modules/subaccount.js
+++ b/src/api/modules/subaccount.js
@@ -59,3 +59,12 @@ export function resetPassword (subAccountId, newPassword) {
     data: httpRequest.adornData({ newPassword })
   })
 }
+
+// 重置商户密码
+export function resetMerchantPassword (data) {
+  return httpRequest({
+    url: httpRequest.adornUrl('/merchant-api/subaccount/reset-merchant-password'),
+    method: 'post',
+    data: httpRequest.adornData(data)
+  })
+}
diff --git a/src/router/full-routers.js b/src/router/full-routers.js
index c6f7f35..0945111 100644
--- a/src/router/full-routers.js
+++ b/src/router/full-routers.js
@@ -195,46 +195,6 @@ export default {
           open: null,
           list: []
         },
-        {
-          menuId: getUUID(),
-          parentId: 0,
-          parentName: null,
-          name: "权限管理",
-          url: "operation-management/permission",
-          perms: "operation-management:permission",
-          type: 0,
-          elIcon: "el-icon-lock",
-          orderNum: 0,
-          open: null,
-          list: [
-            {
-              menuId: getUUID(),
-              parentId: 0,
-              parentName: null,
-              name: "子经营者管理",
-              url: "operation-management/permission/sub-operator/index",
-              perms: "operation-management:permission:sub-operator:index",
-              type: 1,
-              elIcon: "el-icon-user",
-              orderNum: 0,
-              open: null,
-              list: []
-            },
-            {
-              menuId: getUUID(),
-              parentId: 0,
-              parentName: null,
-              name: "商户账号管理",
-              url: "operation-management/permission/merchant-account/index",
-              perms: "operation-management:permission:merchant-account:index",
-              type: 1,
-              elIcon: "el-icon-user-solid",
-              orderNum: 0,
-              open: null,
-              list: []
-            }
-          ]
-        },
         // {
         //   menuId: getUUID(),
         //   parentId: 0,
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 f1f0277..bc13876 100644
--- a/src/views/modules/operation-management/permission/merchant-account/index.vue
+++ b/src/views/modules/operation-management/permission/merchant-account/index.vue
@@ -247,15 +247,15 @@
 <script>
 import {
   getAvailablePermissions,
-  checkUsername
+  checkUsername,
+  resetMerchantPassword
 } from '@/api/modules/subaccount' // Assuming some APIs can be reused
 import {
   inviteJoin,
   setMerchantPermissions,
   shopBaseConfig,
   listPlatformCategory,
-  getMerchantList,
-  updatePassword
+  getMerchantList
 } from '@/api/modules/merchant' // New merchant API
 import { mer_admin } from '@/api/modules/mer_admin'
 import routerConfig from '@/router/full-routers'
@@ -492,7 +492,18 @@ export default {
         this.$message.error('请输入新密码')
         return
       }
-      updatePassword({ password: this.newPassword }).then(() => {
+      const selectedAccount = this.merchantAccountList.find(
+        item => item.merchantId === this.form.merchantId
+      )
+      if (!selectedAccount) {
+        this.$message.error('无法找到所选商户的详细信息')
+        return
+      }
+      resetMerchantPassword({
+        merchantAccountId: selectedAccount.merchantAccountId,
+        newPassword: this.newPassword,
+        marketId: this.form.selectedMarketId || this.marketId
+      }).then(() => {
         this.$message.success('密码重置成功')
         this.resetPasswordDialogVisible = false
       })
@@ -570,6 +581,7 @@ export default {
             }
             inviteJoin(createData).then(res => {
               const merchantAccountId = res.data.data.merchantAccountId // Assuming this is the merchant ID
+              const merchantId = res.data.data.merchantId;
               const shopId = res.data.data.shopId // Assuming this is the shop ID
               const permissionsData = {
                 merchantAccountId,
@@ -579,6 +591,8 @@ export default {
               setMerchantPermissions(permissionsData).then(() => {
                 const shopData = {
                   ...this.form,
+                  merchantAccountId,
+                  merchantId,
                   imgs: this.form.fileList.map(f => f.url).join(','),
                   permits: this.form.permits.map(f => f.url).join(','),
                   startBusinessTime:
@@ -588,6 +602,7 @@ export default {
                     this.businessHours[1].getHours() * 60 +
                     this.businessHours[1].getMinutes()
                 }
+                debugger
                 shopBaseConfig({ shopId }, shopData).then(() => {
                   this.$message.success('商户创建成功，权限及店铺信息已设置')
                   this.$refs.ruleFormRef.resetFields()