From 7fa30e50c989bff6e95b54c3e86fa8cb47978cee Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Thu, 6 Mar 2025 18:24:43 +0800
Subject: [PATCH] add logic for tid1509

---
 src/subpackage/account/js/handle.js              | 24 ++++++++++++++-
 src/subpackage/account/pages/list/index.vue      | 37 +++++-------------------
 src/subpackage/account/pages/permission/info.vue | 22 +++++++++++++-
 3 files changed, 51 insertions(+), 32 deletions(-)

diff --git a/src/subpackage/account/js/handle.js b/src/subpackage/account/js/handle.js
index 26231b8..314e1fa 100644
--- a/src/subpackage/account/js/handle.js
+++ b/src/subpackage/account/js/handle.js
@@ -2,9 +2,31 @@ import { ACCOUNT_API } from "./api.js";
 import server from "./server.js";
 import { showModal, showLoad, hideLoad } from "@/utils/util.js";
 
+// 权限管理-删除权限组
+export function userDelete({ id }){
+    return server.post({
+        url: ACCOUNT_API.userDelete,
+        data: { id },
+        isDefaultGet: false,
+    })
+    .then(res => {
+        let _data = res?.data || {};
+        if(_data.code === 0){
+            return 'success';
+        }else{
+            return Promise.reject(_data);
+        }
+    })
+    .catch(err => {
+        showModal({ content: err.message || '操作失败！' });
+        console.warn('subpackage account js handle userDelete err --->', err);
+        // return Promise.reject(err);
+    })
+}
+
 //  B会员管理-小程序用户管理-用户信息列表-用户信息详情
 export function getStadiumList({ brand_id }){
-    return server.post({
+    return server.get({
         url: ACCOUNT_API.stadiumList,
         data: { brand_id },
         isDefaultGet: false,
diff --git a/src/subpackage/account/pages/list/index.vue b/src/subpackage/account/pages/list/index.vue
index 63b4e3f..999a840 100644
--- a/src/subpackage/account/pages/list/index.vue
+++ b/src/subpackage/account/pages/list/index.vue
@@ -27,6 +27,7 @@ import listItem from './modules/item.vue';
 import { routeTo, showModal, showLoad, hideLoad, showNone } from "@/utils/util.js";
 import { ACCOUNT_API } from "../../js/api.js";
 import server from "../../js/server.js";
+import { userDelete } from "../../js/handle.js";
 
 export default {
     components: {
@@ -65,7 +66,9 @@ export default {
                 showCancel: true,
                 success: async res => {
                     if(res.confirm){
-                        let _delRes = await this.userDelete({ id: e?.id ?? '' });
+                        showLoad();
+                        let _delRes = await userDelete({ id: e?.id ?? '' });
+                        hideLoad();
                         if(_delRes === 'success'){
                             showNone('操作成功！');
                             this.userLs.splice(idx, 1);
@@ -75,11 +78,11 @@ export default {
             });
         },
         // 权限管理-获取管理员
-        getUserLs({ brand_id, page = 1, limit = 20 }){
+        getUserLs({ brand_id, page = 1, limit = 10 }){
             showLoad();
-            return server.post({
+            return server.get({
                 url: ACCOUNT_API.userRest,
-                data: { 'filter[role]': `ADMIN-BRAND-${brand_id}`, page, limit },
+                data: { brand_id, 'filter[role]': `ADMIN-BRAND-${brand_id}`, page, limit },
                 isDefaultGet: false,
             })
             .then(res => {
@@ -104,32 +107,6 @@ export default {
                 // return Promise.reject(err);
             })
         },
-        // 权限管理-删除权限组
-        userDelete({ id }){
-            showLoad();
-            return server.post({
-                url: ACCOUNT_API.userDelete,
-                data: { id },
-                isDefaultGet: false,
-            })
-            .then(res => {
-                hideLoad();
-                let _data = res?.data || {};
-                if(_data.code === 0){
-                    return 'success';
-                }else{
-                    return Promise.reject(_data);
-                }
-            })
-            .catch(err => {
-                showModal({
-                    title: '提示',
-                    content: err.message || '操作失败！'
-                })
-                console.warn('subpackage account pages list index userDelete err --->', err);
-                // return Promise.reject(err);
-            })
-        },
     }
 }
 </script>
diff --git a/src/subpackage/account/pages/permission/info.vue b/src/subpackage/account/pages/permission/info.vue
index 72c3035..19d2dc4 100644
--- a/src/subpackage/account/pages/permission/info.vue
+++ b/src/subpackage/account/pages/permission/info.vue
@@ -44,6 +44,7 @@ import edit_account from "./modules/info/edit_account.vue";
 import { routeTo, showModal, showLoad, hideLoad, showNone, jsonStr } from "@/utils/util.js";
 import { ACCOUNT_API } from "../../js/api.js";
 import server from "../../js/server.js";
+import { userDelete } from "../../js/handle.js";
 export default {
     components: {
         'admin-permission': adminPermission,
@@ -82,10 +83,13 @@ export default {
     },
     methods: {
         userInfoEdit(){
+            let { userInfo, brand_id } = this;
+            if(!userInfo?.id)return showNone('用户信息有误！');
             this.$refs?.editAccount?.show();
         },
         changePassword(){
             let { userInfo, brand_id } = this;
+            if(!userInfo?.id)return showNone('用户信息有误！');
             this.$refs?.editPassword?.show({
                 success: async pRes =>{
                     console.log('pRes', pRes);
@@ -98,10 +102,26 @@ export default {
             });
         },
         userDelete(){
-            showModal({ content: '是否删除该账号？', });
+            let { userInfo } = this;
+            if(!userInfo?.id)return showNone('用户信息有误！');
+            showModal({
+                content: '是否删除该账号？',
+                success: async res => {
+                    if(res.confirm){
+                        showLoad();
+                        let _delRes = await userDelete({ id: userInfo?.id ?? '' });
+                        hideLoad();
+                        if(_delRes === 'success'){
+                            showNone('操作成功！');
+                            setTimeout(routeTo, 1000);
+                        }
+                    }
+                }
+            });
         },
         editAuthority(){
             let { brand_id, userInfo, miniPermissionLs, stadiumPermissionLs } = this;
+            if(!userInfo?.id)return showNone('用户信息有误！');
             let _query = {
                 userInfo: {
                     id: userInfo?.id ?? '',