diff --git a/src/subpackage/account/js/api.js b/src/subpackage/account/js/api.js
index 1caaac6..a81511b 100644
--- a/src/subpackage/account/js/api.js
+++ b/src/subpackage/account/js/api.js
@@ -6,4 +6,5 @@ export const ACCOUNT_API = {
     userGet:`${ORIGIN}/admin/user/get`,  //  B会员管理-小程序用户管理-用户信息列表-用户信息详情
     userEdit:`${ORIGIN}/admin/user/edit`,  //  权限管理-编辑管理员信息
     stadiumList:`${ORIGIN}/admin/stadium/list`,  //  A店铺管理-店铺列表-店铺列表/A首页公告-店铺列表
+    getAllGroup:`${ORIGIN}/admin/permission/getAllGroup`,  //  权限管理-获取所有权限组
 }
\ No newline at end of file
diff --git a/src/subpackage/account/pages/permission/edit.vue b/src/subpackage/account/pages/permission/edit.vue
index abe9117..760f617 100644
--- a/src/subpackage/account/pages/permission/edit.vue
+++ b/src/subpackage/account/pages/permission/edit.vue
@@ -4,10 +4,10 @@
             :name="userInfo.name"
             :account="userInfo.account"
         ></user-info>
-        <admin-jurisdiction></admin-jurisdiction>
+        <admin-jurisdiction ref="adminJurisdiction" v-model="admin_permission_id"></admin-jurisdiction>
         <min-jurisdiction v-model="miniPermissionLs"></min-jurisdiction>
         <cashier-jurisdiction></cashier-jurisdiction>
-        <stadium-jurisdiction ref="stadiumJurisdiction"></stadium-jurisdiction>
+        <stadium-jurisdiction ref="stadiumJurisdiction" v-model="stadiumPermissionLs"></stadium-jurisdiction>
         <fixed-button @click="saveBtn">保存</fixed-button>
     </view>
 </template>
@@ -33,12 +33,6 @@ export default {
         userInfo(){
             return this.optionsQuery?.userInfo ?? {};
         },
-        // miniPermissionLs(){
-        //     return this.optionsQuery?.miniPermissionLs ?? [];
-        // },
-        stadiumPermissionLs(){
-            return this.optionsQuery?.stadiumPermissionLs ?? [];
-        },
     },
     data(){
         return {
@@ -47,30 +41,44 @@ export default {
                 /**
                  * @param {Array} miniPermissionLs 商家助手小程序权限列表
                  * @param {Array} stadiumPermissionLs 门店权限列表
+                 * @param {Number} admin_permission_id 后台权限
                  * @param {Object} userInfo 用户信息
                  *  @param {Number} userInfo.id 
                  *  @param {String} userInfo.account 
                  *  @param {String} userInfo.name 
                  */
             },
+            // 小程序权限列表
             miniPermissionLs: [],
+            // 店铺权限列表
+            stadiumPermissionLs: [],
+            // 
+            admin_permission_id: -1,
         }
     },
     onReady(){
         let { brand_id } = this;
         this.$refs.stadiumJurisdiction?.getStadiumLs?.(brand_id);
+        this.$refs.adminJurisdiction?.getAllGroup?.({ brand_id });
     },
     onLoad(options){
         let { brand_id, query_json } = options;
-        this.brand_id = brand_id ?? '';
-        this.optionsQuery = jsonPar(query_json ?? '{}');
         let optQuery = jsonPar(query_json ?? '{}');
+        console.warn('edit options =>', optQuery);
+        this.brand_id = brand_id ?? '';
+        this.optionsQuery = optQuery;
         this.miniPermissionLs = optQuery?.miniPermissionLs ?? [];
+        this.stadiumPermissionLs = optQuery?.stadiumPermissionLs ?? [];
+        this.admin_permission_id = optQuery?.admin_permission_id ?? -1;
     },
     methods: {
         saveBtn: debounce(function(){
+            let { miniPermissionLs, stadiumPermissionLs, admin_permission_id } = this;
             showModal({ content: '是否保存该账号权限？', });
-        }, 300, true)
+            console.warn('miniPermissionLs =>', miniPermissionLs);
+            console.warn('stadiumPermissionLs =>', stadiumPermissionLs);
+            console.warn('admin_permission_id =>', admin_permission_id);
+        }, 300, true),
     }
 }
 </script>
diff --git a/src/subpackage/account/pages/permission/info.vue b/src/subpackage/account/pages/permission/info.vue
index 845597a..72c3035 100644
--- a/src/subpackage/account/pages/permission/info.vue
+++ b/src/subpackage/account/pages/permission/info.vue
@@ -109,9 +109,10 @@ export default {
                     account: userInfo?.username ?? '',
                 },
                 miniPermissionLs,
-                stadiumPermissionLs
+                stadiumPermissionLs,
+                admin_permission_id: userInfo?.extension?.permission?.id ?? '',
             }
-            routeTo(`/subpackage/account/pages/permission/edit?brand_id=${this.brand_id}&query_json=${jsonStr(_query)}`, 'nT');
+            routeTo(`/subpackage/account/pages/permission/edit?brand_id=${brand_id}&query_json=${jsonStr(_query)}`, 'nT');
         },
         unbindWXAccount(){
             showModal({ content: '是否解绑该账号？', });
diff --git a/src/subpackage/account/pages/permission/modules/edit/admin_jurisdiction.vue b/src/subpackage/account/pages/permission/modules/edit/admin_jurisdiction.vue
index fa9b9bc..7c0a13e 100644
--- a/src/subpackage/account/pages/permission/modules/edit/admin_jurisdiction.vue
+++ b/src/subpackage/account/pages/permission/modules/edit/admin_jurisdiction.vue
@@ -2,14 +2,14 @@
     <info-container title="后台权限">
         <template v-slot:title-right>
             <view class="aj-title-right">
-                <switch color="#009874" style="transform:scale(0.7)"></switch>
+                <switch color="#009874" style="transform:scale(0.7)"  :checked="switchChecked"></switch>
             </view>
         </template>
         <template v-slot:content>
             <view class="aj-content">
-                <picker>
+                <picker :range="permissionList" range-key="permission_name" :value="curPickerIdx" @change="pickerChange">
                     <view class="ac-frame">
-                        <input class="af-ipt" disabled type="text" />
+                        <input class="af-ipt" disabled type="text" :value="curPermissionInfo.permission_name || ''" />
                         <image class="af-icon" mode="aspectFit" src="/subpackage/account/static/images/arrow.png"></image>
                     </view>
                 </picker>
@@ -20,10 +20,84 @@
 
 <script>
 import infoContainer from '../../../../components/info_container.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";
 export default {
     components: {
         'info-container': infoContainer
     },
+    props: {
+        value: {
+            default: -1,
+        }
+    },
+    computed: {
+        adminId: {
+            get(){
+                return +this.value;
+            },
+            set(val){
+                this.$emit('input', val);
+            }
+        },
+        curPermissionInfo(){
+            let { adminId, permissionList } = this;
+            return permissionList.find(ele => +ele.id === +adminId) || {};
+        },
+        curPickerIdx(){
+            let { permissionList, adminId } = this;
+            return permissionList.findIndex(ele => +ele.id === +adminId);
+        }
+    },
+    data(){
+        return {
+            permissionList: [],
+            switchChecked: false
+        }
+    },
+    methods: {
+        pickerChange(e){
+            let { permissionList } = this;
+            let { value } = e.detail;
+            let _curInfo = permissionList?.[value] || {};
+            if(!_curInfo.id)return;
+            this.adminId = _curInfo.id;
+        },
+        //  权限管理-获取所有权限组
+        getAllGroup({ brand_id }){
+            showLoad();
+            return server.post({
+                url: ACCOUNT_API.getAllGroup,
+                data: { role_id: `ADMIN-BRAND-${brand_id}`, brand_id },
+                isDefaultGet: false,
+            })
+            .then(res => {
+                hideLoad();
+                let _data = res?.data || {};
+                if(_data.code === 0){
+                    let _ls = _data?.data ?? [];
+                    if(_ls?.length)this.echoData(_ls);
+                    return this.permissionList = _ls;
+                }else{
+                    return Promise.reject(_data);
+                }
+            })
+            .catch(err => {
+                showModal({
+                    title: '提示',
+                    content: err.message || '加载失败！'
+                })
+                console.warn('subpackage account pages permission modules info admin_permission err --->', err);
+                // return Promise.reject(err);
+            })
+        },
+        echoData(list){
+            let { adminId } = this;
+            this.switchChecked = list.some(ele=> ele.id === +adminId)
+        }
+    }
 }
 </script>
 
diff --git a/src/subpackage/account/pages/permission/modules/edit/stadium_jurisdiction.vue b/src/subpackage/account/pages/permission/modules/edit/stadium_jurisdiction.vue
index 0884a97..6ae3e32 100644
--- a/src/subpackage/account/pages/permission/modules/edit/stadium_jurisdiction.vue
+++ b/src/subpackage/account/pages/permission/modules/edit/stadium_jurisdiction.vue
@@ -1,9 +1,10 @@
 <template>
-    <select-container  title="门店权限" :is-all="isAll" @click:all="isAll = !isAll">
+    <select-container  title="门店权限" :is-all="isAll" @click:all="allSelectedBtn">
         <view class="jurisdiction-content">
             <view class="mjc-item" v-for="(e, i) in stadiumLs" :key="i">
                 <jurisdiction-item 
-                    :active='i%2 === 0'
+                    :active='selectedIds.includes(+e.id)'
+                    @click="itemClick(e)"
                 >{{ e.name || '-' }}</jurisdiction-item>
             </view>
         </view>
@@ -22,10 +23,29 @@ export default {
     },
     data(){
         return {
-            isAll: false,
             stadiumLs: [],
         }
     },
+    props: {
+        value: {
+            type: Array,
+            default: []
+        }
+    },
+    computed: {
+        selectedIds: {
+            get(){
+                return this.value?.map?.(item=>+item);
+            },
+            set(val){
+                this.$emit('input', val);
+            }
+        },
+        isAll(){
+            let { stadiumLs, selectedIds } = this;
+            return stadiumLs.every(item=>selectedIds.includes(+item.id));
+        }
+    },
     onLoad(){
         
     },
@@ -34,6 +54,24 @@ export default {
             let _res = await getStadiumList({ brand_id: bid });
             let _ls = _res?.list ?? [];
             this.stadiumLs = _ls;
+        },
+        itemClick(e){
+            let { selectedIds } = this;
+            if(selectedIds.includes(+e.id)){
+                this.selectedIds = selectedIds.filter(item=>item !== +e.id);
+            }else{
+                this.selectedIds = selectedIds.concat(+e.id);
+            }
+        },
+        // 全选
+        allSelectedBtn(){
+            let { stadiumLs, selectedIds, isAll } = this;
+            let _pIds = stadiumLs.map(item => +item.id);
+            if(isAll){
+                this.selectedIds = selectedIds.filter(item => !_pIds.includes(item));
+            }else{
+                this.selectedIds = [ ...new Set([...selectedIds, ..._pIds]) ];
+            }
         }
     }
 }
diff --git a/src/subpackage/account/pages/permission/modules/info/admin_permission.vue b/src/subpackage/account/pages/permission/modules/info/admin_permission.vue
index d8c441b..4116c96 100644
--- a/src/subpackage/account/pages/permission/modules/info/admin_permission.vue
+++ b/src/subpackage/account/pages/permission/modules/info/admin_permission.vue
@@ -16,7 +16,8 @@
 
 <script>
 import infoContainer from '../../../../components/info_container.vue';
-import { showModal } from "@/utils/util.js";
+
+
 export default {
     components: {
         'info-container': infoContainer
@@ -30,11 +31,7 @@ export default {
             type: String,
             default: ''
         },
-
     },
-    methods: {
-        
-    }
 }
 </script>