From 9a80865354af77c6e96ea3cac398fce0b30a20e9 Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Wed, 17 Sep 2025 15:43:23 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js    | 110 ++++++++++++++++++++++++++++---------------------
 src/utils/menuUtils.js |   7 +++-
 2 files changed, 69 insertions(+), 48 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 9f80aa1..f65a154 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -25,9 +25,9 @@ const routes = [
                 path: 'workbench',
                 name: "workbench",
                 component: () => import("../views/workspace/index.vue"),
-                meta: { permissionId: 10 } // 对应"工作台展示"id=10
+                meta: { permissionId: 13 } // 
             },
-
+            //金币管理
             {
                 path: '/goldManage',
                 name: 'goldManage',
@@ -37,7 +37,7 @@ const routes = [
                         path: '/audit',
                         name: "audit",
                         component: () => import("../views/audit/gold/audit.vue"),
-                        meta: { permissionId: 40 },
+                        meta: { permissionId: 14 },
                         // redirect: '/index',
                         children: [
                             // 充值审核
@@ -45,21 +45,30 @@ const routes = [
                                 path: 'rechargeAudit',
                                 name: "rechargeAudit",
                                 component: () => import("../views/audit/gold/rechargeAudit.vue"),
-                                meta: { permissionId: [11, 12] } // 对应"查看充值审核"id=11、"充值审批"id=12
+                                meta: { permissionId: [28,30,31,32,33,34,35] } // 对应"查看充值审核"id=11、"充值审批"id=12
                             },
                             // 退款审核
                             {
                                 path: 'refundAudit',
                                 name: "refundAudit",
                                 component: () => import("../views/audit/gold/refundAudit.vue"),
-                                meta: { permissionId: [13, 14] } // 对应"查看退款审核"id=13、"退款审批"id=14
+                                meta: { permissionId: [29,36,37,38,39,40,41] } // 对应"查看退款审核"id=13、"退款审批"id=14
                             },
                         ]
                     }, {
-                        path: 'beanAudit',
+                        path: '/beanAudit',
                         name: "beanAudit",
                         component: () => import("../views/audit/bean/beanAudit.vue"),
-                        meta: { permissionId: [54, 55] }
+                        meta: { permissionId: 15 },
+                            children: [
+                            // 充值审核
+                            {
+                                path: 'addbeanAudit',
+                                name: "addbeanAudit",
+                                component: () => import("../views/audit/bean/beanAudit.vue"),
+                                meta: { permissionId: [42,43,44,45,46,47] } // 对应"查看充值审核"id=11、"充值审批"id=12
+                            },
+                        ]
                     },
 
 
@@ -69,21 +78,21 @@ const routes = [
                         name: "coinConsume",
                         component: () => import("../views/consume/gold/coinConsume.vue"),
                         // redirect: '/coinConsume/add',
-                        meta: { permissionId: 6 },
+                        meta: { permissionId: 19 },
                         children: [
                             // 金币新增消耗
                             {
                                 path: 'add',
                                 name: "addCoinConsume",
                                 component: () => import("../views/consume/gold/addCoinConsume.vue"),
-                                meta: { permissionId: 19 } // 对应"提交金币消耗"id=19
+                                meta: { permissionId: 55 } // 对应"提交金币消耗"id=19
                             },
                             // 金币消耗明细详情
                             {
                                 path: 'detail',
                                 name: "coinConsumeDetail",
                                 component: () => import("../views/consume/gold/coinConsumeDetail.vue"),
-                                meta: { permissionId: 20 } // 对应"查看金币消耗明细"id=20
+                                meta: { permissionId: 56 } // 对应"查看金币消耗明细"id=20
                             }
                         ]
                     },
@@ -92,35 +101,35 @@ const routes = [
                         path: '/beanConsume',
                         name: "beanConsume",
                         component: () => import("../views/consume/bean/beanConsume.vue"),
-                        meta: { permissionId: 42 },
+                        meta: { permissionId: 20 },
                         children: [
                             // 金豆新增消耗
                             {
                                 path: 'add',
                                 name: "addBeanConsume",
                                 component: () => import("../views/consume/bean/addBeanConsume.vue"),
-                                meta: { permissionId: 49 } // 对应"提交金豆消耗"id=49
+                                meta: { permissionId: 57 } // 对应"提交金豆消耗"id=49
                             },
                             // 直播
                             {
                                 path: 'live',
                                 name: "liveStream",
                                 component: () => import("../views/consume/bean/liveStream.vue"),
-                                meta: { permissionId: 50 } // 对应"直播"id=50
+                                meta: { permissionId: 58 } // 对应"直播"id=50
                             },
                             // 铁粉
                             {
                                 path: 'fan',
                                 name: "dieHardFan",
                                 component: () => import("../views/consume/bean/dieHardFan.vue"),
-                                meta: { permissionId: 51 } // 对应"铁粉"id=51
+                                meta: { permissionId: 59 } // 对应"铁粉"id=51
                             },
                             // 文章视频
                             {
                                 path: 'article',
                                 name: "articleVideo",
                                 component: () => import("../views/consume/bean/articleVideo.vue"),
-                                meta: { permissionId: 52 } // 对应"文章视频"id=52
+                                meta: { permissionId: 60 } // 对应"文章视频"id=52
                             }
 
                         ]
@@ -131,13 +140,14 @@ const routes = [
                         path: '/rate',
                         name: "rate",
                         component: () => import("../views/managerecharge/rate.vue"),
-                        meta: { permissionId: [15, 16] } // 对应"汇率查看"id=15、"汇率修改"id=16
+                        meta: { permissionId:  [16,48,49] } // 对应"汇率查看"id=15、"汇率修改"id=16
                     },
                     // 金币充值
                     {
                         path: '/coinRecharge',
                         name: "coinRecharge",
                         component: () => import("../views/recharge/gold/coinRecharge.vue"),
+                         meta: { permissionId:  17 },
                         // redirect: '/coinRecharge/add',
                         children: [
                             // 金币新增充值
@@ -145,14 +155,14 @@ const routes = [
                                 path: 'add',
                                 name: "addCoinRecharge",
                                 component: () => import("../views/recharge/gold/addCoinRecharge.vue"),
-                                meta: { permissionId: 17 } // 对应"提交金币充值"id=17
+                                meta: { permissionId: 50 } // 对应"提交金币充值"id=17
                             },
                             // 金币充值明细详情
                             {
                                 path: 'detail',
                                 name: "coinRechargeDetail",
                                 component: () => import("../views/recharge/gold/coinRechargeDetail.vue"),
-                                meta: { permissionId: 18 } // 对应"查看金币充值明细"id=18
+                                meta: { permissionId: 51 } // 对应"查看金币充值明细"id=18
                             }
                         ]
                     },
@@ -163,58 +173,52 @@ const routes = [
                         name: "beanRecharge",
                         component: () => import("../views/recharge/bean/beanRecharge.vue"),
                         // redirect: '/coinRecharge/add',
+                         meta: { permissionId:  18 },
                         children: [
                             // 金豆新增充值
                             {
                                 path: 'add',
                                 name: "addBeanRecharge",
                                 component: () => import("../views/recharge/bean/addBeanRecharge.vue"),
-                                meta: { permissionId: 46 } // 对应"提交金豆充值"id=46
+                                meta: { permissionId: 52 } // 对应"提交金豆充值"id=46
                             },
                             // 金豆系统充值
                             {
                                 path: 'system',
                                 name: "beanSystemRecharge",
                                 component: () => import("../views/recharge/bean/beanSystemRecharge.vue"),
-                                meta: { permissionId: 47 } // 对应"查看金豆系统充值明细"id=47
+                                meta: { permissionId: 53 } // 对应"查看金豆系统充值明细"id=47
                             },
                             // 金豆线上充值
                             {
                                 path: 'online',
                                 name: "beanOnlineRecharge",
                                 component: () => import("../views/recharge/bean/beanOnlineRecharge.vue"),
-                                meta: { permissionId: 48 } // 对应"查看金豆线上充值明细"id=48
+                                meta: { permissionId: 54 } // 对应"查看金豆线上充值明细"id=48
                             }
                         ]
                     },
 
-                    // 金币退款
+                     // 金币退款
                     {
                         path: '/coinRefund',
                         name: "coinRefund",
                         component: () => import("../views/refund/gold/coinRefund.vue"),
-                        // redirect: '/coinRefund/add',
-                        meta: { permissionId: 7 },
+                        meta: { permissionId: 9 },
                         children: [
                             // 金币新增退款
                             {
                                 path: 'add',
                                 name: "addCoinRefund",
                                 component: () => import("../views/refund/gold/addCoinRefund.vue"),
-                                meta: { permissionId: 21 } // 对应"提交金币退款"id=21
+                                meta: { permissionId: 61 }
                             },
                             // 金币退款明细详情
                             {
                                 path: 'detail',
                                 name: "coinRefundDetail",
                                 component: () => import("../views/refund/gold/coinRefundDetail.vue"),
-                                meta: { permissionId: 22 } // 对应"查看金币退款明细"id=22
-                            },
-                            {
-                                path: 'addRefund',
-                                name: "addNewCoinRefund",
-                                component: () => import("../views/refund/gold/addNewCoinRefund.vue"),
-                                meta: { permissionId: 58 }
+                                meta: { permissionId: 62 }
                             }
                         ]
                     },
@@ -224,36 +228,49 @@ const routes = [
                         path: '/usergold',
                         name: "usergold",
                         component: () => import("../views/usergold/gold/clientCount.vue"),
-                        // redirect: '/usergold/detail',
-                        meta: { permissionId: 8 },
+                        meta: { permissionId: 10 },
                         children: [
                             // 金币明细
                             {
                                 path: 'detail',
                                 name: "clientCountDetail",
                                 component: () => import("../views/usergold/gold/clientCountDetail.vue"),
-                                meta: { permissionId: 23 } // 对应"查看金币明细"id=23
+                                meta: { permissionId: 63 }
                             },
                             // 金币余额
                             {
                                 path: 'balance',
                                 name: "clientCountBalance",
                                 component: () => import("../views/usergold/gold/clientCountBalance.vue"),
-                                meta: { permissionId: 24 } // 对应"查看金币余额"id=24
+                                meta: { permissionId: 64 }
                             },
                         ]
                     },
-                    {
-                        path: 'userbean',
-                        name: "userbean",
-                        component: () => import("../views/usergold/bean/userbean.vue"),
-                        meta: { permissionId: 45 }
-                    },
+                    // {
+                    //     path: 'userbean',
+                    //     name: "userbean",
+                    //     component: () => import("../views/usergold/bean/userbean.vue"),
+                    //     meta: { permissionId: 45 }
+                    // },
                     {
                         path: '/history',
                         name: "history",
                         component: () => import("../views/history/history.vue"),
-                        meta: { permissionId: [56, 57] }
+                        meta: { permissionId: 12 },
+                        children: [
+                            // {
+                            //     path: 'newHistory',
+                            //     name: "newHistory",
+                            //     component: () => import("../views/history/newHistory.vue"),
+                            //     meta: { permissionId: 12 }
+                            // },
+                            // {
+                            //     path: 'oldHistory',
+                            //     name: "oldHistory",
+                            //     component: () => import("../views/history/oldHistory.vue"),
+                            //     meta: { permissionId: 12 }
+                            // }
+                        ]
                     },
 
                     // 权限管理
@@ -261,21 +278,21 @@ const routes = [
                         path: '/permissions',
                         name: "permissions",
                         component: () => import("../views/permissions/permissions.vue"),
-                        meta: { permissionId: 9 },
+                        meta: { permissionId: 11 },
                         children: [
                             // 用户权限
                             {
                                 path: 'userPermission',
                                 name: "userPermission",
                                 component: () => import("../views/permissions/userPermission.vue"),
-                                meta: { permissionId: 25 }
+                                meta: { permissionId: [24,65,66,67,68,69] }
                             },
                             // 角色权限
                             {
                                 path: 'rolePermission',
                                 name: "rolePermission",
                                 component: () => import("../views/permissions/rolePermission.vue"),
-                                meta: { permissionId: 30 }
+                                meta: { permissionId: [25,70,71,72] }
                             },
                         ]
                     },
@@ -368,6 +385,7 @@ router.beforeEach(async (to, from, next) => {
 
         // 拿权限id
         userPermissionIds = getAllPermissionIds(menuTree.value)
+        console.log("userPermissionIds",userPermissionIds)
 
         // 2.4 权限验证（逻辑不变）
         console.log('to.meta:', to.meta)
diff --git a/src/utils/menuUtils.js b/src/utils/menuUtils.js
index ac7a2b3..78918df 100644
--- a/src/utils/menuUtils.js
+++ b/src/utils/menuUtils.js
@@ -43,14 +43,14 @@ export const getRoutePath = (menu) => {
     // 路由映射表：key为接口menuName，value为对应路由路径
     const routeMap = {
 
-        '工作台展示': '/workbench',
+        '工作台查看': '/workbench',
         '金币管理': '/goldManage',
         '现金管理': '/moneyManage',
 
         '金币审核': '/audit',
         '金豆审核': '/beanAudit',
 
-        '汇率管理': '/rate',
+        '现金汇率': '/rate',
 
 
         '金币充值': '/coinRecharge',
@@ -71,6 +71,9 @@ export const getRoutePath = (menu) => {
 
         '金币客户账户明细': '/usergold',
         '金豆客户账户明细': '/userbean',
+
+        '用户管理': '/permissions/userPermission',
+        '角色管理': '/permissions/rolePermission',
     };
 
     // 未匹配的菜单默认使用id作为路由（可根据实际需求调整）

From 14b78d0fdcbb4be905ff509e46b8a7ada9566e16 Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Wed, 17 Sep 2025 16:24:15 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E6=9D=83=E9=99=90=E5=88=9D=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/audit/gold/audit.vue           | 5 +++--
 src/views/consume/bean/beanConsume.vue   | 8 ++++----
 src/views/consume/gold/coinConsume.vue   | 6 +++---
 src/views/managerecharge/rate.vue        | 8 ++++----
 src/views/recharge/bean/beanRecharge.vue | 6 +++---
 src/views/recharge/gold/coinRecharge.vue | 4 ++--
 6 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/views/audit/gold/audit.vue b/src/views/audit/gold/audit.vue
index f39ae61..85caee9 100644
--- a/src/views/audit/gold/audit.vue
+++ b/src/views/audit/gold/audit.vue
@@ -42,8 +42,9 @@ const navigateTo = (name) => {
 const initPermissions = () => {
   if (!menuTree.value || !menuTree.value.length) return;
 
-  hasRecharge.value = hasMenuPermission(menuTree.value, permissionMapping.Recharge_Audit);
-  hasRefund.value = hasMenuPermission(menuTree.value, permissionMapping.Refund_Audit);
+  hasRecharge.value = hasMenuPermission(menuTree.value, permissionMapping.rechargeAudit);
+  hasRefund.value = hasMenuPermission(menuTree.value, permissionMapping.refundAudit);
+  console.log('看看权限树',menuTree.value,'permissionMapping.Recharge_Audit:',permissionMapping.Recharge_Audit)
 };
 
 // 默认跳转逻辑
diff --git a/src/views/consume/bean/beanConsume.vue b/src/views/consume/bean/beanConsume.vue
index 715ba57..496297b 100644
--- a/src/views/consume/bean/beanConsume.vue
+++ b/src/views/consume/bean/beanConsume.vue
@@ -68,10 +68,10 @@ const navigateTo = (name) => {
 const initPermissions = () => {
   if (!menuTree.value || !menuTree.value.length) return;
 
-  hasAdd.value = hasMenuPermission(menuTree.value, permissionMapping.Submit_Golden_Bean_Consumption);
-  hasLive.value = hasMenuPermission(menuTree.value, permissionMapping.View_Golden_Bean_Live_Consumption_Details);
-  hasFan.value = hasMenuPermission(menuTree.value, permissionMapping.View_Golden_Bean_Fan_Consumption_Details);
-  hasArticleVideo.value = hasMenuPermission(menuTree.value, permissionMapping.View_Golden_Bean_Article_Video_Consumption_Details);
+  hasAdd.value = hasMenuPermission(menuTree.value, permissionMapping.addBeanConsume);
+  hasLive.value = hasMenuPermission(menuTree.value, permissionMapping.beanZBDetail);
+  hasFan.value = hasMenuPermission(menuTree.value, permissionMapping.beanTFDetail);
+  hasArticleVideo.value = hasMenuPermission(menuTree.value, permissionMapping.beanSPWZDetail);
 };
 
 // 默认跳转逻辑
diff --git a/src/views/consume/gold/coinConsume.vue b/src/views/consume/gold/coinConsume.vue
index f432bd3..2838da3 100644
--- a/src/views/consume/gold/coinConsume.vue
+++ b/src/views/consume/gold/coinConsume.vue
@@ -42,8 +42,8 @@ const navigateTo = (name) => {
 // 初始化权限状态
 const initPermissions = () => {
   if (!menuTree.value || !menuTree.value.length) return;
-  hasAdd.value = hasMenuPermission(menuTree.value, permissionMapping.Submit_Gold_Coin_Consumption);
-  hasDetail.value = hasMenuPermission(menuTree.value, permissionMapping.View_Gold_Coin_Consumption_Details);
+  hasAdd.value = hasMenuPermission(menuTree.value, permissionMapping.addCoinConsume);
+  hasDetail.value = hasMenuPermission(menuTree.value, permissionMapping.coinConsumeDetail);
 };
 
 // 默认跳转逻辑
@@ -51,7 +51,7 @@ const getDefaultAuditRoute = () => {
   initPermissions();
   if (hasDetail.value) return 'coinConsumeDetail';
   if (hasAdd.value) return 'addCoinConsume';
-  return 'addCoinConsume';
+  return 'coinConsumeDetail';
 };
 
 // 监听路由变化更新标签状态
diff --git a/src/views/managerecharge/rate.vue b/src/views/managerecharge/rate.vue
index 0d3eed1..436e18a 100644
--- a/src/views/managerecharge/rate.vue
+++ b/src/views/managerecharge/rate.vue
@@ -122,10 +122,10 @@ const getEditData = async function (row) {
   }
 }
 const editRole = ref(true)
-editRole.value = findMenuById(menuTree.value, permissionMapping.Exchange_Rate_Modification)
+editRole.value = findMenuById(menuTree.value, permissionMapping.rateEdit)
 // 编辑汇率
 const editRate = async function () {
-  if (findMenuById(menuTree.value, permissionMapping.Exchange_Rate_Modification)) {
+  if (findMenuById(menuTree.value, permissionMapping.rateEdit)) {
     // 提交前验证 汇率是否为数字
     rateEdit.value.num = parseFloat(rateEdit.value.num);
     try {
@@ -265,9 +265,9 @@ onMounted(async function () {
           <span>{{ formatDate(scope.row.updateTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" :span="3" v-if="editRole">
+      <el-table-column label="操作" :span="3">
         <template #default="scope">
-          <el-button type="text" @click="() => {
+          <el-button :disabled="!editRole" type="text" @click="() => {
             regeEdit = true
             getEditData(scope.row)
           }">编辑
diff --git a/src/views/recharge/bean/beanRecharge.vue b/src/views/recharge/bean/beanRecharge.vue
index dda8a5e..6b532ce 100644
--- a/src/views/recharge/bean/beanRecharge.vue
+++ b/src/views/recharge/bean/beanRecharge.vue
@@ -46,9 +46,9 @@ const navigateTo = (name) => {
 const initPermissions = () => {
   if (!menuTree.value || !menuTree.value.length) return;
 
-  hasAdd.value = hasMenuPermission(menuTree.value, permissionMapping.Submit_Golden_Bean_Recharge);
-  hasSystem.value = hasMenuPermission(menuTree.value, permissionMapping.View_Golden_Bean_System_Recharge_Details);
-  hasOnline.value = hasMenuPermission(menuTree.value, permissionMapping.View_Golden_Bean_Online_Recharge_Details);
+  hasAdd.value = hasMenuPermission(menuTree.value, permissionMapping.addBeanRecharge);
+  hasSystem.value = hasMenuPermission(menuTree.value, permissionMapping.beanSystemRecharge);
+  hasOnline.value = hasMenuPermission(menuTree.value, permissionMapping.beanOnlineRecharge);
 };
 
 // 默认跳转逻辑
diff --git a/src/views/recharge/gold/coinRecharge.vue b/src/views/recharge/gold/coinRecharge.vue
index 2cfd260..ddb7449 100644
--- a/src/views/recharge/gold/coinRecharge.vue
+++ b/src/views/recharge/gold/coinRecharge.vue
@@ -40,8 +40,8 @@ const navigateTo = (name) => {
 const initPermissions = () => {
   if (!menuTree.value || !menuTree.value.length) return;
 
-  hasAdd.value = hasMenuPermission(menuTree.value, permissionMapping.Submit_Gold_Coin_Recharge);
-  hasDetail.value = hasMenuPermission(menuTree.value, permissionMapping.View_Gold_Coin_Recharge_Details);
+  hasAdd.value = hasMenuPermission(menuTree.value, permissionMapping.addCoinRecharge);
+  hasDetail.value = hasMenuPermission(menuTree.value, permissionMapping.coinRechargeDetail);
 };
 
 // 默认跳转逻辑

From 2143865f8e79720393a26129203b6c5495f4b9c8 Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Fri, 19 Sep 2025 11:09:12 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E9=87=91=E5=B8=81=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/menuTreePermission.js        |  2 +-
 src/views/audit/gold/audit.vue         | 13 ++++++-
 src/views/audit/gold/rechargeAudit.vue | 62 +++++++++++++++++++++++++++++++---
 3 files changed, 70 insertions(+), 7 deletions(-)

diff --git a/src/utils/menuTreePermission.js b/src/utils/menuTreePermission.js
index 5cf92e6..c18d2a0 100644
--- a/src/utils/menuTreePermission.js
+++ b/src/utils/menuTreePermission.js
@@ -50,7 +50,7 @@ export const permissionMapping = {
     refundWaitReject:41,           // 退款审核驳回
 
     beanWait:42,                   // 金豆审核待审核
-    beanWaitThough:43,             // 金豆审核已通过
+    beanThrough:43,             // 金豆审核已通过
     beanReject:44,                 // 金豆审核已驳回
     beanWaitShow:45,               // 金豆审核待审核查看
     beanWaitThough:46,             // 金豆审核通过
diff --git a/src/views/audit/gold/audit.vue b/src/views/audit/gold/audit.vue
index 85caee9..532f69b 100644
--- a/src/views/audit/gold/audit.vue
+++ b/src/views/audit/gold/audit.vue
@@ -22,6 +22,7 @@ import { useRouter, useRoute } from 'vue-router';
 import { storeToRefs } from 'pinia';
 import { useAdminStore } from '@/store/index.js';
 import { hasMenuPermission, permissionMapping } from "@/utils/menuTreePermission.js";
+import { ElMessage } from 'element-plus';
 
 const router = useRouter();
 const route = useRoute();
@@ -33,6 +34,17 @@ const hasRecharge = ref(false);
 const hasRefund = ref(false);
 // 导航方法
 const navigateTo = (name) => {
+  if(name == 'rechargeAudit'){
+    if(!hasRecharge){
+      ElMessage.error('您暂无充值审核操作权限')
+      return;
+    }
+  }else if(name = 'refundAudit'){
+   if(!hasRefund){
+      ElMessage.error('您暂无退款审核操作权限')
+      return;
+    } 
+  }
   activeTab.value = name;
   router.push({ name });
 };
@@ -44,7 +56,6 @@ const initPermissions = () => {
 
   hasRecharge.value = hasMenuPermission(menuTree.value, permissionMapping.rechargeAudit);
   hasRefund.value = hasMenuPermission(menuTree.value, permissionMapping.refundAudit);
-  console.log('看看权限树',menuTree.value,'permissionMapping.Recharge_Audit:',permissionMapping.Recharge_Audit)
 };
 
 // 默认跳转逻辑
diff --git a/src/views/audit/gold/rechargeAudit.vue b/src/views/audit/gold/rechargeAudit.vue
index 74c16f9..4c0fd49 100644
--- a/src/views/audit/gold/rechargeAudit.vue
+++ b/src/views/audit/gold/rechargeAudit.vue
@@ -42,7 +42,7 @@
         </div>
         <div class="selectRow" style="justify-content: flex-start;">
           <el-button @click="resetSearch" type="success">重置</el-button>
-        <el-button @click="handleSearch" type="primary">查询</el-button>
+          <el-button @click="handleSearch" type="primary">查询</el-button>
         </div>
       </div>
     </el-col>
@@ -176,7 +176,7 @@ import { storeToRefs } from "pinia";
 
 const adminStore = useAdminStore();
 const { adminData, menuTree } = storeToRefs(adminStore);
-import { findMenuById, permissionMapping } from "@/utils/menuTreePermission.js"
+import { findMenuById, permissionMapping, hasMenuPermission } from "@/utils/menuTreePermission.js"
 import dayjs from "dayjs";
 
 const defaultTime = [
@@ -221,6 +221,27 @@ const getObj = ref({
   pageNum: 1,
   pageSize: 50
 })
+
+//操作权限
+const hasrechargeThrough = ref(false)  // 充值审核已通过
+const hasrechargeReject = ref(false)  // 充值审核已驳回
+const hasrechargeWait = ref(false)  // 充值审核已驳回
+const hasrechargeWaitShow = ref(false) // 充值审核待审核查看
+const hasrechargeWaitThough = ref(false) // 充值审核通过
+const hasrechargeWaitReject = ref(false) // 充值审核驳回
+
+// 初始化权限状态
+const initPermissions = () => {
+  if (!menuTree.value || !menuTree.value.length) return;
+  hasrechargeThrough.value = hasMenuPermission(menuTree.value, permissionMapping.hasrechargeThrough);
+  hasrechargeReject.value = hasMenuPermission(menuTree.value, permissionMapping.hasrechargeReject);
+  hasrechargeWait.value = hasMenuPermission(menuTree.value, permissionMapping.hasrechargeWait);
+  hasrechargeWaitShow.value = hasMenuPermission(menuTree.value, permissionMapping.hasrechargeWaitShow);
+  hasrechargeWaitThough.value = hasMenuPermission(menuTree.value, permissionMapping.hasrechargeWaitThough);
+  hasrechargeWaitReject.value = hasMenuPermission(menuTree.value, permissionMapping.hasrechargeWaitReject);
+
+};
+
 // 支付方式选项
 const payModel = [
   {
@@ -282,6 +303,11 @@ const rules = reactive({
 })
 // 搜索方法
 const getRecharge = async function (val) {
+
+  if (!hasrechargeWaitShow) {
+    ElMessage.error('暂无权限')
+    return
+  }
   try {
     if (getTime.value && getTime.value.length === 2) {
       rechargeAudit.value.startTime = formatTime(getTime.value[0])
@@ -320,9 +346,13 @@ const getRecharge = async function (val) {
   } catch (error) {
     console.log('请求失败', error)
   }
+
 }
 
 const getStats = async () => {
+   if (!hasrechargeWaitShow) {
+    return
+  }
   try {
     const params = {
       pageNum: getObj.value.pageNum,
@@ -446,10 +476,22 @@ const adminReject = async function () {
 const handleClick = function (tab, event) {
   activeName.value = tab.props.name
   if (tab.props.name === 'wait') {
+    if(!hasrechargeWait){
+      ElMessage.error('暂无权限')
+      return
+    }
     adminWait()
   } else if (tab.props.name === 'pass') {
+    if(!hasrechargeThrough){
+      ElMessage.error('暂无权限')
+      return
+    }
     adminPass()
   } else if (tab.props.name === 'reject') {
+    if(!hasrechargeReject){
+      ElMessage.error('暂无权限')
+      return
+    }
     adminReject()
   }
 }
@@ -477,6 +519,10 @@ const handlePagination = (type, val) => {
 const clicked = ref(false);
 // 处理通过操作
 const handleApprove = async (row) => {
+    if(!hasrechargeWaitThough){
+      ElMessage.error('暂无权限')
+      return
+    }
   clicked.value = true
   if (findMenuById(menuTree.value, permissionMapping.Recharge_Approval)) {
     try {
@@ -497,17 +543,21 @@ const handleApprove = async (row) => {
     }
   } else {
     clicked.value = false
-    ElMessage.error('无权限')
+    ElMessage.error('暂无权限')
   }
 
 }
 const showRejectDialog = (row) => {
+    if(!hasrechargeWaitReject){
+      ElMessage.error('暂无权限')
+      return
+    }
   currentRecord.value = row
   rejectReason.value = ''
   if (findMenuById(menuTree.value, permissionMapping.Recharge_Approval)) {
     rejectDialogVisible.value = true
   } else {
-    ElMessage.error('无权限')
+    ElMessage.error('暂无权限')
   }
 }
 //控制驳回确认按钮禁用状态
@@ -540,7 +590,7 @@ const handleReject = async () => {
       ElMessage.error('操作失败')
     }
   } else {
-    ElMessage.error('无权限')
+    ElMessage.error('暂无权限')
     cancelClicked.value = false
   }
 }
@@ -657,6 +707,8 @@ onMounted(async function () {
   await getRecharge()
   console.log("看看通信来的用户身份", adminData.value)
   await getStats()
+
+  initPermissions()
 })
 </script>
 

From 60cd27eb6d807735930e402fcf3352aa68575757 Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Fri, 19 Sep 2025 11:09:22 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E9=87=91=E5=B8=81=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/audit/bean/beanAudit.vue     |  20 +++++
 src/views/audit/gold/rechargeAudit.vue |  35 +++-----
 src/views/audit/gold/refundAudit.vue   | 155 ++++++++++++++++++++-------------
 3 files changed, 128 insertions(+), 82 deletions(-)

diff --git a/src/views/audit/bean/beanAudit.vue b/src/views/audit/bean/beanAudit.vue
index 243953a..2f94bb6 100644
--- a/src/views/audit/bean/beanAudit.vue
+++ b/src/views/audit/bean/beanAudit.vue
@@ -132,6 +132,26 @@ const reason = ref('')
 const rejectRow = ref({
   id: null
 })// 驳回行数据
+
+// 操作权限（金豆审核相关，与充值权限格式对齐）
+const hasbeanWait = ref(false)        // 金豆审核待审核（对应beanWait:42）
+const hasbeanThrough = ref(false)     // 金豆审核已通过（对应beanThrough:43）
+const hasbeanReject = ref(false)      // 金豆审核已驳回（对应beanReject:44）
+const hasbeanWaitShow = ref(false)    // 金豆审核待审核查看（对应beanWaitShow:45）
+const hasbeanWaitThough = ref(false)  // 金豆审核通过（对应beanWaitThough:46）
+const hasbeanWaitReject = ref(false)  // 金豆审核驳回（对应beanWaitReject:47）
+
+// 初始化权限状态（补充金豆审核权限，与充值权限初始化逻辑并列）
+const initPermissions = () => {
+  if (!menuTree.value || !menuTree.value.length) return;
+  // 2. 金豆审核相关权限初始化（新增，与充值权限结构一致）
+  hasbeanWait.value = hasMenuPermission(menuTree.value, permissionMapping.hasbeanWait);
+  hasbeanThrough.value = hasMenuPermission(menuTree.value, permissionMapping.hasbeanThrough);
+  hasbeanReject.value = hasMenuPermission(menuTree.value, permissionMapping.hasbeanReject);
+  hasbeanWaitShow.value = hasMenuPermission(menuTree.value, permissionMapping.hasbeanWaitShow);
+  hasbeanWaitThough.value = hasMenuPermission(menuTree.value, permissionMapping.hasbeanWaitThough);
+  hasbeanWaitReject.value = hasMenuPermission(menuTree.value, permissionMapping.hasbeanWaitReject);
+};
 const clicked = ref(false)
 // 状态常量
 const STATUS = {
diff --git a/src/views/audit/gold/rechargeAudit.vue b/src/views/audit/gold/rechargeAudit.vue
index 4c0fd49..2b1feaa 100644
--- a/src/views/audit/gold/rechargeAudit.vue
+++ b/src/views/audit/gold/rechargeAudit.vue
@@ -176,7 +176,7 @@ import { storeToRefs } from "pinia";
 
 const adminStore = useAdminStore();
 const { adminData, menuTree } = storeToRefs(adminStore);
-import { findMenuById, permissionMapping, hasMenuPermission } from "@/utils/menuTreePermission.js"
+import { permissionMapping, hasMenuPermission } from "@/utils/menuTreePermission.js"
 import dayjs from "dayjs";
 
 const defaultTime = [
@@ -233,12 +233,14 @@ const hasrechargeWaitReject = ref(false) // 充值审核驳回
 // 初始化权限状态
 const initPermissions = () => {
   if (!menuTree.value || !menuTree.value.length) return;
-  hasrechargeThrough.value = hasMenuPermission(menuTree.value, permissionMapping.hasrechargeThrough);
-  hasrechargeReject.value = hasMenuPermission(menuTree.value, permissionMapping.hasrechargeReject);
-  hasrechargeWait.value = hasMenuPermission(menuTree.value, permissionMapping.hasrechargeWait);
-  hasrechargeWaitShow.value = hasMenuPermission(menuTree.value, permissionMapping.hasrechargeWaitShow);
-  hasrechargeWaitThough.value = hasMenuPermission(menuTree.value, permissionMapping.hasrechargeWaitThough);
+  hasrechargeThrough.value = hasMenuPermission(menuTree.value, permissionMapping.rechargeThrough);
+  hasrechargeReject.value = hasMenuPermission(menuTree.value, permissionMapping.rechargeReject);
+  hasrechargeWait.value = hasMenuPermission(menuTree.value, permissionMapping.rechargeWait);
+  hasrechargeWaitShow.value = hasMenuPermission(menuTree.value, permissionMapping.rechargeWaitShow);
+  hasrechargeWaitThough.value = hasMenuPermission(menuTree.value, permissionMapping.rechargeWaitThough);
   hasrechargeWaitReject.value = hasMenuPermission(menuTree.value, permissionMapping.hasrechargeWaitReject);
+  console.log(hasrechargeWaitThough.value)
+  console.log(hasrechargeWaitReject.value)
 
 };
 
@@ -524,7 +526,6 @@ const handleApprove = async (row) => {
       return
     }
   clicked.value = true
-  if (findMenuById(menuTree.value, permissionMapping.Recharge_Approval)) {
     try {
       const params = {
         orderCode: row.orderCode,
@@ -541,10 +542,7 @@ const handleApprove = async (row) => {
       console.error('审核通过失败', error)
       ElMessage.error('操作失败')
     }
-  } else {
-    clicked.value = false
-    ElMessage.error('暂无权限')
-  }
+  
 
 }
 const showRejectDialog = (row) => {
@@ -554,18 +552,17 @@ const showRejectDialog = (row) => {
     }
   currentRecord.value = row
   rejectReason.value = ''
-  if (findMenuById(menuTree.value, permissionMapping.Recharge_Approval)) {
-    rejectDialogVisible.value = true
-  } else {
-    ElMessage.error('暂无权限')
-  }
+  rejectDialogVisible.value = true
 }
 //控制驳回确认按钮禁用状态
 const cancelClicked = ref(false)
 // 处理驳回操作
 const handleReject = async () => {
+   if(!hasrechargeWaitReject){
+      ElMessage.error('暂无权限')
+      return
+    }
   cancelClicked.value = true
-  if (findMenuById(menuTree.value, permissionMapping.Recharge_Approval)) {
 
     if (!rejectReason.value.trim()) {
       ElMessage.warning('请输入驳回理由')
@@ -589,10 +586,6 @@ const handleReject = async () => {
       console.error('驳回操作失败', error)
       ElMessage.error('操作失败')
     }
-  } else {
-    ElMessage.error('暂无权限')
-    cancelClicked.value = false
-  }
 }
 // 处理排序事件
 const handleSortChange = (column) => {
diff --git a/src/views/audit/gold/refundAudit.vue b/src/views/audit/gold/refundAudit.vue
index 2f49ed2..22fcc34 100644
--- a/src/views/audit/gold/refundAudit.vue
+++ b/src/views/audit/gold/refundAudit.vue
@@ -21,13 +21,13 @@
         </div>
         <div class="selectRow">
           <el-text class="text" size="large">所属地区：</el-text>
-          <el-cascader class="selectContent" style="width: 12vw;" v-model="selectedMarketPath" :options="market" placeholder="请选择所属地区"
-            clearable @change="handleMarketChange" />
+          <el-cascader class="selectContent" style="width: 12vw;" v-model="selectedMarketPath" :options="market"
+            placeholder="请选择所属地区" clearable @change="handleMarketChange" />
         </div>
       </div>
     </el-col>
     <el-col>
-        <div class="select">
+      <div class="select">
         <div class="selectRow" style="width: 36vw;">
           <el-text class="text" size="large">
             {{ activeName === 'wait' ? '提交时间：' : '审核时间：' }}
@@ -43,7 +43,7 @@
         </div>
         <div class="selectRow" style="justify-content: flex-start;">
           <el-button @click="resetSearch" type="success">重置</el-button>
-        <el-button @click="handleSearch" type="primary">查询</el-button>
+          <el-button @click="handleSearch" type="primary">查询</el-button>
         </div>
       </div>
     </el-col>
@@ -169,9 +169,8 @@ import API from '@/util/http.js'
 import moment from 'moment'
 import { useAdminStore } from "@/store/index.js";
 import { storeToRefs } from "pinia";
-import { findMenuById, permissionMapping } from "@/utils/menuTreePermission.js"
 import dayjs from "dayjs";
-
+import { permissionMapping, hasMenuPermission } from "@/utils/menuTreePermission.js"
 const adminStore = useAdminStore();
 const { adminData, menuTree } = storeToRefs(adminStore);
 const defaultTime = [
@@ -232,6 +231,28 @@ const activeName = ref('wait')
 const sortField = ref('')
 const sortOrder = ref('')
 const market = ref("")
+
+//退款操作权限
+const hasrefundThrough = ref(false)  // 退款审核已通过
+const hasrefundReject = ref(false)   // 退款审核已驳回
+const hasrefundWait = ref(false)     // 退款审核待审核
+const hasrefundWaitShow = ref(false) // 退款审核待审核查看
+const hasrefundWaitThough = ref(false) // 退款审核通过
+const hasrefundWaitReject = ref(false) // 退款审核驳回
+
+// 初始化权限状态
+const initPermissions = () => {
+  if (!menuTree.value || !menuTree.value.length) return;
+  // 退款相关权限
+  hasrefundThrough.value = hasMenuPermission(menuTree.value, permissionMapping.refundThrough);
+  hasrefundReject.value = hasMenuPermission(menuTree.value, permissionMapping.refundReject);
+  hasrefundWait.value = hasMenuPermission(menuTree.value, permissionMapping.refundWait);
+  hasrefundWaitShow.value = hasMenuPermission(menuTree.value, permissionMapping.refundWaitShow);
+  hasrefundWaitThough.value = hasMenuPermission(menuTree.value, permissionMapping.refundWaitThough);
+  hasrefundWaitReject.value = hasMenuPermission(menuTree.value, permissionMapping.refundWaitReject);
+  console.log('退款权限赋值完成');
+
+};
 // 处理排序事件
 const handleSortChange = (column) => {
   if (column.prop === 'sumGold') {
@@ -256,6 +277,10 @@ const handleSortChange = (column) => {
 }
 // 显示驳回对话框
 const showRejectDialog = (row) => {
+  if (!hasrefundWaitReject) {
+    ElMessage.error('暂无权限')
+    return
+  }
   scopeValue.value = row
   rejectReason.value = ''
   rejectDialogVisible.value = true
@@ -272,6 +297,10 @@ const getRefundGoods = async () => {
 
 // 搜索方法
 const get = async function (val) {
+  if (!hasrefundWaitShow) {
+    ElMessage.error('暂无权限')
+    return
+  }
   try {
     if (typeof val === 'number') {
       pagination.value.pageNum = val
@@ -319,65 +348,67 @@ const get = async function (val) {
 const clicked = ref(false);
 // 通过
 const handleApprove = async (row) => {
+  if (!hasrefundWaitThough) {
+    ElMessage.error('暂无权限')
+    return
+  }
   clicked.value = true
-  if (findMenuById(menuTree.value, permissionMapping.Refund_Approval)) {
-    try {
-      const params = {
-        orderCode: row.orderCode,
-        auditId: adminData.value.id,
-        action: 1,// action的1是通过,2是驳回
-        rejectReason: ''
-      }
-      await API({ url: '/audit/audit', data: params })
-      ElMessage.success('审核通过成功')
-      await get()
-      clicked.value = false
-      await getStats()
-    } catch (error) {
-      console.error('审核通过失败', error)
-      ElMessage.error('操作失败')
+  try {
+    const params = {
+      orderCode: row.orderCode,
+      auditId: adminData.value.id,
+      action: 1,// action的1是通过,2是驳回
+      rejectReason: ''
     }
-  } else {
-    ElMessage.warning('没有权限')
+    await API({ url: '/audit/audit', data: params })
+    ElMessage.success('审核通过成功')
+    await get()
     clicked.value = false
+    await getStats()
+  } catch (error) {
+    console.error('审核通过失败', error)
+    ElMessage.error('操作失败')
   }
+
 }
 //控制驳回确认按钮禁用状态
 const cancelClicked = ref(false)
 // 处理驳回操作
 const handleReject = async () => {
+  if (!hasrefundWaitReject) {
+    ElMessage.error('暂无权限')
+    return
+  }
   cancelClicked.value = true
-  if (findMenuById(menuTree.value, permissionMapping.Refund_Approval)) {
 
-    if (!rejectReason.value.trim()) {
-      ElMessage.warning('请输入驳回理由')
-      return
-    }
-    try {
-      const params = {
-        orderCode: scopeValue.value.orderCode,
-        auditId: adminData.value.id,
-        action: 2,
-        rejectReason: rejectReason.value
-      }
-      await API({ url: '/audit/audit', data: params })
-      ElMessage.success('驳回成功')
-      rejectDialogVisible.value = false
-      await get()
-      cancelClicked.value = false
-      await getStats()
-      console.log('看看驳回参数', params)
-    } catch (error) {
-      console.error('驳回失败', error)
-      ElMessage.error('操作失败')
+  if (!rejectReason.value.trim()) {
+    ElMessage.warning('请输入驳回理由')
+    return
+  }
+  try {
+    const params = {
+      orderCode: scopeValue.value.orderCode,
+      auditId: adminData.value.id,
+      action: 2,
+      rejectReason: rejectReason.value
     }
-  } else {
-    ElMessage.warning('没有权限')
+    await API({ url: '/audit/audit', data: params })
+    ElMessage.success('驳回成功')
+    rejectDialogVisible.value = false
+    await get()
     cancelClicked.value = false
+    await getStats()
+    console.log('看看驳回参数', params)
+  } catch (error) {
+    console.error('驳回失败', error)
+    ElMessage.error('操作失败')
   }
 }
 
 const getStats = async () => {
+  if (!hasrefundWaitShow) {
+    return
+  }
   try {
     const params = {
       pageNum: pagination.value.pageNum,
@@ -473,26 +504,27 @@ const get7Days = function () {
 const handleClick = function (tab, event) {
   activeName.value = tab.props.name
   if (tab.props.name === 'wait') {
+    console.log(hasrefundWait.value);
+     if (!hasrefundWait) {
+        ElMessage.error('暂无权限')
+        return
+      }
     adminWait()
   } else if (tab.props.name === 'pass') {
+    if (hasrefundThrough.value) {
+        ElMessage.error('暂无权限')
+        return
+      }
     adminPass()
   } else if (tab.props.name === 'reject') {
+      if (!hasrefundReject) {
+        ElMessage.error('暂无权限')
+        return
+      }
     adminReject()
   }
 }
-// 当前状态
-const getCurrentStatus = () => {
-  switch (activeName.value) {
-    case 'wait':
-      return STATUS.PENDING
-    case 'pass':
-      return STATUS.APPROVED
-    case 'reject':
-      return STATUS.REJECTED
-    default:
-      return ''
-  }
-}
+
 // 待审核
 const adminWait = async function () {
   checkTab.value = 'pending'
@@ -584,6 +616,7 @@ onMounted(async () => {
   await getMarket()
   await get()
   await getStats()
+  initPermissions()
 })
 </script>
 

From e47b4b70ca3d86259de38835eaaf65f23c118928 Mon Sep 17 00:00:00 2001
From: lihuilin <analsak@163.com>
Date: Fri, 19 Sep 2025 11:44:22 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E6=9D=83=E9=99=90=E9=87=8D=E6=9E=842?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                            | 104 ++--
 src/utils/menuTreePermission.js                |   9 +-
 src/utils/menuUtils.js                         |   9 +-
 src/views/history/history.vue                  | 244 +++------
 src/views/history/newHistory.vue               | 119 ++++
 src/views/history/oldHistory.vue               | 117 ++++
 src/views/permissions/permissions.vue          |  35 +-
 src/views/permissions/rolePermission.vue       |  25 +-
 src/views/permissions/userPermission.vue       |  64 ++-
 src/views/refund/gold/addCoinRefund.vue        |   5 +
 src/views/refund/gold/addNewCoinRefund.vue     | 726 -------------------------
 src/views/refund/gold/coinRefund.vue           |   8 +-
 src/views/refund/gold/coinRefundDetail.vue     |  23 +-
 src/views/usergold/bean/userbean.vue           |   9 +-
 src/views/usergold/gold/clientCount.vue        |   4 +-
 src/views/usergold/gold/clientCountBalance.vue |  22 +-
 src/views/usergold/gold/clientCountDetail.vue  |  53 +-
 17 files changed, 475 insertions(+), 1101 deletions(-)
 create mode 100644 src/views/history/newHistory.vue
 create mode 100644 src/views/history/oldHistory.vue
 delete mode 100644 src/views/refund/gold/addNewCoinRefund.vue

diff --git a/src/router/index.js b/src/router/index.js
index 9f80aa1..63f6ee5 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -25,19 +25,20 @@ const routes = [
                 path: 'workbench',
                 name: "workbench",
                 component: () => import("../views/workspace/index.vue"),
-                meta: { permissionId: 10 } // 对应"工作台展示"id=10
+                meta: { permissionId: 13 } // 
             },
-
+            //金币管理
             {
                 path: '/goldManage',
                 name: 'goldManage',
+                meta:{permissionId:3},
                 children: [
                     // 审核
                     {
                         path: '/audit',
                         name: "audit",
                         component: () => import("../views/audit/gold/audit.vue"),
-                        meta: { permissionId: 40 },
+                        meta: { permissionId: 14 },
                         // redirect: '/index',
                         children: [
                             // 充值审核
@@ -45,21 +46,30 @@ const routes = [
                                 path: 'rechargeAudit',
                                 name: "rechargeAudit",
                                 component: () => import("../views/audit/gold/rechargeAudit.vue"),
-                                meta: { permissionId: [11, 12] } // 对应"查看充值审核"id=11、"充值审批"id=12
+                                meta: { permissionId: [28,30,31,32,33,34,35] } // 对应"查看充值审核"id=11、"充值审批"id=12
                             },
                             // 退款审核
                             {
                                 path: 'refundAudit',
                                 name: "refundAudit",
                                 component: () => import("../views/audit/gold/refundAudit.vue"),
-                                meta: { permissionId: [13, 14] } // 对应"查看退款审核"id=13、"退款审批"id=14
+                                meta: { permissionId: [29,36,37,38,39,40,41] } // 对应"查看退款审核"id=13、"退款审批"id=14
                             },
                         ]
                     }, {
-                        path: 'beanAudit',
+                        path: '/beanAudit',
                         name: "beanAudit",
                         component: () => import("../views/audit/bean/beanAudit.vue"),
-                        meta: { permissionId: [54, 55] }
+                        meta: { permissionId: 15 },
+                            children: [
+                            // 充值审核
+                            {
+                                path: 'addbeanAudit',
+                                name: "addbeanAudit",
+                                component: () => import("../views/audit/bean/beanAudit.vue"),
+                                meta: { permissionId: [42,43,44,45,46,47] } // 对应"查看充值审核"id=11、"充值审批"id=12
+                            },
+                        ]
                     },
 
 
@@ -69,21 +79,21 @@ const routes = [
                         name: "coinConsume",
                         component: () => import("../views/consume/gold/coinConsume.vue"),
                         // redirect: '/coinConsume/add',
-                        meta: { permissionId: 6 },
+                        meta: { permissionId: 19 },
                         children: [
                             // 金币新增消耗
                             {
                                 path: 'add',
                                 name: "addCoinConsume",
                                 component: () => import("../views/consume/gold/addCoinConsume.vue"),
-                                meta: { permissionId: 19 } // 对应"提交金币消耗"id=19
+                                meta: { permissionId: 55 } // 对应"提交金币消耗"id=19
                             },
                             // 金币消耗明细详情
                             {
                                 path: 'detail',
                                 name: "coinConsumeDetail",
                                 component: () => import("../views/consume/gold/coinConsumeDetail.vue"),
-                                meta: { permissionId: 20 } // 对应"查看金币消耗明细"id=20
+                                meta: { permissionId: 56 } // 对应"查看金币消耗明细"id=20
                             }
                         ]
                     },
@@ -92,35 +102,35 @@ const routes = [
                         path: '/beanConsume',
                         name: "beanConsume",
                         component: () => import("../views/consume/bean/beanConsume.vue"),
-                        meta: { permissionId: 42 },
+                        meta: { permissionId: 20 },
                         children: [
                             // 金豆新增消耗
                             {
                                 path: 'add',
                                 name: "addBeanConsume",
                                 component: () => import("../views/consume/bean/addBeanConsume.vue"),
-                                meta: { permissionId: 49 } // 对应"提交金豆消耗"id=49
+                                meta: { permissionId: 57 } // 对应"提交金豆消耗"id=49
                             },
                             // 直播
                             {
                                 path: 'live',
                                 name: "liveStream",
                                 component: () => import("../views/consume/bean/liveStream.vue"),
-                                meta: { permissionId: 50 } // 对应"直播"id=50
+                                meta: { permissionId: 58 } // 对应"直播"id=50
                             },
                             // 铁粉
                             {
                                 path: 'fan',
                                 name: "dieHardFan",
                                 component: () => import("../views/consume/bean/dieHardFan.vue"),
-                                meta: { permissionId: 51 } // 对应"铁粉"id=51
+                                meta: { permissionId: 59 } // 对应"铁粉"id=51
                             },
                             // 文章视频
                             {
                                 path: 'article',
                                 name: "articleVideo",
                                 component: () => import("../views/consume/bean/articleVideo.vue"),
-                                meta: { permissionId: 52 } // 对应"文章视频"id=52
+                                meta: { permissionId: 60 } // 对应"文章视频"id=52
                             }
 
                         ]
@@ -131,13 +141,14 @@ const routes = [
                         path: '/rate',
                         name: "rate",
                         component: () => import("../views/managerecharge/rate.vue"),
-                        meta: { permissionId: [15, 16] } // 对应"汇率查看"id=15、"汇率修改"id=16
+                        meta: { permissionId:  [16,48,49] } // 对应"汇率查看"id=15、"汇率修改"id=16
                     },
                     // 金币充值
                     {
                         path: '/coinRecharge',
                         name: "coinRecharge",
                         component: () => import("../views/recharge/gold/coinRecharge.vue"),
+                         meta: { permissionId:  17 },
                         // redirect: '/coinRecharge/add',
                         children: [
                             // 金币新增充值
@@ -145,14 +156,14 @@ const routes = [
                                 path: 'add',
                                 name: "addCoinRecharge",
                                 component: () => import("../views/recharge/gold/addCoinRecharge.vue"),
-                                meta: { permissionId: 17 } // 对应"提交金币充值"id=17
+                                meta: { permissionId: 50 } // 对应"提交金币充值"id=17
                             },
                             // 金币充值明细详情
                             {
                                 path: 'detail',
                                 name: "coinRechargeDetail",
                                 component: () => import("../views/recharge/gold/coinRechargeDetail.vue"),
-                                meta: { permissionId: 18 } // 对应"查看金币充值明细"id=18
+                                meta: { permissionId: 51 } // 对应"查看金币充值明细"id=18
                             }
                         ]
                     },
@@ -163,58 +174,52 @@ const routes = [
                         name: "beanRecharge",
                         component: () => import("../views/recharge/bean/beanRecharge.vue"),
                         // redirect: '/coinRecharge/add',
+                         meta: { permissionId:  18 },
                         children: [
                             // 金豆新增充值
                             {
                                 path: 'add',
                                 name: "addBeanRecharge",
                                 component: () => import("../views/recharge/bean/addBeanRecharge.vue"),
-                                meta: { permissionId: 46 } // 对应"提交金豆充值"id=46
+                                meta: { permissionId: 52 } // 对应"提交金豆充值"id=46
                             },
                             // 金豆系统充值
                             {
                                 path: 'system',
                                 name: "beanSystemRecharge",
                                 component: () => import("../views/recharge/bean/beanSystemRecharge.vue"),
-                                meta: { permissionId: 47 } // 对应"查看金豆系统充值明细"id=47
+                                meta: { permissionId: 53 } // 对应"查看金豆系统充值明细"id=47
                             },
                             // 金豆线上充值
                             {
                                 path: 'online',
                                 name: "beanOnlineRecharge",
                                 component: () => import("../views/recharge/bean/beanOnlineRecharge.vue"),
-                                meta: { permissionId: 48 } // 对应"查看金豆线上充值明细"id=48
+                                meta: { permissionId: 54 } // 对应"查看金豆线上充值明细"id=48
                             }
                         ]
                     },
 
-                    // 金币退款
+                     // 金币退款
                     {
                         path: '/coinRefund',
                         name: "coinRefund",
                         component: () => import("../views/refund/gold/coinRefund.vue"),
-                        // redirect: '/coinRefund/add',
-                        meta: { permissionId: 7 },
+                        meta: { permissionId: 9 },
                         children: [
                             // 金币新增退款
                             {
                                 path: 'add',
                                 name: "addCoinRefund",
                                 component: () => import("../views/refund/gold/addCoinRefund.vue"),
-                                meta: { permissionId: 21 } // 对应"提交金币退款"id=21
+                                meta: { permissionId: 61 }
                             },
                             // 金币退款明细详情
                             {
                                 path: 'detail',
                                 name: "coinRefundDetail",
                                 component: () => import("../views/refund/gold/coinRefundDetail.vue"),
-                                meta: { permissionId: 22 } // 对应"查看金币退款明细"id=22
-                            },
-                            {
-                                path: 'addRefund',
-                                name: "addNewCoinRefund",
-                                component: () => import("../views/refund/gold/addNewCoinRefund.vue"),
-                                meta: { permissionId: 58 }
+                                meta: { permissionId: 62 }
                             }
                         ]
                     },
@@ -224,27 +229,26 @@ const routes = [
                         path: '/usergold',
                         name: "usergold",
                         component: () => import("../views/usergold/gold/clientCount.vue"),
-                        // redirect: '/usergold/detail',
-                        meta: { permissionId: 8 },
+                        meta: { permissionId: 10 },
                         children: [
                             // 金币明细
                             {
                                 path: 'detail',
                                 name: "clientCountDetail",
                                 component: () => import("../views/usergold/gold/clientCountDetail.vue"),
-                                meta: { permissionId: 23 } // 对应"查看金币明细"id=23
+                                meta: { permissionId: 63 }
                             },
                             // 金币余额
                             {
                                 path: 'balance',
                                 name: "clientCountBalance",
                                 component: () => import("../views/usergold/gold/clientCountBalance.vue"),
-                                meta: { permissionId: 24 } // 对应"查看金币余额"id=24
+                                meta: { permissionId: 64 }
                             },
                         ]
                     },
                     {
-                        path: 'userbean',
+                        path: '/userbean',
                         name: "userbean",
                         component: () => import("../views/usergold/bean/userbean.vue"),
                         meta: { permissionId: 45 }
@@ -253,7 +257,21 @@ const routes = [
                         path: '/history',
                         name: "history",
                         component: () => import("../views/history/history.vue"),
-                        meta: { permissionId: [56, 57] }
+                        meta: { permissionId: 12 },
+                        children: [
+                            {
+                                path: 'newHistory',
+                                name: "newHistory",
+                                component: () => import("../views/history/newHistory.vue"),
+                                meta: { permissionId: 26 }
+                            },
+                            {
+                                path: 'oldHistory',
+                                name: "oldHistory",
+                                component: () => import("../views/history/oldHistory.vue"),
+                                meta: { permissionId: 27 }
+                            }
+                        ]
                     },
 
                     // 权限管理
@@ -261,24 +279,24 @@ const routes = [
                         path: '/permissions',
                         name: "permissions",
                         component: () => import("../views/permissions/permissions.vue"),
-                        meta: { permissionId: 9 },
+                        meta: { permissionId: 11 },
                         children: [
                             // 用户权限
                             {
                                 path: 'userPermission',
                                 name: "userPermission",
                                 component: () => import("../views/permissions/userPermission.vue"),
-                                meta: { permissionId: 25 }
+                                meta: { permissionId: 24 }
                             },
                             // 角色权限
                             {
                                 path: 'rolePermission',
                                 name: "rolePermission",
                                 component: () => import("../views/permissions/rolePermission.vue"),
-                                meta: { permissionId: 30 }
-                            },
+                                meta: { permissionId: 25 }
+                            }
                         ]
-                    },
+                    }
                 ]
             },
             {
diff --git a/src/utils/menuTreePermission.js b/src/utils/menuTreePermission.js
index 5cf92e6..da6a2ba 100644
--- a/src/utils/menuTreePermission.js
+++ b/src/utils/menuTreePermission.js
@@ -4,7 +4,7 @@ export const permissionMapping = {
     system:1,                      // 总系统
     workbench: 2,                  // 工作台
     goldManage:3,                  // 金币管理
-    monerManage:4,                 // 现金管理
+    moneyManage:4,                 // 现金管理
 
     // 模块，2级
     financialAudit:5,              // 财务审核
@@ -49,8 +49,8 @@ export const permissionMapping = {
     refundWaitThough:40,           // 退款审核通过
     refundWaitReject:41,           // 退款审核驳回
 
-    beanWait:42,                   // 金豆审核待审核
-    beanWaitThough:43,             // 金豆审核已通过
+    beanWait:42,                   // 金豆审核待审核 
+    beanThough:43,                 // 金豆审核已通过
     beanReject:44,                 // 金豆审核已驳回
     beanWaitShow:45,               // 金豆审核待审核查看
     beanWaitThough:46,             // 金豆审核通过
@@ -83,8 +83,9 @@ export const permissionMapping = {
     editUserInfo:67,               // 编辑用户信息
     updateUserInfo:68,             // 重置密码
     deleteUserInfo:69,             // 删除用户信息
+    changeStatus:70,               // 启用禁用用户
 
-    roleManageShow:70,             // 查看角色信息
+    roleManageShow:73,             // 查看角色信息
     addRoleInfo:71,                // 新增角色信息
     editRoleInfo:72,               // 编辑角色信息
 }
diff --git a/src/utils/menuUtils.js b/src/utils/menuUtils.js
index ac7a2b3..6e903b7 100644
--- a/src/utils/menuUtils.js
+++ b/src/utils/menuUtils.js
@@ -42,10 +42,7 @@ export function findFirstThirdLevelMenu(menuList) {
 export const getRoutePath = (menu) => {
     // 路由映射表：key为接口menuName，value为对应路由路径
     const routeMap = {
-
-        '工作台展示': '/workbench',
-        '金币管理': '/goldManage',
-        '现金管理': '/moneyManage',
+        '工作台展示': '/workspace',
 
         '金币审核': '/audit',
         '金豆审核': '/beanAudit',
@@ -64,9 +61,13 @@ export const getRoutePath = (menu) => {
         // '金豆退款': '/beanRefund',
 
         '历史数据查询': '/history',
+        '金币查询（新）': '/history/newHistory',
+        '金币查询（旧）': '/history/oldHistory',
 
 
         '权限管理': '/permissions',
+        '用户管理': '/permissions/userPermission',
+        '角色管理': '/permissions/rolePermission',
 
 
         '金币客户账户明细': '/usergold',
diff --git a/src/views/history/history.vue b/src/views/history/history.vue
index cf69498..291f562 100644
--- a/src/views/history/history.vue
+++ b/src/views/history/history.vue
@@ -1,179 +1,71 @@
 <template>
-    <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-        <el-tab-pane label="金币查询(新)" name="new"></el-tab-pane>
-        <el-tab-pane label="金币查询(旧)" name="old"></el-tab-pane>
-    </el-tabs>
-    <el-card>
-        <el-text size="large">姓名：</el-text>
-        <el-input v-model="searchObj.name" placeholder="请输入姓名" style="width: 12vw;margin-right:1vw"
-            clearable></el-input>
-
-        <el-text size="large">精网号：</el-text>
-        <el-input v-model="searchObj.jwcode" placeholder="请输入精网号" style="width: 12vw;margin-right:1vw"
-            clearable></el-input>
-
-        <el-text size="large" style="width: 80px">更新时间：</el-text>
-        <el-date-picker v-model="dateRange" type="datetimerange" :default-time="defaultTime" range-separator="至"
-            start-placeholder="开始时间" end-placeholder="结束时间" style="width: 25vw;margin-right:1vw" />
-
-        <el-button type="success" @click="resetSearch">重置</el-button>
-        <el-button type="primary" v-if="activeName == 'new'" @click="get">查询</el-button>
-        <el-button type="primary" v-else-if="activeName == 'old'" @click="getOld">查询</el-button>
-    </el-card>
-
-    <el-card style="margin-top:10px" v-show="tableData.length > 0">
-        <el-table :data="tableData" style="width: 82vw;height:60vh">
-            <el-table-column type="index" label="序号" width="100" header-align="center" align="center">
-                <template #default="scope">
-                    {{ scope.$index + 1 + (pagination.pageNum - 1) * pagination.pageSize }}
-                </template>
-            </el-table-column>
-            <el-table-column prop="name" label="客户姓名" width="180" show-overflow-tooltip />
-            <el-table-column prop="jwcode" label="精网号" width="180" header-align="center" align="center" />
-            <el-table-column prop="num" label="数量" width="180" header-align="center" align="center" />
-            <el-table-column prop="updateType" show-overflow-tooltip label="更新类型" width="180" align="center" />
-            <el-table-column v-if="activeName === 'new'" prop="freeGold" label="免费金币" width="180" align="center" />
-            <el-table-column v-if="activeName === 'new'" prop="permanentGold" label="永久金币" width="180" align="center" />
-            <el-table-column v-if="activeName === 'new'" prop="taskGold" label="任务金币" width="180" align="center" />
-            <el-table-column prop="operator" label="操作人" width="180" />
-            <el-table-column prop="createTime" label="更新时间" width="200" header-align="center" align="center" />
-            <el-table-column prop="remark" label="备注" show-overflow-tooltip width="200" align="center" />
-        </el-table>
-        <el-pagination background style="margin-top:20px" v-model:current-page="pagination.pageNum"
-            v-model:page-size="pagination.pageSize" layout="total, sizes, prev, pager, next, jumper"
-            :total="pagination.total" @size-change="handlePageSizeChange"
-            @current-change="handleCurrentChange"></el-pagination>
-    </el-card>
-</template>
-<script setup>
-import { onMounted, ref } from 'vue'
-import { ElMessage } from 'element-plus'
-import API from '@/util/http.js'
-import moment from 'moment'
-import { useAdminStore } from "@/store/index.js"
-import { storeToRefs } from "pinia"
-import dayjs from 'dayjs'
-const adminStore = useAdminStore()
-const { adminData, menuTree } = storeToRefs(adminStore)
-import { permissionMapping, findMenuById } from "@/utils/menuTreePermission.js"
-const defaultTime = [
-    new Date(2000, 1, 1, 0, 0, 0),
-    new Date(2000, 2, 1, 23, 59, 59),
-]
-const activeName = ref('new')
-const handleClick = function (tab) {
-    activeName.value = tab.props.name
-    if (tab.props.name === 'new') {
-        resetSearch()
-        pagination.value.pageNum = 1
-        tableData.value = []
-        console.log('新的');
-    } else if (tab.props.name === 'old') {
-        resetSearch()
-        pagination.value.pageNum = 1
-        console.log('旧的');
-        tableData.value = []
+      <router-view></router-view>
+  </template>
+  
+  <script setup>
+  import {onMounted, ref, watch} from 'vue';
+  import {useRoute, useRouter} from 'vue-router';
+  import {storeToRefs} from "pinia";
+  import {useAdminStore} from "@/store/index.js";
+  import {hasMenuPermission, permissionMapping} from "@/utils/menuTreePermission.js";
+  
+  const router = useRouter();
+  const route = useRoute();
+  const adminStore = useAdminStore();
+  const {menuTree} = storeToRefs(adminStore);
+  
+  const activeTab = ref('');
+  const hasNew = ref(false);
+  const hasOld = ref(false);
+  // 导航方法
+  const navigateTo = (name) => {
+    activeTab.value = name;
+    router.push({name});
+  };
+  
+  
+  // 初始化权限状态
+  const initPermissions = () => {
+    if (!menuTree.value || !menuTree.value.length) return
+  
+    hasNew.value = hasMenuPermission(menuTree.value, permissionMapping.newCoinSelect)
+    hasOld.value = hasMenuPermission(menuTree.value, permissionMapping.oldCoinSelect)
+  }
+  
+  // 默认跳转逻辑
+  const getDefaultAuditRoute = () => {
+    initPermissions()
+    if (hasNew.value) return 'newHistory'
+    if (hasOld.value) return 'oldHistory'
+    return 'newHistory'
+  };
+  
+  // 监听路由变化更新标签状态
+  watch(() => route.name, (newName) => {
+    initPermissions()
+    if (newName === 'newHistory' || newName === 'oldHistory') {
+      activeTab.value = newName;
+    } else if (newName === 'history') {
+      // 每次访问 /history 都进行默认跳转
+      const defaultRoute = getDefaultAuditRoute();
+      navigateTo(defaultRoute);
     }
-}
-const tableData = ref([])
-const dateRange = ref([])
-const searchObj = ref({
-    name: '',
-    jwcode: ''
-})
-const pagination = ref({
-    pageNum: 1,
-    pageSize: 50,
-    total: 0
-})
-
-//获取旧表数据
-const getOld = async function () {
-    if (findMenuById(menuTree.value, permissionMapping.History_Query)) {
-        try {
-            if ((searchObj.value.name || searchObj.value.jwcode) && activeName.value == 'old') {
-                const startTime = dateRange.value && dateRange.value[0] ? moment(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : ""
-                const endTime = dateRange.value && dateRange.value[1] ? moment(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : ""
-                const res = await API({
-                    url: '/history/getOldHistoryRecord',
-                    data: {
-                        ...searchObj.value,
-                        startTime: startTime,
-                        endTime: endTime,
-                        pageNum: pagination.value.pageNum,
-                        pageSize: pagination.value.pageSize,
-                    }
-                })
-                if (res.code == 200) {
-                    ElMessage.success('查询成功')
-                    tableData.value = res.data.list
-                    console.log('tableData.value', res.data.list);
-                    pagination.value.total = res.data.total
-                }
-            } else {
-                ElMessage.error('请输入姓名或精网号')
-                return
-            }
-        } catch (e) {
-            ElMessage.error(e.message)
-        }
+  });
+  
+  // 初始化逻辑
+  onMounted(() => {
+    initPermissions()
+    console.log('============================',hasNew.value,hasOld.value)
+    if (route.name === 'history') {
+      const defaultRoute = getDefaultAuditRoute();
+      navigateTo(defaultRoute);
+    } else {
+      // 非父路由初始化当前标签状态
+      if (route.name === 'newHistory' || route.name === 'oldHistory') {
+        activeTab.value = route.name;
+      }
     }
-}
-//获取新表数据
-const get = async function () {
-    if (findMenuById(menuTree.value, permissionMapping.History_Query)) {
-        try {
-            if ((searchObj.value.name || searchObj.value.jwcode) && activeName.value == 'new') {
-                const startTime = dateRange.value && dateRange.value[0] ? moment(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : ""
-                const endTime = dateRange.value && dateRange.value[1] ? moment(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : ""
-                const res = await API({
-                    url: '/history/getNewHistoryRecord',
-                    data: {
-                        ...searchObj.value,
-                        startTime: startTime,
-                        endTime: endTime,
-                        pageNum: pagination.value.pageNum,
-                        pageSize: pagination.value.pageSize,
-                    }
-                })
-                if (res.code == 200) {
-                    ElMessage.success('查询成功')
-                    tableData.value = res.data.list
-                    console.log('tableData.value', res.data.list)
-                    pagination.value.total = res.data.total
-                }
-            } else {
-                ElMessage.error('请输入姓名或精网号')
-                return
-            }
-        } catch (e) {
-            ElMessage.error(e.message)
-        }
-    }
-}
-const resetSearch = function () {
-    searchObj.value = {
-        name: '',
-        jwcode: ''
-    }
-    dateRange.value = []
-}
-const handlePageSizeChange = function (val) {
-    pagination.value.pageSize = val
-    if (activeName.value == 'new') {
-        get()
-    } else if (activeName.value == 'old') {
-        getOld()
-    }
-}
-const handleCurrentChange = function (val) {
-    pagination.value.pageNum = val
-    if (activeName.value == 'new') {
-        get()
-    } else if (activeName.value == 'old') {
-        getOld()
-    }
-}
-</script>
-
-<style scoped></style>
\ No newline at end of file
+  });
+  </script>
+  <style>
+  </style>
\ No newline at end of file
diff --git a/src/views/history/newHistory.vue b/src/views/history/newHistory.vue
new file mode 100644
index 0000000..ab8c583
--- /dev/null
+++ b/src/views/history/newHistory.vue
@@ -0,0 +1,119 @@
+<template>
+    <el-card>
+        <el-text size="large">姓名：</el-text>
+        <el-input v-model="searchObj.name" placeholder="请输入姓名" style="width: 12vw;margin-right:1vw"
+            clearable></el-input>
+
+        <el-text size="large">精网号：</el-text>
+        <el-input v-model="searchObj.jwcode" placeholder="请输入精网号" style="width: 12vw;margin-right:1vw"
+            clearable></el-input>
+
+        <el-text size="large" style="width: 80px">更新时间：</el-text>
+        <el-date-picker v-model="dateRange" type="datetimerange" :default-time="defaultTime" range-separator="至"
+            start-placeholder="开始时间" end-placeholder="结束时间" style="width: 25vw;margin-right:1vw" />
+
+        <el-button type="success" @click="resetSearch">重置</el-button>
+        <el-button type="primary" @click="get">查询</el-button>
+    </el-card>
+
+    <el-card style="margin-top:10px" v-show="tableData.length > 0">
+        <el-table :data="tableData" style="width: 82vw;height:60vh">
+            <el-table-column type="index" label="序号" width="100" header-align="center" align="center">
+                <template #default="scope">
+                    {{ scope.$index + 1 + (pagination.pageNum - 1) * pagination.pageSize }}
+                </template>
+            </el-table-column>
+            <el-table-column prop="name" label="客户姓名" width="180" show-overflow-tooltip />
+            <el-table-column prop="jwcode" label="精网号" width="180" header-align="center" align="center" />
+            <el-table-column prop="num" label="数量" width="180" header-align="center" align="center" />
+            <el-table-column prop="updateType" show-overflow-tooltip label="更新类型" width="180" align="center" />
+            <el-table-column prop="freeGold" label="免费金币" width="180" align="center" />
+            <el-table-column prop="permanentGold" label="永久金币" width="180" align="center" />
+            <el-table-column prop="taskGold" label="任务金币" width="180" align="center" />
+            <el-table-column prop="operator" label="操作人" width="180" />
+            <el-table-column prop="createTime" label="更新时间" width="200" header-align="center" align="center" />
+            <el-table-column prop="remark" label="备注" show-overflow-tooltip width="200" align="center" />
+        </el-table>
+        <el-pagination background style="margin-top:20px" v-model:current-page="pagination.pageNum"
+            v-model:page-size="pagination.pageSize" layout="total, sizes, prev, pager, next, jumper"
+            :total="pagination.total" @size-change="handlePageSizeChange"
+            @current-change="handleCurrentChange"></el-pagination>
+    </el-card>
+</template>
+<script setup>
+import { onMounted, ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import API from '@/util/http.js'
+import moment from 'moment'
+import { useAdminStore } from "@/store/index.js"
+import { storeToRefs } from "pinia"
+import dayjs from 'dayjs'
+const adminStore = useAdminStore()
+const { adminData, menuTree } = storeToRefs(adminStore)
+import { permissionMapping, findMenuById } from "@/utils/menuTreePermission.js"
+const defaultTime = [
+    new Date(2000, 1, 1, 0, 0, 0),
+    new Date(2000, 2, 1, 23, 59, 59),
+]
+
+const tableData = ref([])
+const dateRange = ref([])
+const searchObj = ref({
+    name: '',
+    jwcode: ''
+})
+const pagination = ref({
+    pageNum: 1,
+    pageSize: 50,
+    total: 0
+})
+//获取新表数据
+const get = async function () {
+    try {
+        if (searchObj.value.name || searchObj.value.jwcode) {
+            const startTime = dateRange.value && dateRange.value[0] ? moment(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : ""
+            const endTime = dateRange.value && dateRange.value[1] ? moment(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : ""
+            const res = await API({
+                url: '/history/getNewHistoryRecord',
+                data: {
+                    ...searchObj.value,
+                    startTime: startTime,
+                    endTime: endTime,
+                    pageNum: pagination.value.pageNum,
+                    pageSize: pagination.value.pageSize,
+                }
+            })
+            if (res.code == 200) {
+                ElMessage.success('查询成功')
+                tableData.value = res.data.list
+                console.log('tableData.value', res.data.list)
+                pagination.value.total = res.data.total
+            }
+        } else {
+            ElMessage.error('请输入姓名或精网号')
+            return
+        }
+    } catch (e) {
+        ElMessage.error(e.message)
+    }
+}
+
+const resetSearch = function () {
+    searchObj.value = {
+        name: '',
+        jwcode: ''
+    }
+    dateRange.value = []
+}
+const handlePageSizeChange = function (val) {
+    pagination.value.pageSize = val
+    get()
+
+}
+const handleCurrentChange = function (val) {
+    pagination.value.pageNum = val
+    get()
+}
+</script>
+
+<style scoped></style>
\ No newline at end of file
diff --git a/src/views/history/oldHistory.vue b/src/views/history/oldHistory.vue
new file mode 100644
index 0000000..a4aed9e
--- /dev/null
+++ b/src/views/history/oldHistory.vue
@@ -0,0 +1,117 @@
+<template>
+    <el-card>
+        <el-text size="large">姓名：</el-text>
+        <el-input v-model="searchObj.name" placeholder="请输入姓名" style="width: 12vw;margin-right:1vw"
+            clearable></el-input>
+
+        <el-text size="large">精网号：</el-text>
+        <el-input v-model="searchObj.jwcode" placeholder="请输入精网号" style="width: 12vw;margin-right:1vw"
+            clearable></el-input>
+
+        <el-text size="large" style="width: 80px">更新时间：</el-text>
+        <el-date-picker v-model="dateRange" type="datetimerange" :default-time="defaultTime" range-separator="至"
+            start-placeholder="开始时间" end-placeholder="结束时间" style="width: 25vw;margin-right:1vw" />
+
+        <el-button type="success" @click="resetSearch">重置</el-button>
+        <el-button type="primary" @click="getOld">查询</el-button>
+    </el-card>
+
+    <el-card style="margin-top:10px" v-show="tableData.length > 0">
+        <el-table :data="tableData" style="width: 82vw;height:60vh">
+            <el-table-column type="index" label="序号" width="100" header-align="center" align="center">
+                <template #default="scope">
+                    {{ scope.$index + 1 + (pagination.pageNum - 1) * pagination.pageSize }}
+                </template>
+            </el-table-column>
+            <el-table-column prop="name" label="客户姓名" width="180" show-overflow-tooltip />
+            <el-table-column prop="jwcode" label="精网号" width="180" header-align="center" align="center" />
+            <el-table-column prop="num" label="数量" width="180" header-align="center" align="center" />
+            <el-table-column prop="updateType" show-overflow-tooltip label="更新类型" width="180" align="center" />
+            <el-table-column prop="operator" label="操作人" width="180" />
+            <el-table-column prop="createTime" label="更新时间" width="200" header-align="center" align="center" />
+            <el-table-column prop="remark" label="备注" show-overflow-tooltip width="200" align="center" />
+        </el-table>
+        <el-pagination background style="margin-top:20px" v-model:current-page="pagination.pageNum"
+            v-model:page-size="pagination.pageSize" layout="total, sizes, prev, pager, next, jumper"
+            :total="pagination.total" @size-change="handlePageSizeChange"
+            @current-change="handleCurrentChange"></el-pagination>
+    </el-card>
+</template>
+<script setup>
+import { onMounted, ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import API from '@/util/http.js'
+import moment from 'moment'
+import { useAdminStore } from "@/store/index.js"
+import { storeToRefs } from "pinia"
+import dayjs from 'dayjs'
+const adminStore = useAdminStore()
+const { adminData, menuTree } = storeToRefs(adminStore)
+import { permissionMapping, findMenuById } from "@/utils/menuTreePermission.js"
+const defaultTime = [
+    new Date(2000, 1, 1, 0, 0, 0),
+    new Date(2000, 2, 1, 23, 59, 59),
+]
+
+const tableData = ref([])
+const dateRange = ref([])
+const searchObj = ref({
+    name: '',
+    jwcode: ''
+})
+const pagination = ref({
+    pageNum: 1,
+    pageSize: 50,
+    total: 0
+})
+
+//获取旧表数据
+const getOld = async function () {
+    try {
+        if (searchObj.value.name || searchObj.value.jwcode) {
+            const startTime = dateRange.value && dateRange.value[0] ? moment(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : ""
+            const endTime = dateRange.value && dateRange.value[1] ? moment(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : ""
+            const res = await API({
+                url: '/history/getOldHistoryRecord',
+                data: {
+                    ...searchObj.value,
+                    startTime: startTime,
+                    endTime: endTime,
+                    pageNum: pagination.value.pageNum,
+                    pageSize: pagination.value.pageSize,
+                }
+            })
+            if (res.code == 200) {
+                ElMessage.success('查询成功')
+                tableData.value = res.data.list
+                console.log('tableData.value', res.data.list);
+                pagination.value.total = res.data.total
+            }
+        } else {
+            ElMessage.error('请输入姓名或精网号')
+            return
+        }
+    } catch (e) {
+        ElMessage.error(e.message)
+    }
+}
+
+
+const resetSearch = function () {
+    searchObj.value = {
+        name: '',
+        jwcode: ''
+    }
+    dateRange.value = []
+}
+const handlePageSizeChange = function (val) {
+    pagination.value.pageSize = val
+    getOld()
+}
+const handleCurrentChange = function (val) {
+    pagination.value.pageNum = val
+    getOld()
+}
+</script>
+
+<style scoped></style>
\ No newline at end of file
diff --git a/src/views/permissions/permissions.vue b/src/views/permissions/permissions.vue
index c01f241..779e5c8 100644
--- a/src/views/permissions/permissions.vue
+++ b/src/views/permissions/permissions.vue
@@ -1,19 +1,5 @@
 <template>
-  <div class="father">
-    <el-button-group>
-      <el-button :type="activeTab === 'userPermission' ? 'primary' : 'default'" @click="navigateTo('userPermission')"
-        :disabled="!hasDetail">
-        用户管理
-      </el-button>
-      <el-button :type="activeTab === 'rolePermission' ? 'primary' : 'default'" @click="navigateTo('rolePermission')"
-        :disabled="!hasBalance">
-        角色管理
-      </el-button>
-    </el-button-group>
-  </div>
-  <div>
     <router-view></router-view>
-  </div>
 </template>
 
 <script setup>
@@ -28,8 +14,8 @@ const adminStore = useAdminStore();
 const { menuTree } = storeToRefs(adminStore);
 
 const activeTab = ref('');
-const hasDetail = ref(false);
-const hasBalance = ref(false);
+const hasUser = ref(false);
+const hasRole = ref(false);
 // 导航方法
 const navigateTo = (name) => {
   activeTab.value = name;
@@ -41,15 +27,16 @@ const navigateTo = (name) => {
 const initPermissions = () => {
   if (!menuTree.value || !menuTree.value.length) return;
 
-  hasDetail.value = hasMenuPermission(menuTree.value, permissionMapping.View_Permission);
-  hasBalance.value = hasMenuPermission(menuTree.value, permissionMapping.View_Role);
+  hasUser.value = hasMenuPermission(menuTree.value, permissionMapping.userManage);
+  hasRole.value = hasMenuPermission(menuTree.value, permissionMapping.roleManage);
+  console.log('====================================', hasUser.value, hasRole.value)
 };
 
 // 默认跳转逻辑
 const getDefaultAuditRoute = () => {
   initPermissions();
-  if (hasDetail.value) return 'userPermission';
-  if (hasBalance.value) return 'rolePermission';
+  if (hasUser.value) return 'userPermission';
+  if (hasRole.value) return 'rolePermission';
   return 'userPermission';
 };
 
@@ -78,10 +65,4 @@ onMounted(() => {
     }
   }
 });
-</script>
-<style>
-.father{
-  width:82vw;
-  height:4vh;
-}
-</style>
\ No newline at end of file
+</script>
\ No newline at end of file
diff --git a/src/views/permissions/rolePermission.vue b/src/views/permissions/rolePermission.vue
index 7b8d80d..b7d25bc 100644
--- a/src/views/permissions/rolePermission.vue
+++ b/src/views/permissions/rolePermission.vue
@@ -39,18 +39,12 @@ const addRole = ref({
   market: ''
 })
 const addRoleMarket = ref([])
-const viewRole = ref([])
-const getRolePermission = async function () {
-  const result = await request({
-    url: '/menu/tree',
-    data: {
-      "id": adminData.value.roleId
-    }
-  })
-  viewRole.value = collectIds(result.data)
-  console.log('result111', viewRole.value);
-}
+
 const getRoleList = async function (val) {
+  if(!findMenuById(menuTree.value, permissionMapping.roleManageShow)){
+    ElMessage.error('无此权限')
+    return
+  }
   try {
     if (typeof val === 'number') {
       getObj.value.pageNum = val
@@ -178,6 +172,10 @@ function processTreeData(data) {
 }
 
 const handleAddRole = async function () {
+  if(!findMenuById(menuTree.value, permissionMapping.addRoleInfo)){
+    ElMessage.error('无此权限')
+    return
+  }
   try {
     await new Promise((resolve, reject) => {
       Ref.value.validate((valid) => {
@@ -467,6 +465,10 @@ const permissionEditRoleInit = async function (row) {
 
 // 编辑角色提交
 const permissionEditRole = async function () {
+  if(!findMenuById(menuTree.value, permissionMapping.editRoleInfo)){
+    ElMessage.error('无此权限')
+    return
+  }
   try {
     await new Promise((resolve, reject) => {
       Ref.value.validate((valid) => {
@@ -573,7 +575,6 @@ const throttledHandleAddRole = _.throttle(handleAddRole, 5000, {
 // 挂载
 onMounted(async function () {
   await getRoleList()
-  await getRolePermission()
   await getRoleArea()
 })
 
diff --git a/src/views/permissions/userPermission.vue b/src/views/permissions/userPermission.vue
index 68a9368..8a0caa7 100644
--- a/src/views/permissions/userPermission.vue
+++ b/src/views/permissions/userPermission.vue
@@ -5,6 +5,12 @@ import { InfoFilled } from '@element-plus/icons-vue'
 import _ from 'lodash'
 import request from '@/util/http'
 import API from '@/util/http'
+import { useAdminStore } from "@/store/index.js"
+import { storeToRefs } from "pinia"
+import { findMenuById, permissionMapping } from "@/utils/menuTreePermission.js"
+const adminStore = useAdminStore()
+const { adminData, menuTree } = storeToRefs(adminStore)
+
 // 表格数据
 const tableData = ref([])
 const total = ref(100)
@@ -97,20 +103,6 @@ const addAdmin = ref({
   machineId: '',
   remark: ''
 })
-
-//这是获取用户信息的接口
-const adminData = ref({})
-// todo 之后优化掉
-const getAdminData = async function () {
-  try {
-    const result = await API({ url: '/admin/userinfo', data: {} })
-    adminData.value = result
-    // console.log('请求成功', result)
-    console.log('管理员用户信息', adminData.value)
-  } catch (error) {
-    console.log('请求失败', error)
-  }
-}
 // 编辑用户权限对象
 const permissionEditObj = ref({
   checkedKeys: [],
@@ -204,7 +196,6 @@ const getRoleArea = async function () {
     console.log('请求失败', error)
   }
 }
-
 // 获取地区树
 const marketsTree = ref([])
 const getArea = async function () {
@@ -275,6 +266,10 @@ const userAddInit = function () {
 
 //新增用户
 const permissionAdd = async function () {
+  if (!findMenuById(menuTree.value, permissionMapping.addUserInfo)) {
+    ElMessage.error('无此权限')
+    return
+  }
   try {
     await new Promise((resolve, reject) => {
       Ref.value.validate((valid) => {
@@ -327,7 +322,6 @@ const Ref = ref(null)
 
 // 权限类别
 const permissionList = ref([])
-
 const getRoles = async function () {
   try {
     const res = await API({ url: '/role/selectAll' })
@@ -341,8 +335,6 @@ const getRoles = async function () {
     console.error('获取权限列表失败:', error)
   }
 }
-
-
 // 打开编辑用户权限弹窗
 const openUserEditVisible = function () {
   userEditVisible.value = true
@@ -504,6 +496,10 @@ const editAdminRules = {
 };
 // 编辑用户权限提交
 const permissionEdit = async function () {
+  if (!findMenuById(menuTree.value, permissionMapping.editUserInfo)) {
+    ElMessage.error('无此权限')
+    return
+  }
   let { adminName: userName, roleName: oldRole, roleId: newRoleId } = permissionEditObj.value;
   if (oldRole == null) {
     oldRole = '暂未分配角色'
@@ -576,6 +572,10 @@ const del = function (row) {
 }
 // 删除权限
 const delConfirm = async function () {
+  if (!findMenuById(menuTree.value, permissionMapping.deleteUserInfo)) {
+    ElMessage.error('无此权限')
+    return
+  }
   try {
     const result = await request({
       url: '/permission/deleteAdmin',
@@ -594,6 +594,10 @@ const delConfirm = async function () {
 }
 // 禁用启用用户权限
 const editStatus = async function (row) {
+  if (!findMenuById(menuTree.value, permissionMapping.changeStatus)) {
+    ElMessage.error('无此权限')
+    return
+  }
   const { id, account, targetStatus, ...restRow } = currentStatusRow.value
 
   try {
@@ -783,6 +787,10 @@ const resetPassword = function (row) {
 
 // 确认重置密码
 const confirmResetPassword = async function () {
+  if (!findMenuById(menuTree.value, permissionMapping.updateUserInfo)) {
+    ElMessage.error('无此权限')
+    return
+  }
   console.log('adminData', adminData.value)
   // 处理markets数据
   if (typeof adminData.value.markets === 'string' && adminData.value.markets) {
@@ -883,16 +891,20 @@ const throttledPermissionEdit = _.throttle(permissionEdit, 5000, {
 const throttledPermissionAdd = _.throttle(permissionAdd, 5000, {
   trailing: false
 })
-
+const canAdd = findMenuById(menuTree.value, permissionMapping.addUserInfo)
+const canEdit = findMenuById(menuTree.value, permissionMapping.editUserInfo)
+const canReset = findMenuById(menuTree.value, permissionMapping.updateUserInfo)
+const canDel = findMenuById(menuTree.value, permissionMapping.deleteUserInfo)
+const change = findMenuById(menuTree.value, permissionMapping.changeStatus)
 // 挂载
 onMounted(async function () {
-  await getAdminData()
   await getPermission()
   await getArea()
   await getStore()
   await getRoles()
   await getRoleArea()
-})
+  console.log('看看权限', canAdd, canEdit, canReset, canDel, change)
+  })
 </script>
 
 <template>
@@ -925,7 +937,7 @@ onMounted(async function () {
     <el-card>
       <!-- 展示表单 -->
       <div class="add-item">
-        <el-button style="color: #048efb; border: 1px solid #048efb" @click="userAddInit()">新增用户</el-button>
+        <el-button style="color: #048efb; border: 1px solid #048efb" :disabled="!canAdd" @click="userAddInit()">新增用户</el-button>
       </div>
 
       <div>
@@ -947,17 +959,17 @@ onMounted(async function () {
           <el-table-column prop="remark" label="备注" />
           <el-table-column prop="operation" label="操作" width="280px">
             <template #default="scope">
-              <el-button type="warning" text @click="resetPassword(scope.row)">
+              <el-button type="warning" text :disabled="!canReset" @click="resetPassword(scope.row)">
                 重置密码
               </el-button>
               <el-button type="primary" text @click="permissionEditInit(scope.row)"
-                :disabled="scope.row.adminStatus === 0 || scope.row.account === adminData.account">
+                :disabled="!canEdit || scope.row.adminStatus === 0 || scope.row.account === adminData.account">
                 修改权限
               </el-button>
               <el-popconfirm title="确定将此用户删除吗？" @confirm="delConfirm">
                 <template #reference>
                   <el-button type="danger" text @click="del(scope.row)"
-                    :disabled="scope.row.adminStatus === 0 || scope.row.account === adminData.account">
+                    :disabled="!canDel ||scope.row.adminStatus === 0 || scope.row.account === adminData.account">
                     删除
                   </el-button>
                 </template>
@@ -973,7 +985,7 @@ onMounted(async function () {
           <el-table-column prop="adminStatus" label="状态">
             <template #default="scope">
               <el-switch :model-value="scope.row.adminStatus" :active-value="1" :inactive-value="0" size="large"
-                :disabled="scope.row.account === adminData.account || statusLoading[scope.row.id]"
+                :disabled="!change || scope.row.account === adminData.account || statusLoading[scope.row.id]"
                 @change="(targetStatus) => showStatusConfirm(scope.row, targetStatus)" style="
                     --el-switch-on-color: #13ce66;
                     --el-switch-off-color: #ff4949;
diff --git a/src/views/refund/gold/addCoinRefund.vue b/src/views/refund/gold/addCoinRefund.vue
index 4b11d95..6b7ed1b 100644
--- a/src/views/refund/gold/addCoinRefund.vue
+++ b/src/views/refund/gold/addCoinRefund.vue
@@ -111,6 +111,11 @@ const getRefund = async function () {
 }
 // 这是添加退款信息的接口
 const add = async function () {
+  // 检查是否有添加权限
+  if (!findMenuById(menuTree.value, permissionMapping.addCoinRefund)) {
+    ElMessage.error('无此权限')
+    return
+  }
   try {
     if (addRefund.value.refundType === '商品退款') {
       addRefund.value.type = 1
diff --git a/src/views/refund/gold/addNewCoinRefund.vue b/src/views/refund/gold/addNewCoinRefund.vue
deleted file mode 100644
index 25908ac..0000000
--- a/src/views/refund/gold/addNewCoinRefund.vue
+++ /dev/null
@@ -1,726 +0,0 @@
-<script setup>
-import {onMounted, reactive, ref, watch} from "vue";
-import {ElMessage} from "element-plus";
-import moment from "moment";
-import request from "@/util/http.js";
-import Cookies from 'js-cookie';
-import {useAdminStore} from "@/store/index.js";
-import {storeToRefs} from "pinia";
-import {WarnTriangleFilled} from "@element-plus/icons-vue";
-import dayjs from "dayjs";
-
-const adminStore = useAdminStore();
-const { adminData, menuTree } = storeToRefs(adminStore);
-
-const addDisabled = ref(false);
-
-const user = ref({
-  jwcode: null,
-  name: "",
-  market: "",
-  historySumGold: null,
-  historyPermanentGold: null,
-  historyFreeGold: null,
-  historyTaskGold: null,
-  rechargeNum: null,
-  consumeNum: null,
-  firstRecharge: "",
-  nowPermanentGold: null,
-  nowFreeJune: null,
-  nowTaskGold: null,
-  nowFreeDecember: null,
-  nowFreeGold: null,
-  nowSumGold: null
-});
-
-const addConsume = ref({
-  jwcode: null,
-  goodsName: "金币退款",
-  sumGold: null,
-  freeGold: null,
-  permanentGold: null,
-  taskGold: null,
-  remark: "",
-  refundModel: null,
-  adminId: adminData.value.id,
-  adminName: adminData.value.adminName
-});
-
-const Ref = ref(null);
-
-const rules = reactive({
-  jwcode: [
-    { required: true, message: "请输入精网号", trigger: "blur" },
-  ],
-  remark: [
-    { required: true, message: "请输入备注", trigger: "blur" },
-  ],
-
-  permanentGold: [
-    { required: true, message: "请输入永久金币数", trigger: "blur" },
-    {
-      validator: (rule, value, callback) => {
-        if (value === null || value === undefined || !Number.isInteger(value) || value < 0) {
-          callback(new Error("永久金币必须为非负整数"));
-        } else {
-          callback();
-        }
-      },
-      trigger: "blur"
-    }
-  ],
-  freeGold: [
-    { required: true, message: "请输入免费金币数", trigger: "blur" },
-    {
-      validator: (rule, value, callback) => {
-        if (value === null || value === undefined || !Number.isInteger(value) || value < 0) {
-          callback(new Error("免费金币必须为非负整数"));
-        } else {
-          callback();
-        }
-      },
-      trigger: "blur"
-    }
-  ],
-  taskGold: [
-    { required: true, message: "请输入任务金币数", trigger: "blur" },
-    {
-      validator: (rule, value, callback) => {
-        if (value === null || value === undefined || !Number.isInteger(value) || value < 0) {
-          callback(new Error("任务金币必须为非负整数"));
-        } else {
-          callback();
-        }
-      },
-      trigger: "blur"
-    }
-  ],
-  sumGold: [
-    {
-      validator: (rule, value, callback) => {
-        if ((value || 0) <= 0) {
-          callback(new Error("三类金币总数必须大于0"));
-        } else {
-          callback();
-        }
-      },
-      trigger: "blur"
-    }
-  ]
-});
-
-// watch 三类金币变化，自动计算总和
-watch(
-    () => [addConsume.value.freeGold, addConsume.value.permanentGold, addConsume.value.taskGold],
-    ([free, permanent, task]) => {
-      const sum = (parseInt(free) || 0) + (parseInt(permanent) || 0) + (parseInt(task) || 0);
-      addConsume.value.sumGold = sum;
-    },
-    { deep: true }
-);
-
-// 提交前校验 sumGold > 0
-function validateInputToFreeGold() {
-  if (!user.value.jwcode) {
-    ElMessage.warning("请先查询用户信息");
-    resetForm()
-    return false;
-
-  }
-
-  const { freeGold, permanentGold, taskGold, sumGold } = addConsume.value;
-  if(freeGold > user.value.nowFreeGold){
-    ElMessage.warning("该用户免费金币不足，请重新输入！");
-    addConsume.value.freeGold = null;
-    return
-  }
-
-  return true;
-}
-
-// 提交前校验 sumGold > 0
-function validateInputToPermanentGold() {
-  if (!user.value.jwcode) {
-    ElMessage.warning("请先查询用户信息");
-    resetForm()
-    return false;
-
-  }
-  const { freeGold, permanentGold, taskGold, sumGold } = addConsume.value;
-  if(permanentGold > user.value.nowPermanentGold){
-    ElMessage.warning("该用户永久金币不足，请重新输入！");
-    addConsume.value.permanentGold = null;
-    return
-
-  }
-
-  return true;
-}
-
-// 提交前校验 sumGold > 0
-function validateInputToTaskGold() {
-  if (!user.value.jwcode) {
-    ElMessage.warning("请先查询用户信息");
-    resetForm()
-    return false;
-
-  }
-  const { freeGold, permanentGold, taskGold, sumGold } = addConsume.value;
-  if(taskGold > user.value.nowTaskGold){
-    ElMessage.warning("该用户任务金币不足，请重新输入！");
-    addConsume.value.taskGold = null;
-    return
-
-  }
-
-
-  return true;
-}
-
-
-// 提交前校验 sumGold > 0
-function validateInputTOSumGold() {
-  if (!user.value.jwcode) {
-    ElMessage.warning("请先查询用户信息");
-    resetForm()
-    return false;
-
-  }
-  const { freeGold, permanentGold, taskGold, sumGold } = addConsume.value;
-
-  if (sumGold <= 0) {
-    ElMessage.warning("三类金币总数必须大于0");
-    resetForm()
-    return false;
-  }
-
-  return true;
-}
-
-// 充值对话框显示状态
-const ConsumeDialogVisible = ref(false);
-
-// 关闭对话框
-const ConsumeDialogVisiblehandleClose = () => {
-  ConsumeDialogVisible.value = false;
-  // 重置表单数据
-  resetForm()
-  user.value = {}
-};
-``
-// 确认使用cookie继续充值
-const ConsumeDialogVisibleContinue = () => {
-  ConsumeDialogVisible.value = false;
-  add();
-};
-
-const ConsumeDialogVisibleCancel = () => {
-  ConsumeDialogVisible.value = false
-  resetForm()
-  user.value = {}
-};
-
-// 第一次弹窗
-// 充值对话框显示状态
-const FirstConsumeDialogVisible = ref(false);
-
-// 关闭对话框
-const FirstConsumeDialogVisiblehandleClose = () => {
-  FirstConsumeDialogVisible.value = false;
-  // 重置表单数据
-  resetForm()
-  user.value = {}
-};
-
-// 第一次消耗
-const FirstConsumeDialogVisibleContinue = () => {
-  FirstConsumeDialogVisible.value = false;
-  add();
-};
-
-const FirstConsumeDialogVisibleCancel = () => {
-  FirstConsumeDialogVisible.value = false
-  resetForm()
-  user.value = {}
-};
-
-// 查询商品列表
-const goods = ref([]);
-
-
-// 用来写的 cookie 的 key
-const WriteCookies = ref(null)
-// 用来写的 cookie 的 value
-const WriteCookiesTime = ref(null)
-// 用来读的 cookie 的 key
-const ReadCookies = ref(null)
-// 用来读的 cookie 的 value
-const ReadCookiesTime = ref(null)
-
-// 添加消费
-const add = async function () {
-  addDisabled.value = true;
-
-  try {
-    const result = await request({
-      url: "/consume/addRefund",
-      data: {
-        jwcode: addConsume.value.jwcode,
-        adminId: adminData.value.id,
-        sumGold: addConsume.value.sumGold *100 ,
-        freeGold: addConsume.value.freeGold  *100  ,
-        taskGold: addConsume.value.taskGold  *100  ,
-        permanentGold: addConsume.value.permanentGold  *100 ,
-        remark: addConsume.value.remark,
-        adminName: adminData.value.adminName
-      }
-    });
-
-    //存一下 用户的jwcode
-    // 拼接 jwcode:permanentGold:freeGold
-    WriteCookies.value = `coinRefund:${addConsume.value.jwcode}:${addConsume.value.goodsName}`
-    //value 为当前消耗时间
-    WriteCookiesTime.value = dayjs().format("YYYY-MM-DD HH:mm:ss");
-    // 设置cookies,用户jwcode为key，value也是jwcode，过期时间为1天
-    Cookies.set(WriteCookies.value, WriteCookiesTime.value, {
-      expires:
-          1, path: '/'
-    });
-    addDisabled.value = false;
-
-    if (result.code === 200) {
-      ElMessage.success("添加成功");
-      resetForm();
-    } else {
-      ElMessage.error(result.msg || "添加失败");
-    }
-  } catch (err) {
-    console.error(err);
-    ElMessage.error("添加失败，请检查网络");
-    addDisabled.value = false;
-  }
-};
-
-// 重置表单
-function resetForm() {
-  Ref.value.resetFields();
-  addConsume.value.sumGold = null;
-  addConsume.value.freeGold = null;
-  addConsume.value.permanentGold = null;
-  addConsume.value.taskGold = null;
-  addConsume.value.sumGold = null;
-  addConsume.value.remark = "";
-  addConsume.value.jwcode = null;
-
-  user.value = {
-    jwcode: null,
-    name: "",
-    market: "",
-    historySumGold: null,
-    historyPermanentGold: null,
-    historyFreeGold: null,
-    historyTaskGold: null,
-    rechargeNum: null,
-    consumeNum: null,
-    firstRecharge: "",
-    nowPermanentGold: null,
-    nowFreeJune: null,
-    nowTaskGold: null,
-    nowFreeDecember: null,
-    nowFreeGold: null,
-    nowSumGold: null
-  };
-}
-
-// 获取商品信息
-const getGoods = async function () {
-  try {
-    const result = await request({ url: "https://api.homilychart.com/live_mall/api/product/all" });
-    goods.value = result.data.map(item => ({ id: item.id, label: item.name, value: item.name }));
-  } catch (err) {
-    console.error(err);
-  }
-}
-
-// 添加前验证
-const addBefore = () => {
-  Ref.value.validate(async (valid) => {
-    // 验证cookie
-    if (!valid) {
-      ElMessage({
-        type: 'error',
-        message: '请检查输入内容'
-      });
-      return;
-    }
-    // 手动校验 sumGold > 0
-    if (!validateInputTOSumGold()) return;
-
-    ReadCookies.value = `coinRefund:${addConsume.value.jwcode}:${addConsume.value.goodsName}`
-    // 获取cookie
-    const cookie = Cookies.get(ReadCookies.value)
-    console.log("cookie++++++++++++++++++++++", cookie)
-    console.log("time", WriteCookiesTime.value)
-    // 格式化时间
-    ReadCookiesTime.value = moment(cookie).format('YYYY-MM-DD HH:mm:ss')
-    console.log("cookie========", cookie)
-    if (cookie) {
-      ConsumeDialogVisible.value = true;
-    } else {
-      FirstConsumeDialogVisible.value = true;
-    }
-  });
-};
-
-// 查询用户
-const getUser = async function (jwcode) {
-  if (!jwcode || !/^\d{1,9}$/.test(jwcode)) {
-    ElMessage.warning("精网号不能为空或格式不正确");
-    return;
-  }
-
-  try {
-    const result = await request({ url: "/user/selectUser", data: { jwcode } });
-
-    if (result.code === 200 && result.data) {
-      user.value = { ...result.data };
-      ElMessage.success("查询成功");
-    } else {
-      ElMessage.warning(result.msg || "用户不存在");
-    }
-  } catch (err) {
-    console.error(err);
-    ElMessage.error("查询失败，请检查网络或精网号");
-  }
-};
-
-onMounted(async function () {
-  await getGoods();
-});
-</script>
-
-<template>
-  <div class="father1">
-    <div class="left">
-      <el-form :model="addConsume" ref="Ref" :rules="rules" style="min-width: 420px;" class="add-form"
-               label-width="auto" label-position="right">
-        <el-form-item prop="jwcode" label="精网号" style="margin-top: 50px">
-          <el-input v-model="addConsume.jwcode" style="width: 200px;" />
-          <el-button type="primary" @click="getUser(addConsume.jwcode)" style="margin-left: 20px">查询
-          </el-button>
-        </el-form-item>
-
-        <el-form-item prop="goodsName" label="商品名称" >
-          <el-input v-model="addConsume.goodsName" disabled style="width: 120px" />
-        </el-form-item>
-
-        <!-- 三类金币可编辑 -->
-        <el-form-item prop="permanentGold" label="永久金币">
-          <el-input v-model.number="addConsume.permanentGold" style="width: 120px"  @input="validateInputToPermanentGold()"/>
-          <p>&nbsp;&nbsp;个</p>
-        </el-form-item>
-
-        <el-form-item prop="freeGold" label="免费金币">
-          <el-input v-model.number="addConsume.freeGold" style="width: 120px" @input="validateInputToFreeGold()" />
-          <p>&nbsp;&nbsp;个</p>
-        </el-form-item>
-
-        <el-form-item prop="taskGold" label="任务金币">
-          <el-input v-model.number="addConsume.taskGold" style="width: 120px" @input="validateInputToTaskGold()" />
-          <p>&nbsp;&nbsp;个</p>
-        </el-form-item>
-
-        <el-form-item prop="sumGold" label="消耗金币总数">
-          <el-input v-model.number="addConsume.sumGold" style="width: 120px" disabled />
-        </el-form-item>
-
-        <el-form-item prop="remark" label="备注">
-          <el-input v-model="addConsume.remark" style="width: 250px" :rows="4" maxlength="100" show-word-limit
-                    type="textarea" />
-        </el-form-item>
-
-        <el-button type="success" @click="resetForm()" style="margin-left: 200px;margin-top:10px">重置</el-button>
-        <el-button type="primary" :disabled="addDisabled" @click="addBefore" style="margin-top:10px"> 提交</el-button>
-      </el-form>
-    </div>
-
-    <div class="right">
-      <!-- 客户信息栏 -->
-      <el-card v-if="user.jwcode" style="width: 800px; float: right" class="customer-info">
-        <el-form :model="user" label-width="auto" style="max-width: 1000px" label-position="left">
-          <el-text size="large" style="margin-left: 20px">客户信息</el-text>
-
-          <!-- 第一行：姓名 + 历史金币 -->
-          <el-row style="margin-top: 20px">
-            <el-col :span="9">
-              <el-form-item label="姓名">
-                <p>{{ user.name }}</p>
-              </el-form-item>
-            </el-col>
-            <el-col :span="14">
-              <el-form-item label="当前金币总数" style="width: 500px">
-                <span style="color: #2fa1ff; margin-right: 5px" v-if="user.nowSumGold !== undefined">{{
-                    user.nowSumGold
-                  }}</span>
-              </el-form-item>
-              <!-- 金币详情独立显示 -->
-              <el-form-item style="margin-top: -23px"> <!-- 负边距减少间距 -->
-                <span style="color: #b1b1b1; margin-left: 0px" v-if="user.nowPermanentGold !== undefined">(永久金币:{{
-                    user.nowPermanentGold
-                  }};
-                  免费金币:{{ user.nowFreeGold }};
-                  任务金币:{{ user.nowTaskGold }})</span>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <!-- 第二行：精网号 + 当前金币（独立行） -->
-          <el-row>
-            <el-col :span="9">
-              <el-form-item label="精网号">
-                <p>{{ user.jwcode }}</p>
-              </el-form-item>
-            </el-col>
-            <el-col :span="14">
-              <el-form-item label="消费次数">
-                <p style="color: #2fa1ff">{{ user.consumeNum }} </p>
-              </el-form-item>
-              <el-form-item style="margin-top: -23px"> <!-- 负边距减少间距 -->
-                <p style="font-size: small; color: #b1b1b1">(仅统计2025-01-01后的数据)</p>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <!-- 第三行：首次充值日期 + 充值次数 -->
-          <!-- <el-row >
-          <el-col :span="9">
-            <el-form-item label="首次充值日期">
-              <p v-if="user.firstRecharge">
-                {{ moment(user.firstRecharge).format('YYYY-MM-DD HH:mm:ss') }}
-              </p>
-            </el-form-item>
-          </el-col>
-
-        </el-row> -->
-
-          <!-- 第四行：消费次数 + 所属门店 -->
-          <el-row>
-            <el-col :span="9">
-              <el-form-item label="所属门店">
-                <p>{{ user.market }}</p>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </el-card>
-
-
-      <el-dialog v-model="FirstConsumeDialogVisible" title="操作确认" :before-close="FirstConsumeDialogVisiblehandleClose"
-                 :close-on-click-modal="false" width="480px">
-        <!-- 内容整体居中且收窄 -->
-        <div class="confirm-body">
-          <!-- 用户信息 -->
-          <div>
-            <div class="field-label">用户信息</div>
-            <el-input :model-value="user.jwcode + (user.name ? '【' + user.name + '】' : '')" disabled />
-          </div>
-          <!-- 活动名称 -->
-          <div class="field">
-            <div class="field-label">商品名称</div>
-            <el-input v-model="addConsume.goodsName" disabled />
-          </div>
-          <!--金币总数   -->
-          <div class="field">
-            <div class="field-label">金币总数</div>
-            <el-input v-model="addConsume.sumGold" disabled />
-          </div>
-          <!-- 金币详细信息（同一行左右排列） -->
-          <el-row :gutter="20" class="coins-row">
-            <el-col :span="8">
-              <div class="field">
-                <div class="field-label">永久金币</div>
-                <el-input v-model="addConsume.permanentGold" disabled />
-              </div>
-            </el-col>
-            <el-col :span="8">
-              <div class="field">
-                <div class="field-label">免费金币</div>
-                <el-input v-model="addConsume.freeGold" disabled />
-              </div>
-            </el-col>
-            <el-col :span="8">
-              <div class="field">
-                <div class="field-label">任务金币</div>
-                <el-input v-model="addConsume.taskGold" disabled />
-              </div>
-            </el-col>
-
-          </el-row>
-
-          <div class="field">
-            <div class="field-label">备注</div>
-            <el-input v-model="addConsume.remark" disabled />
-          </div>
-        </div>
-
-        <!-- 底部按钮（居中） -->
-        <template #footer>
-          <div class="dialog-footer-center">
-            <el-button @click="FirstConsumeDialogVisibleCancel">取 消</el-button>
-            <el-button type="primary" @click="FirstConsumeDialogVisibleContinue">确认退款</el-button>
-          </div>
-        </template>
-      </el-dialog>
-
-
-      <el-dialog v-model="ConsumeDialogVisible" title="操作确认" :before-close="ConsumeDialogVisiblehandleClose"
-                 :close-on-click-modal="false" width="480px">
-        <!-- 内容整体居中且收窄 -->
-        <div class="confirm-body">
-          <!-- 用户信息 -->
-          <div>
-            <div class="field-label">用户信息</div>
-            <el-input :model-value="user.jwcode + (user.name ? '【' + user.name + '】' : '')" disabled />
-          </div>
-          <!-- 活动名称 -->
-          <div class="field">
-            <div class="field-label">商品名称</div>
-            <el-input v-model="addConsume.goodsName" disabled />
-          </div>
-          <!--金币总数   -->
-          <div class="field">
-            <div class="field-label">金币总数</div>
-            <el-input v-model="addConsume.sumGold" disabled />
-          </div>
-          <!-- 金币详细信息（同一行左右排列） -->
-          <el-row :gutter="20" class="coins-row">
-            <el-col :span="8">
-              <div class="field">
-                <div class="field-label">永久金币</div>
-                <el-input v-model="addConsume.permanentGold" disabled />
-              </div>
-            </el-col>
-            <el-col :span="8">
-              <div class="field">
-                <div class="field-label">免费金币</div>
-                <el-input v-model="addConsume.freeGold" disabled />
-              </div>
-            </el-col>
-            <el-col :span="8">
-              <div class="field">
-                <div class="field-label">任务金币</div>
-                <el-input v-model="addConsume.taskGold" disabled />
-              </div>
-            </el-col>
-
-          </el-row>
-          <!-- 风险提示 -->
-          <div style="display: flex; align-items: center; margin-top: 20px;">
-            <el-icon :size="24" color="#FFD700">
-              <WarnTriangleFilled />
-            </el-icon>
-            <p>重复购买风险提示</p>
-          </div>
-          <!-- 记录 + 虚线分隔 -->
-          <div>
-            <el-divider border-style="dashed" />
-            <p>检测到该用户近期有相似退款记录：</p>
-            · {{ ReadCookiesTime }} 退款 【{{ addConsume.goodsName }}】(操作人: {{ adminData.adminName }})
-          </div>
-          <div style="margin-top: 10px">
-            <p>是否继续操作？</p>
-
-          </div>
-        </div>
-
-        <!-- 底部按钮（居中） -->
-        <template #footer>
-          <div class="dialog-footer-center">
-            <el-button @click="ConsumeDialogVisibleCancel">取 消</el-button>
-            <el-button type="primary" @click="ConsumeDialogVisibleContinue">确认退款</el-button>
-          </div>
-        </template>
-      </el-dialog>
-
-    </div>
-  </div>
-</template>
-
-
-<style scoped lang="scss">
-p {
-  margin: 0px;
-}
-
-/* 上传图片的格式 */
-.avatar-uploader .avatar {
-  width: 50px;
-  height: 50px;
-  display: block;
-}
-
-.add-form {
-  width: 400px;
-  float: left;
-}
-
-/* 标题居中 */
-.el-dialog__header {
-  text-align: center;
-}
-
-.confirm-body {
-  width: 350px;
-  margin: 0 auto;
-}
-
-/* 字段块与标签样式 */
-.field {
-  margin-bottom: 14px;
-}
-
-.field-label {
-  font-size: 14px;
-  color: #606266;
-  margin-bottom: 6px;
-}
-
-/* 金币行紧凑 */
-.coins-row .field {
-  margin-bottom: 0;
-}
-
-/* 底部按钮居中 */
-.dialog-footer-center {
-  display: flex;
-  justify-content: center;
-  gap: 12px;
-}
-
-.father1 {
-  width: 82vw;
-  height: 80vh;
-  display: flex;
-
-  .left {
-    width: 500px;
-    float: left;
-    display: flex;
-  }
-
-  .right {
-    flex: 1;
-    height: 50vh;
-    display: flex;
-    align-items: center;
-
-    .customer-info {
-      width: 300px;
-      margin-left: 20px;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-    }
-  }
-}
-</style>
diff --git a/src/views/refund/gold/coinRefund.vue b/src/views/refund/gold/coinRefund.vue
index 5823b87..f268889 100644
--- a/src/views/refund/gold/coinRefund.vue
+++ b/src/views/refund/gold/coinRefund.vue
@@ -45,8 +45,8 @@ const navigateTo = (name) => {
 const initPermissions = () => {
   if (!menuTree.value || !menuTree.value.length) return;
 
-  hasAdd.value = hasMenuPermission(menuTree.value, permissionMapping.Submit_Gold_Coin_Refund);
-  hasDetail.value = hasMenuPermission(menuTree.value, permissionMapping.View_Gold_Coin_Refund_Details);
+  hasAdd.value = hasMenuPermission(menuTree.value, permissionMapping.addCoinRefund);
+  hasDetail.value = hasMenuPermission(menuTree.value, permissionMapping.coinRefundDetail);
 };
 
 // 默认跳转逻辑
@@ -54,7 +54,7 @@ const getDefaultAuditRoute = () => {
   initPermissions();
   if (hasDetail.value) return 'coinRefundDetail';
   if (hasAdd.value) return 'addCoinRefund';
-  return 'addCoinRefund';
+  return 'coinRefundDetail';
 };
 
 // 监听路由变化更新标签状态
@@ -77,7 +77,7 @@ onMounted(() => {
     navigateTo(defaultRoute);
   } else {
     // 非父路由初始化当前标签状态
-    if (route.name === 'addCoinRefund' || route.name === 'coinRefundDetail') {
+    if (route.name === 'coinRefundDetail' || route.name === 'addCoinRefund') {
       activeTab.value = route.name;
     }
   }
diff --git a/src/views/refund/gold/coinRefundDetail.vue b/src/views/refund/gold/coinRefundDetail.vue
index 1dd91da..83d0f20 100644
--- a/src/views/refund/gold/coinRefundDetail.vue
+++ b/src/views/refund/gold/coinRefundDetail.vue
@@ -6,8 +6,13 @@ import moment from 'moment'
 import API from '@/util/http.js'
 import request from '@/util/http.js'
 import { reverseMarketMapping } from "@/utils/marketMap.js";
+import { useAdminStore } from "@/store/index.js";
+import { storeToRefs } from "pinia";
+import { findMenuById, permissionMapping } from "@/utils/menuTreePermission.js"
 import dayjs from "dayjs";
 
+const adminStore = useAdminStore();
+const { adminData, menuTree } = storeToRefs(adminStore);
 const showEmployeeData = ref(false)
 
 
@@ -48,18 +53,6 @@ const activeTimeRange = ref('')
 const handleDatePickerChange = () => {
   activeTimeRange.value = ''
 }
-const adminData = ref({})
-const getAdminData = async function () {
-  try {
-    const result = await API({ url: '/admin/userinfo', data: {} })
-
-    adminData.value = result
-    console.log('请求成功', result)
-    console.log('用户信息', adminData.value)
-  } catch (error) {
-    console.log('请求失败', error)
-  }
-}
 // 充值明细表格
 const tableData = ref([])
 // 搜索======================================
@@ -121,6 +114,10 @@ const getRefundTypes = async function () {
 // 搜索==============================================================
 // 搜索方法
 const getSelectBy = async function (val) {
+  if (!findMenuById(menuTree.value, permissionMapping.coinRefundDetail)) {
+    ElMessage.error('无此权限')
+    return
+  }
   try {
     // 搜索参数页码赋值
     if (typeof val === 'number') {
@@ -312,7 +309,7 @@ const getGoods = async function () {
 
 // 挂载
 onMounted(async function () {
-  await getAdminData()
+  console.log('=======',adminData.value)
   await getSelectBy()
   await getMarket()
   await getRefundTypes()
diff --git a/src/views/usergold/bean/userbean.vue b/src/views/usergold/bean/userbean.vue
index 55c4289..50ef4f0 100644
--- a/src/views/usergold/bean/userbean.vue
+++ b/src/views/usergold/bean/userbean.vue
@@ -74,7 +74,6 @@ const pagination = ref({
     total: 0
 })
 const get = async function () {
-    if(findMenuById(menuTree.value, permissionMapping.View_Golden_Bean_Balance)){
     try {
         trim()
          if(searchObj.value.jwcode){
@@ -105,12 +104,9 @@ const get = async function () {
     } catch (error) {
         console.log(error)
     }
-}else{
-    ElMessage.error('无此权限')
-}
 }
+
 const getStats = async () => {
-    if (findMenuById(menuTree.value, permissionMapping.View_Golden_Bean_Balance)) {
         try {
             const params = {
                 beanUser:{
@@ -131,10 +127,7 @@ const getStats = async () => {
         } catch (error) {
             console.log('请求失败', error)
         }
-    }else{
-        ElMessage.error('无此权限')
     }
-}
 const handleSortChange = (column) => {
     if (column.prop === 'beanNum') {
         searchObj.value.sortField = 'jinbi'
diff --git a/src/views/usergold/gold/clientCount.vue b/src/views/usergold/gold/clientCount.vue
index 848cc6b..91e03f4 100644
--- a/src/views/usergold/gold/clientCount.vue
+++ b/src/views/usergold/gold/clientCount.vue
@@ -51,8 +51,8 @@ const navigateTo = (name) => {
 const initPermissions = () => {
   if (!menuTree.value || !menuTree.value.length) return;
 
-  hasDetail.value = hasMenuPermission(menuTree.value, permissionMapping.View_Gold_Coin_Details);
-  hasBalance.value = hasMenuPermission(menuTree.value, permissionMapping.View_Gold_Coin_Balance);
+  hasDetail.value = hasMenuPermission(menuTree.value, permissionMapping.coinCustomerDetail);
+  hasBalance.value = hasMenuPermission(menuTree.value, permissionMapping.coinCustomerMoney);
 };
 
 // 默认跳转逻辑
diff --git a/src/views/usergold/gold/clientCountBalance.vue b/src/views/usergold/gold/clientCountBalance.vue
index a96c6be..491941e 100644
--- a/src/views/usergold/gold/clientCountBalance.vue
+++ b/src/views/usergold/gold/clientCountBalance.vue
@@ -1,5 +1,10 @@
 <script setup>
 // 这是客户金币余额页面
+import { useAdminStore } from "@/store/index.js"
+import { storeToRefs } from "pinia"
+import { findMenuById, permissionMapping } from "@/utils/menuTreePermission.js"
+const adminStore = useAdminStore()
+const { adminData, menuTree } = storeToRefs(adminStore)
 import {onMounted, ref} from 'vue'
 import {ElMessage} from 'element-plus'
 import moment from 'moment'
@@ -11,19 +16,7 @@ const showEmployeeData = ref(false)
 
 
 // 变量
-//这是获取用户信息的接口
-const adminData = ref({})
 const dialogVisible = ref(false)
-const getAdminData = async function () {
-  try {
-    const result = await API({url: '/admin/userinfo', data: {}})
-    adminData.value = result
-    // console.log('请求成功', result)
-    console.log('管理员用户信息', adminData.value)
-  } catch (error) {
-    console.log('请求失败', error)
-  }
-}
 
 // 定义加载状态，获取地区数据
 const isLoadingmarket = ref(false);
@@ -72,6 +65,10 @@ const sortOrder = ref('')
 // 搜索===========================================================================
 // 搜索方法
 const get = async function (val) {
+  if(!findMenuById(menuTree.value, permissionMapping.coinCustomerMoney)){
+    ElMessage.error('无此权限')
+    return
+  }
   try {
     // 搜索参数页码赋值
     if (typeof val === 'number') {
@@ -228,7 +225,6 @@ const handleSortChange = (column) => {
 
 // 挂载
 onMounted(async function () {
-  await getAdminData()
   await get()
   await getMarket()
   await getExportList()
diff --git a/src/views/usergold/gold/clientCountDetail.vue b/src/views/usergold/gold/clientCountDetail.vue
index f3e0f97..05d08c7 100644
--- a/src/views/usergold/gold/clientCountDetail.vue
+++ b/src/views/usergold/gold/clientCountDetail.vue
@@ -6,7 +6,11 @@ import moment from 'moment'
 import API from '@/util/http.js'
 import {reverseMarketMapping} from "../../../utils/marketMap.js";
 import dayjs from "dayjs";
-
+import { useAdminStore } from "@/store/index.js"
+import { storeToRefs } from "pinia"
+import { findMenuById, permissionMapping } from "@/utils/menuTreePermission.js"
+const adminStore = useAdminStore()
+const { adminData, menuTree } = storeToRefs(adminStore)
 //新增复选框员工数据
 const showEmployeeData = ref(false)
 
@@ -29,18 +33,6 @@ const totalTaskGold = ref(0)
 const totalGoldTotal = ref(0)
 
 // 变量
-const adminData = ref({})
-const getAdminData = async function () {
-  try {
-    const result = await API({url: '/admin/userinfo', data: {}})
-    adminData.value = result
-    console.log('请求成功', result)
-    console.log('管理员用户信息', adminData.value)
-  } catch (error) {
-    console.log('请求失败', error)
-  }
-}
-
 // 精网号去空格，处理 goldDetail 中的 jwcode
 const trimJwCode = () => {
   if (goldDetail.value.jwcode) {
@@ -128,6 +120,10 @@ const getObj = ref({
 // 搜索===========================================================================
 // 搜索方法
 const get = async function (val) {
+  if(!findMenuById(menuTree.value, permissionMapping.coinCustomerDetail)){
+    ElMessage.error('无此权限')
+    return
+  }
   try {
     // 搜索参数页码赋值
     if (typeof val === 'number') {
@@ -174,18 +170,6 @@ const get = async function (val) {
     console.log('响应数据', result)
     tableData.value = result.data.list
     total.value = result.data.total
-
-    // 更新永久金币、任务金币
-    // permanentGold.value = tableData.value.reduce((total, row) => {
-    //   return total + (Number(row.permanentGold) || 0);
-    // }, 0);
-
-    // taskGold.value = tableData.value.reduce((total, row) => {
-    //   return total + (Number(row.taskGold) || 0);
-    // }, 0);
-    //由于免费金币的计算方式是6月免费+12月免费，所以需要单独处理，以及计算总的免费金币和总的金币数放在一块
-
-
     const totalResult = await API({
       url: '/goldDetail/getTotal',
       method: 'post',
@@ -278,28 +262,12 @@ const get7Days = function () {
   search()
 }
 
-// // 计算所有记录的金币总数
-// const sumGoldTotal = computed(() => {
-//   return tableData.value.reduce((total, row) => {
-//     return total + (Number(row.sumGold) || 0);
-//   }, 0);
-// });
-
-
 // 计算每行免费金币6月+12月的方法
 const calculateFreeGold = (row) => {
   const freeJune = row.freeJune || 0;
   const freeDecember = row.freeDecember || 0;
   return (freeJune + freeDecember);
-};
-
-// 计算总免费金币的计算属性
-// const totalFreeGold = computed(() => {
-//   return tableData.value.reduce((total, row) => {
-//     return total + calculateFreeGold(row);
-//   }, 0);
-// });
-
+}
 // 新增排序字段和排序方式
 const sortField = ref('')
 const sortOrder = ref('')
@@ -355,7 +323,6 @@ const handleCurrentChange = function (val) {
 
 // 挂载
 onMounted(async function () {
-  await getAdminData()
   await get()
   await getMarket()
 

From 1930dabbb9b27063f4d2a77489699420bdc6fed1 Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Fri, 19 Sep 2025 14:02:59 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=EF=BC=8C=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=EF=BC=8C=E6=B6=88=E8=80=97=EF=BC=8C=E6=B1=87=E7=8E=87?=
 =?UTF-8?q?=E7=9A=84=E6=93=8D=E4=BD=9C=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/audit/bean/beanAudit.vue       | 244 ++++++++++++++++---------------
 src/views/audit/gold/audit.vue           |   4 +-
 src/views/audit/gold/rechargeAudit.vue   |  19 ++-
 src/views/audit/gold/refundAudit.vue     |  42 +++---
 src/views/consume/bean/beanConsume.vue   |   8 +-
 src/views/consume/gold/coinConsume.vue   |   4 +-
 src/views/managerecharge/rate.vue        |  30 ++--
 src/views/recharge/bean/beanRecharge.vue |   6 +-
 src/views/recharge/gold/coinRecharge.vue |   4 +-
 9 files changed, 193 insertions(+), 168 deletions(-)

diff --git a/src/views/audit/bean/beanAudit.vue b/src/views/audit/bean/beanAudit.vue
index 2f94bb6..177f107 100644
--- a/src/views/audit/bean/beanAudit.vue
+++ b/src/views/audit/bean/beanAudit.vue
@@ -22,11 +22,11 @@
     </el-col>
   </el-card>
 
-  <el-card>
+  <el-card v-if="hasbeanWaitShow">
     <el-tabs v-model="checkTab" type="card" @tab-click="handleClick">
-      <el-tab-pane label="待审核" name="pending"></el-tab-pane>
-      <el-tab-pane label="已通过" name="pass"></el-tab-pane>
-      <el-tab-pane label="已驳回" name="reject"></el-tab-pane>
+      <el-tab-pane label="待审核" name="pending" v-if="hasbeanWait"></el-tab-pane>
+      <el-tab-pane label="已通过" name="pass" v-if="hasbeanThrough"></el-tab-pane>
+      <el-tab-pane label="已驳回" name="reject" v-if="hasbeanReject"></el-tab-pane>
     </el-tabs>
 
     <div>
@@ -61,12 +61,12 @@
           {{ row.auditTime ? moment(row.auditTime).format('YYYY-MM-DD HH:mm:ss') : '--' }}
         </template>
       </el-table-column>
-      <el-table-column v-if="checkTab === 'pending'" fixed="right" prop="operation" label="操作" width="400px">
+      <el-table-column v-if="checkTab === 'pending' &&(hasbeanWaitThough||hasbeanWaitReject)" fixed="right" prop="operation" label="操作" width="400px">
         <template #default="scope">
           <div class="operation">
             <el-popconfirm title="确定要通过此条记录吗？" @confirm="handleApprove(scope.row)">
               <template #reference>
-                <el-button :disabled="clicked || cancelClicked" type="primary" text>
+                <el-button v-if="hasbeanWaitThough" :disabled="clicked || cancelClicked" type="primary" text>
                   通过
                 </el-button>
               </template>
@@ -77,7 +77,7 @@
                 </el-button>
               </template>
             </el-popconfirm>
-            <el-button :disabled="clicked || cancelClicked" type="primary" text @click="showRejectDialog(scope.row)">
+            <el-button v-if="hasbeanWaitReject" :disabled="clicked || cancelClicked" type="primary" text @click="showRejectDialog(scope.row)">
               驳回
             </el-button>
           </div>
@@ -111,13 +111,13 @@ import moment from 'moment'
 import { useAdminStore } from "@/store/index.js";
 import { storeToRefs } from "pinia";
 import _ from 'lodash'
+import { permissionMapping, hasMenuPermission } from "@/utils/menuTreePermission.js"
 const defaultTime = [
   new Date(2000, 1, 1, 0, 0, 0),
   new Date(2000, 2, 1, 23, 59, 59),
 ]
 const adminStore = useAdminStore();
 const { adminData, menuTree } = storeToRefs(adminStore);
-import { permissionMapping, findMenuById } from "@/utils/menuTreePermission.js"
 import dayjs from "dayjs";
 
 const tableData = ref([])
@@ -144,13 +144,12 @@ const hasbeanWaitReject = ref(false)  // 金豆审核驳回（对应beanWaitReje
 // 初始化权限状态（补充金豆审核权限，与充值权限初始化逻辑并列）
 const initPermissions = () => {
   if (!menuTree.value || !menuTree.value.length) return;
-  // 2. 金豆审核相关权限初始化（新增，与充值权限结构一致）
-  hasbeanWait.value = hasMenuPermission(menuTree.value, permissionMapping.hasbeanWait);
-  hasbeanThrough.value = hasMenuPermission(menuTree.value, permissionMapping.hasbeanThrough);
-  hasbeanReject.value = hasMenuPermission(menuTree.value, permissionMapping.hasbeanReject);
-  hasbeanWaitShow.value = hasMenuPermission(menuTree.value, permissionMapping.hasbeanWaitShow);
-  hasbeanWaitThough.value = hasMenuPermission(menuTree.value, permissionMapping.hasbeanWaitThough);
-  hasbeanWaitReject.value = hasMenuPermission(menuTree.value, permissionMapping.hasbeanWaitReject);
+  hasbeanWait.value = hasMenuPermission(menuTree.value, permissionMapping.beanWait);
+  hasbeanThrough.value = hasMenuPermission(menuTree.value, permissionMapping.beanThrough);
+  hasbeanReject.value = hasMenuPermission(menuTree.value, permissionMapping.beanReject);
+  hasbeanWaitShow.value = hasMenuPermission(menuTree.value, permissionMapping.beanWaitShow);
+  hasbeanWaitThough.value = hasMenuPermission(menuTree.value, permissionMapping.beanWaitThough);
+  hasbeanWaitReject.value = hasMenuPermission(menuTree.value, permissionMapping.beanWaitReject);
 };
 const clicked = ref(false)
 // 状态常量
@@ -212,131 +211,129 @@ const handleSearch = async function () {
   await getStats()
 }
 const get = async function () {
-  if (findMenuById(menuTree.value, permissionMapping.View_Golden_Bean_Recharge_Audit)) {
-    try {
-      if (dateRange.value && dateRange.value.length === 2) {
-        if (checkTab.value === 'pending') {
-          searchForm.value.createStartTime = moment(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss')
-          searchForm.value.createEndTime = moment(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss')
-        } else {
-          searchForm.value.auditStartTime = moment(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss')
-          searchForm.value.auditEndTime = moment(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss')
-        }
+  if (!hasbeanWaitShow) {
+    ElMessage.error('暂无权限')
+    return
+  }
+  try {
+    if (dateRange.value && dateRange.value.length === 2) {
+      if (checkTab.value === 'pending') {
+        searchForm.value.createStartTime = moment(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss')
+        searchForm.value.createEndTime = moment(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss')
       } else {
-        searchForm.value.createStartTime = ''
-        searchForm.value.createEndTime = ''
-      }
-        if(checkTab.value === 'pending'){
-          sortField.value = 'createTime'
-          sortOrder.value = 'desc'
-        }else{
-          sortField.value = 'auditTime'
-          sortOrder.value = 'desc'
-        }
-      const params = {
-        pageNum: pagination.value.pageNum,//页码
-        pageSize: pagination.value.pageSize,//页面大小
-        beanAuditInfo: {
-          jwcode: searchForm.value.jwcode,
-          status: searchForm.value.status,
-          market: searchForm.value.market,
-          createStartTime: searchForm.value.createStartTime,
-          createEndTime: searchForm.value.createEndTime,
-          auditStartTime: searchForm.value.auditStartTime,
-          auditEndTime: searchForm.value.auditEndTime,
-          sortField: sortField.value,
-          sortOrder: sortOrder.value
-        }
+        searchForm.value.auditStartTime = moment(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss')
+        searchForm.value.auditEndTime = moment(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss')
       }
-      console.log('看看传给后端的参数：', params)
-      const res = await API({ url: '/beanAudit/selectBy', data: params })
-      tableData.value = res.data.list || []
-    } catch (error) {
-      console.error('获取数据失败', error)
+    } else {
+      searchForm.value.createStartTime = ''
+      searchForm.value.createEndTime = ''
     }
-  } else {
-    ElMessage.error('无此权限')
-  }
-}
-const getStats = async () => {
-  if (findMenuById(menuTree.value, permissionMapping.View_Golden_Bean_Recharge_Audit)) {
-    try {
-      const params = {
+    if (checkTab.value === 'pending') {
+      sortField.value = 'createTime'
+      sortOrder.value = 'desc'
+    } else {
+      sortField.value = 'auditTime'
+      sortOrder.value = 'desc'
+    }
+    const params = {
+      pageNum: pagination.value.pageNum,//页码
+      pageSize: pagination.value.pageSize,//页面大小
+      beanAuditInfo: {
         jwcode: searchForm.value.jwcode,
         status: searchForm.value.status,
         market: searchForm.value.market,
         createStartTime: searchForm.value.createStartTime,
         createEndTime: searchForm.value.createEndTime,
         auditStartTime: searchForm.value.auditStartTime,
-        auditEndTime: searchForm.value.auditEndTime
+        auditEndTime: searchForm.value.auditEndTime,
+        sortField: sortField.value,
+        sortOrder: sortOrder.value
       }
-      const res = await API({
-        url: '/beanAudit/statsBean',
-        data: params
-      })
-
-      stats.value.num = res.data.num
-      stats.value.permanentBean = res.data.permanentBean
-      stats.value.freeBean = res.data.freeBean
-      stats.value.beanNum = res.data.beanNum
-      console.log('see see stats和搜索对象', stats.value, params)
-    } catch (error) {
-      console.log('请求失败', error)
     }
-  } else {
-    ElMessage.error('无此权限')
+    console.log('看看传给后端的参数：', params)
+    const res = await API({ url: '/beanAudit/selectBy', data: params })
+    tableData.value = res.data.list || []
+  } catch (error) {
+    console.error('获取数据失败', error)
+  }
+}
+const getStats = async () => {
+  if (!hasbeanWaitShow) {
+    ElMessage.error('暂无权限')
+    return
+  }
+  try {
+    const params = {
+      jwcode: searchForm.value.jwcode,
+      status: searchForm.value.status,
+      market: searchForm.value.market,
+      createStartTime: searchForm.value.createStartTime,
+      createEndTime: searchForm.value.createEndTime,
+      auditStartTime: searchForm.value.auditStartTime,
+      auditEndTime: searchForm.value.auditEndTime
+    }
+    const res = await API({
+      url: '/beanAudit/statsBean',
+      data: params
+    })
+
+    stats.value.num = res.data.num
+    stats.value.permanentBean = res.data.permanentBean
+    stats.value.freeBean = res.data.freeBean
+    stats.value.beanNum = res.data.beanNum
+    console.log('see see stats和搜索对象', stats.value, params)
+  } catch (error) {
+    console.log('请求失败', error)
   }
 }
 // 处理通过操作
 const handleApprove = async (row) => {
+    if (!hasbeanWaitThough) {
+    ElMessage.error('暂无权限')
+    return
+  }
   clicked.value = true
-  if (findMenuById(menuTree.value, permissionMapping.Golden_Bean_Recharge_Approval)) {
-    try {
-      const params = {
-        id: row.id,
-        auditName: adminData.value.adminName
-      }
-      await API({ url: '/beanAudit/status1', data: params })
-      ElMessage.success('审核通过成功')
-      await get()
-      clicked.value = false
-      await getStats()
-    } catch (error) {
-      console.error('审核通过失败', error)
-      ElMessage.error('操作失败')
+  try {
+    const params = {
+      id: row.id,
+      auditName: adminData.value.adminName
     }
-  } else {
-    ElMessage.error('无此权限')
+    await API({ url: '/beanAudit/status1', data: params })
+    ElMessage.success('审核通过成功')
+    await get()
     clicked.value = false
+    await getStats()
+  } catch (error) {
+    console.error('审核通过失败', error)
+    ElMessage.error('操作失败')
   }
 }
 // 处理驳回操作
 const handleReject = async () => {
+  if (!hasbeanWaitReject) {
+    ElMessage.error('暂无权限')
+    return
+  }
   cancelClicked.value = true
-  if (findMenuById(menuTree.value, permissionMapping.Golden_Bean_Recharge_Approval)) {
-    if (!reason.value.trim()) {
-      ElMessage.warning('请输入驳回理由')
-      return
-    }
-    try {
-      const params = {
-        id: rejectRow.value.id,
-        auditName: adminData.value.adminName,
-        reason: reason.value
-      }
-      await API({ url: '/beanAudit/status2', data: params })
-      ElMessage.success('驳回成功')
-      rejectVisible.value = false
-      await get()
-      cancelClicked.value = false
-      await getStats()
-    } catch (error) {
-      console.error('驳回失败', error)
-      ElMessage.error('操作失败')
+  if (!reason.value.trim()) {
+    ElMessage.warning('请输入驳回理由')
+    return
+  }
+  try {
+    const params = {
+      id: rejectRow.value.id,
+      auditName: adminData.value.adminName,
+      reason: reason.value
     }
-  } else {
-    ElMessage.error('无此权限')
+    await API({ url: '/beanAudit/status2', data: params })
+    ElMessage.success('驳回成功')
+    rejectVisible.value = false
+    await get()
     cancelClicked.value = false
+    await getStats()
+  } catch (error) {
+    console.error('驳回失败', error)
+    ElMessage.error('操作失败')
   }
 }
 const getToday = async function () {
@@ -390,10 +387,22 @@ const resetSearch = async function () {
 const handleClick = async function (tab) {
   checkTab.value = tab.props.name
   if (tab.props.name === 'pending') {
+    if (!hasbeanWait) {
+      ElMessage.error('暂无权限')
+      return
+    }
     adminWait()
   } else if (tab.props.name === 'pass') {
+    if (!hasbeanThrough) {
+      ElMessage.error('暂无权限')
+      return
+    }
     adminPass()
   } else if (tab.props.name === 'reject') {
+    if (!hasbeanReject) {
+      ElMessage.error('暂无权限')
+      return
+    }
     adminReject()
   }
 }
@@ -449,6 +458,10 @@ const throttledHandleApprove = _.throttle(handleApprove, 5000, {
   trailing: false
 })
 const showRejectDialog = (row) => {
+   if (!hasbeanWaitReject) {
+    ElMessage.error('暂无权限')
+    return
+  }
   rejectRow.value.id = row.id
   reason.value = ''
   rejectVisible.value = true
@@ -487,6 +500,7 @@ const trimJwCode = () => {
   }
 }
 onMounted(async () => {
+  initPermissions()
   getmarkets()
   await get()
   await getStats()
diff --git a/src/views/audit/gold/audit.vue b/src/views/audit/gold/audit.vue
index 532f69b..ed6caac 100644
--- a/src/views/audit/gold/audit.vue
+++ b/src/views/audit/gold/audit.vue
@@ -3,11 +3,11 @@
     <div style="height:4vh;width:82vw;">
     <el-button-group>
       <el-button :type="activeTab === 'rechargeAudit' ? 'primary' : 'default'" @click="navigateTo('rechargeAudit')"
-        :disabled="!hasRecharge">
+        v-if="hasRecharge">
         充值审核
       </el-button>
       <el-button :type="activeTab === 'refundAudit' ? 'primary' : 'default'" @click="navigateTo('refundAudit')"
-        :disabled="!hasRefund">
+        v-if="hasRefund">
         退款审核
       </el-button>
     </el-button-group>
diff --git a/src/views/audit/gold/rechargeAudit.vue b/src/views/audit/gold/rechargeAudit.vue
index 2b1feaa..909ce48 100644
--- a/src/views/audit/gold/rechargeAudit.vue
+++ b/src/views/audit/gold/rechargeAudit.vue
@@ -47,11 +47,11 @@
       </div>
     </el-col>
   </el-card>
-  <el-card>
+  <el-card v-if="hasrechargeWaitShow">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane label="待审核" name="wait"></el-tab-pane>
-      <el-tab-pane label="已通过" name="pass"></el-tab-pane>
-      <el-tab-pane label="已驳回" name="reject"></el-tab-pane>
+      <el-tab-pane label="待审核" name="wait" v-if="hasrechargeWait"></el-tab-pane>
+      <el-tab-pane label="已通过" name="pass" v-if="hasrechargeThrough"></el-tab-pane>
+      <el-tab-pane label="已驳回" name="reject" v-if="hasrechargeReject"></el-tab-pane>
       <div>
 
         <!--        总条数：{{ format3(stats.totalNum) }}条&nbsp;&nbsp;&nbsp;&nbsp;-->
@@ -119,12 +119,12 @@
           {{ moment(scope.row.auditTime).format('YYYY-MM-DD HH:mm:ss') }}
         </template>
       </el-table-column>
-      <el-table-column v-if="activeName === 'wait'" fixed="right" prop="operation" label="操作" width="150px">
+      <el-table-column v-if="activeName === 'wait'&&(hasrechargeWaitThough||hasrechargeWaitReject)" fixed="right" prop="operation" label="操作" width="150px">
         <template #default="scope">
           <div class="operation">
             <el-popconfirm title="确定要通过此条记录吗？" @confirm="handleApprove(scope.row)">
               <template #reference>
-                <el-button :disabled="clicked || cancelClicked" type="primary" text>
+                <el-button v-if="hasrechargeWaitThough" :disabled="clicked || cancelClicked" type="primary" text>
                   通过
                 </el-button>
               </template>
@@ -135,7 +135,7 @@
                 </el-button>
               </template>
             </el-popconfirm>
-            <el-button :disabled="clicked || cancelClicked" type="primary" text @click="showRejectDialog(scope.row)">
+            <el-button v-if="hasrechargeWaitReject" :disabled="clicked || cancelClicked" type="primary" text @click="showRejectDialog(scope.row)">
               驳回
             </el-button>
           </div>
@@ -238,7 +238,7 @@ const initPermissions = () => {
   hasrechargeWait.value = hasMenuPermission(menuTree.value, permissionMapping.rechargeWait);
   hasrechargeWaitShow.value = hasMenuPermission(menuTree.value, permissionMapping.rechargeWaitShow);
   hasrechargeWaitThough.value = hasMenuPermission(menuTree.value, permissionMapping.rechargeWaitThough);
-  hasrechargeWaitReject.value = hasMenuPermission(menuTree.value, permissionMapping.hasrechargeWaitReject);
+  hasrechargeWaitReject.value = hasMenuPermission(menuTree.value, permissionMapping.rechargeWaitReject);
   console.log(hasrechargeWaitThough.value)
   console.log(hasrechargeWaitReject.value)
 
@@ -695,13 +695,12 @@ const cancelClick = () => {
 const formatTime = (val) => val ? moment(val).format('YYYY-MM-DD HH:mm:ss') : ''
 // 挂载
 onMounted(async function () {
+  initPermissions()
   await getActivity()
   await getMarket()
   await getRecharge()
   console.log("看看通信来的用户身份", adminData.value)
   await getStats()
-
-  initPermissions()
 })
 </script>
 
diff --git a/src/views/audit/gold/refundAudit.vue b/src/views/audit/gold/refundAudit.vue
index 22fcc34..c81d2b2 100644
--- a/src/views/audit/gold/refundAudit.vue
+++ b/src/views/audit/gold/refundAudit.vue
@@ -49,11 +49,11 @@
     </el-col>
   </el-card>
 
-  <el-card>
+  <el-card v-if="hasrefundWaitShow">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane label="待审核" name="wait"></el-tab-pane>
-      <el-tab-pane label="已通过" name="pass"></el-tab-pane>
-      <el-tab-pane label="已驳回" name="reject"></el-tab-pane>
+      <el-tab-pane label="待审核" name="wait" v-if="hasrefundWait"></el-tab-pane>
+      <el-tab-pane label="已通过" name="pass" v-if="hasrefundThrough"></el-tab-pane>
+      <el-tab-pane label="已驳回" name="reject" v-if="hasrefundReject"></el-tab-pane>
     </el-tabs>
 
     <div>
@@ -118,12 +118,13 @@
           {{ row.auditTime ? moment(row.auditTime).format('YYYY-MM-DD HH:mm:ss') : '--' }}
         </template>
       </el-table-column>
-      <el-table-column v-if="checkTab === 'pending'" fixed="right" prop="operation" label="操作" width="150px">
+      <el-table-column v-if="checkTab === 'pending' && (hasrefundWaitThough || hasrefundWaitReject)" fixed="right"
+        prop="operation" label="操作" width="150px">
         <template #default="scope">
           <div class="operation">
             <el-popconfirm title="确定要通过此条记录吗？" @confirm="handleApprove(scope.row)">
               <template #reference>
-                <el-button :disabled="clicked || cancelClicked" type="primary" text>
+                <el-button v-if="hasrefundWaitThough" :disabled="clicked || cancelClicked" type="primary" text>
                   通过
                 </el-button>
               </template>
@@ -134,7 +135,8 @@
                 </el-button>
               </template>
             </el-popconfirm>
-            <el-button :disabled="clicked || cancelClicked" type="primary" text @click="showRejectDialog(scope.row)">
+            <el-button v-if="hasrefundWaitReject" :disabled="clicked || cancelClicked" type="primary" text
+              @click="showRejectDialog(scope.row)">
               驳回
             </el-button>
           </div>
@@ -505,22 +507,22 @@ const handleClick = function (tab, event) {
   activeName.value = tab.props.name
   if (tab.props.name === 'wait') {
     console.log(hasrefundWait.value);
-     if (!hasrefundWait) {
-        ElMessage.error('暂无权限')
-        return
-      }
+    if (!hasrefundWait) {
+      ElMessage.error('暂无权限')
+      return
+    }
     adminWait()
   } else if (tab.props.name === 'pass') {
-    if (hasrefundThrough.value) {
-        ElMessage.error('暂无权限')
-        return
-      }
+    if (!hasrefundThrough.value) {
+      ElMessage.error('暂无权限')
+      return
+    }
     adminPass()
   } else if (tab.props.name === 'reject') {
-      if (!hasrefundReject) {
-        ElMessage.error('暂无权限')
-        return
-      }
+    if (!hasrefundReject) {
+      ElMessage.error('暂无权限')
+      return
+    }
     adminReject()
   }
 }
@@ -612,11 +614,11 @@ const handleCurrentChange = function (val) {
   get()
 }
 onMounted(async () => {
+  initPermissions()
   getRefundGoods()
   await getMarket()
   await get()
   await getStats()
-  initPermissions()
 })
 </script>
 
diff --git a/src/views/consume/bean/beanConsume.vue b/src/views/consume/bean/beanConsume.vue
index 496297b..8788c41 100644
--- a/src/views/consume/bean/beanConsume.vue
+++ b/src/views/consume/bean/beanConsume.vue
@@ -4,7 +4,7 @@
       <el-button
           :type="activeTab === 'addBeanConsume' ? 'primary' : 'default'"
           @click="navigateTo('addBeanConsume')"
-          :disabled="!hasAdd"
+          v-if="hasAdd"
           style="width: 120px;"
       >
         新增消耗
@@ -12,7 +12,7 @@
       <el-button
           :type="activeTab === 'liveStream' ? 'primary' : 'default'"
           @click="navigateTo('liveStream')"
-          :disabled="!hasLive"
+          v-if="hasLive"
           style="width: 120px;"
       >
         直播
@@ -20,7 +20,7 @@
       <el-button
           :type="activeTab === 'dieHardFan' ? 'primary' : 'default'"
           @click="navigateTo('dieHardFan')"
-          :disabled="!hasFan"
+          v-if="hasFan"
           style="width: 120px;"
       >
         铁粉
@@ -28,7 +28,7 @@
       <el-button
           :type="activeTab === 'articleVideo' ? 'primary' : 'default'"
           @click="navigateTo('articleVideo')"
-          :disabled="!hasArticleVideo"
+         v-if="hasArticleVideo"
           style="width: 120px;"
       >
         文章/视频
diff --git a/src/views/consume/gold/coinConsume.vue b/src/views/consume/gold/coinConsume.vue
index 2838da3..0439276 100644
--- a/src/views/consume/gold/coinConsume.vue
+++ b/src/views/consume/gold/coinConsume.vue
@@ -3,11 +3,11 @@
   <div class="fatherTop">
     <el-button-group>
       <el-button :type="activeTab === 'coinConsumeDetail' ? 'primary' : 'default'"
-        @click="navigateTo('coinConsumeDetail')" :disabled="!hasDetail">
+        @click="navigateTo('coinConsumeDetail')" v-if="hasDetail">
         金币消耗明细
       </el-button>
       <el-button :type="activeTab === 'addCoinConsume' ? 'primary' : 'default'" @click="navigateTo('addCoinConsume')"
-        :disabled="!hasAdd">
+        v-if="hasAdd">
         新增消耗
       </el-button>
     </el-button-group>
diff --git a/src/views/managerecharge/rate.vue b/src/views/managerecharge/rate.vue
index 436e18a..a4424a4 100644
--- a/src/views/managerecharge/rate.vue
+++ b/src/views/managerecharge/rate.vue
@@ -4,7 +4,7 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 import request from '@/util/http'
 import { useAdminStore } from "@/store/index.js";
 import { storeToRefs } from "pinia";
-import { findMenuById, permissionMapping } from "@/utils/menuTreePermission.js"
+import { permissionMapping, hasMenuPermission } from "@/utils/menuTreePermission.js"
 const adminStore = useAdminStore()
 const { adminData, menuTree } = storeToRefs(adminStore)
 const regeEdit = ref(false)
@@ -121,11 +121,22 @@ const getEditData = async function (row) {
     console.log('请求失败', error)
   }
 }
-const editRole = ref(true)
-editRole.value = findMenuById(menuTree.value, permissionMapping.rateEdit)
+const hasrateShow = ref(false)
+const hasrateEdit = ref(false)
+
+// 初始化权限状态
+const initPermissions = () => {
+  if (!menuTree.value || !menuTree.value.length) return;
+  hasrateShow.value = hasMenuPermission(menuTree.value, permissionMapping.rateShow);
+  hasrateShow.value = hasMenuPermission(menuTree.value, permissionMapping.rateShow);
+
+};
 // 编辑汇率
 const editRate = async function () {
-  if (findMenuById(menuTree.value, permissionMapping.rateEdit)) {
+   if(!hasrateEdit){
+      ElMessage.error('暂无权限')
+      return
+    }
     // 提交前验证 汇率是否为数字
     rateEdit.value.num = parseFloat(rateEdit.value.num);
     try {
@@ -139,9 +150,7 @@ const editRate = async function () {
     } catch (error) {
       console.log('请求失败', error)
     }
-  } else {
-    ElMessage.error('没有权限')
-  }
+ 
 }
 // 添加前验证
 const edit = () => {
@@ -237,12 +246,13 @@ function handleInput(value) {
   return value
 }
 onMounted(async function () {
+  initPermissions()
   await getAllRate()
 })
 </script>
 
 <template>
-  <el-card style="width:82vw;height:85vh">
+  <el-card style="width:82vw;height:85vh" v-if="hasrateShow">
     <el-table :data="tableData" v-if="(tableData.flag = 1)">
       <el-table-column type="index" label="序号" width="100px" fixed="left">
         <template #default="scope">
@@ -265,9 +275,9 @@ onMounted(async function () {
           <span>{{ formatDate(scope.row.updateTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" :span="3">
+      <el-table-column v-if="hasrateEdit" label="操作" :span="3">
         <template #default="scope">
-          <el-button :disabled="!editRole" type="text" @click="() => {
+          <el-button type="text" @click="() => {
             regeEdit = true
             getEditData(scope.row)
           }">编辑
diff --git a/src/views/recharge/bean/beanRecharge.vue b/src/views/recharge/bean/beanRecharge.vue
index 6b532ce..0f3d677 100644
--- a/src/views/recharge/bean/beanRecharge.vue
+++ b/src/views/recharge/bean/beanRecharge.vue
@@ -2,15 +2,15 @@
   <div class="father">
     <el-button-group>
       <el-button :type="activeTab === 'addBeanRecharge' ? 'primary' : 'default'" @click="navigateTo('addBeanRecharge')"
-        :disabled="!hasAdd" style="width: 6.5vw">
+        v-if="hasAdd" style="width: 6.5vw">
         新增充值
       </el-button>
       <el-button :type="activeTab === 'beanSystemRecharge' ? 'primary' : 'default'"
-        @click="navigateTo('beanSystemRecharge')" :disabled="!hasSystem" style="width: 6.5vw;">
+        @click="navigateTo('beanSystemRecharge')" v-if="hasSystem" style="width: 6.5vw;">
         系统充值
       </el-button>
       <el-button :type="activeTab === 'beanOnlineRecharge' ? 'primary' : 'default'"
-        @click="navigateTo('beanOnlineRecharge')" :disabled="!hasOnline" style="width: 6.5vw;">
+        @click="navigateTo('beanOnlineRecharge')" v-if="hasOnline" style="width: 6.5vw;">
         线上充值
       </el-button>
     </el-button-group>
diff --git a/src/views/recharge/gold/coinRecharge.vue b/src/views/recharge/gold/coinRecharge.vue
index ddb7449..77b19c0 100644
--- a/src/views/recharge/gold/coinRecharge.vue
+++ b/src/views/recharge/gold/coinRecharge.vue
@@ -2,11 +2,11 @@
   <div style="height:4vh;">
     <el-button-group>
       <el-button :type="activeTab === 'coinRechargeDetail' ? 'primary' : 'default'"
-        @click="navigateTo('coinRechargeDetail')" :disabled="!hasDetail">
+        @click="navigateTo('coinRechargeDetail')" v-if="hasDetail">
         金币充值明细
       </el-button>
       <el-button :type="activeTab === 'addCoinRecharge' ? 'primary' : 'default'" @click="navigateTo('addCoinRecharge')"
-        :disabled="!hasAdd">
+        v-if="hasAdd">
         新增充值
       </el-button>
     </el-button-group>

From 5334f9d5fc6c43e6ee5c5e26ebc67b11091ca0bd Mon Sep 17 00:00:00 2001
From: lihuilin <analsak@163.com>
Date: Fri, 19 Sep 2025 14:16:29 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E6=9D=83=E9=99=90=E4=B8=8B=E5=8D=8A?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/permissions/rolePermission.vue   | 53 ++++++++++++++++--------------
 src/views/permissions/userPermission.vue   | 13 ++++----
 src/views/refund/gold/addCoinRefund.vue    |  2 +-
 src/views/refund/gold/coinRefund.vue       |  4 +--
 src/views/refund/gold/coinRefundDetail.vue |  4 +--
 src/views/usergold/gold/clientCount.vue    |  4 +--
 6 files changed, 43 insertions(+), 37 deletions(-)

diff --git a/src/views/permissions/rolePermission.vue b/src/views/permissions/rolePermission.vue
index b7d25bc..1e5e606 100644
--- a/src/views/permissions/rolePermission.vue
+++ b/src/views/permissions/rolePermission.vue
@@ -240,23 +240,10 @@ const getLists = async function () {
       data: { id: roleId }
     })
     data.value = res.data
-    // let originalData = res.data.filter(item => item.id !== 9);
-    // 排除金豆菜单
-    // data.value = filterGoldenBeanMenus(originalData);
-    // data.value = data.value.filter(item => item.id !== 9);
-
-    data.value = data.value.filter(item => item.id !== 9);
+    data.value = filterPermission(data.value)
     console.log('看看data', data.value)
     console.log('parentID:', addRole.value.parentId, 'roleId:', roleId)
 
-
-    /*    // 根据地区过滤金豆菜单
-        if (addRole.value.market !== '总部') {
-          // 非总部地区：过滤掉金豆相关菜单
-          originalData = filterGoldenBeanMenus(originalData);
-        }
-        data.value = originalData; // 更新菜单树数据*/
-
     if (addRole.value.parentId && addRole.value.parentId !== 2) {
       const result = await API({
         url: '/general/roleMarket',
@@ -290,11 +277,15 @@ const getLists = async function () {
 
 //金豆过滤
 const goldenBeanMenuIds = new Set([
-  43, 55, 54,       // 财务审核 -> 金豆审核
-  41, 47, 46, 48,   // 充值管理 -> 金豆充值
-  42, 50, 49, 52, 51, // 消耗管理 -> 金豆消耗
-  45, 53            // 客户账户明细 -> 金豆客户账户明细
+permissionMapping.beanAudit,
+permissionMapping.beanRecharge,
+permissionMapping.beanConsume,
+permissionMapping.beanDetail
 ])
+// 15,43,44,45,46,47,// 金豆审核
+//   18,52,53,54,// 金豆充值
+//   20,57,58,59,60,// 金豆消耗
+//   23// 金豆客户账户明细
 const filterGoldenBeanMenus = (tree) => {
   return tree
     .filter(item => {
@@ -309,6 +300,18 @@ const filterGoldenBeanMenus = (tree) => {
       return true
     })
 }
+// 过滤权限模块(????????)俺不会
+const filterPermission = (tree) => {
+  return tree.filter(item =>{
+    if(item.id === permissionMapping.permissionManage){
+      return false
+    }
+    else if(item.children && item.children.length > 0){
+      item.children = filterPermission(item.children)
+    }
+    return true
+  })
+}
 // 处理编辑角色权限时的勾选事件
 const handleEditRolePermissionCheck = (checkedNodes, checkedInfo) => {
   const { checkedKeys, checkedNodes: allCheckedNodes } = checkedInfo
@@ -436,8 +439,8 @@ const permissionEditRoleInit = async function (row) {
       data: { id: roleId }
     });
     data.value = res.data;
-    data.value = data.value.filter(item => item.id !== 9);
-    data.value = filterGoldenBeanMenus(data.value);
+    data.value = filterPermission(data.value)
+    //data.value = filterGoldenBeanMenus(data.value);
 
     // 收集当前行权限树的叶子节点id（只收集实际选中的叶子节点）
     if (row.tree && row.tree.length > 0) {
@@ -571,7 +574,9 @@ const Rolerules = reactive({
 const throttledHandleAddRole = _.throttle(handleAddRole, 5000, {
   trailing: false
 })
-
+const canLook = findMenuById(menuTree.value,permissionMapping.roleManageShow)
+const canAdd = findMenuById(menuTree.value, permissionMapping.addRoleInfo)
+const canEdit = findMenuById(menuTree.value, permissionMapping.editRoleInfo)
 // 挂载
 onMounted(async function () {
   await getRoleList()
@@ -587,14 +592,14 @@ onMounted(async function () {
         <el-input v-model="role.name" style="width: 240px" placeholder="请输入角色名称" clearable />
         <div style="margin-left: auto;">
           <el-button type="success" @click="reset()">重置</el-button>
-          <el-button type="primary" @click="searchRole()">查询</el-button>
+          <el-button type="primary" @click="searchRole()" :disabled="canLook" v-if="canLook">查询</el-button>
         </div>
       </div>
     </el-card>
 
     <el-card>
       <div class="add-item">
-        <el-button style="color: #048efb; border: 1px solid #048efb" @click="permissionAddInit()">新增角色</el-button>
+        <el-button style="color: #048efb; border: 1px solid #048efb" @click="permissionAddInit()" :disabled="!canAdd" v-if="canAdd">新增角色</el-button>
       </div>
       <div>
         <el-table :data="roleData" style="width: 100%" show-overflow-tooltip>
@@ -621,7 +626,7 @@ onMounted(async function () {
           </el-table-column>
           <el-table-column prop="operation" label="操作" width="200px">
             <template #default="scope">
-              <el-button type="warning" text @click="permissionEditRoleInit(scope.row)" :disabled="(scope.row.id === 2)|| (scope.row.id === 1)">
+              <el-button type="warning" text @click="permissionEditRoleInit(scope.row)" :disabled="(scope.row.id === 2)|| (scope.row.id === 1) || !canEdit" v-if="canEdit">
                 编辑
               </el-button>
             </template>
diff --git a/src/views/permissions/userPermission.vue b/src/views/permissions/userPermission.vue
index 8a0caa7..6240935 100644
--- a/src/views/permissions/userPermission.vue
+++ b/src/views/permissions/userPermission.vue
@@ -891,6 +891,7 @@ const throttledPermissionEdit = _.throttle(permissionEdit, 5000, {
 const throttledPermissionAdd = _.throttle(permissionAdd, 5000, {
   trailing: false
 })
+const canLook = findMenuById(menuTree.value, permissionMapping.userManageShow)// 我真是服啦，查询也做嘛
 const canAdd = findMenuById(menuTree.value, permissionMapping.addUserInfo)
 const canEdit = findMenuById(menuTree.value, permissionMapping.editUserInfo)
 const canReset = findMenuById(menuTree.value, permissionMapping.updateUserInfo)
@@ -930,14 +931,14 @@ onMounted(async function () {
 
         <div class="head-card-btn">
           <el-button type="success" @click="reset()">重置</el-button>
-          <el-button type="primary" @click="search()">查询</el-button>
+          <el-button type="primary" @click="search()" v-if="canLook">查询</el-button>
         </div>
       </div>
     </el-card>
     <el-card>
       <!-- 展示表单 -->
       <div class="add-item">
-        <el-button style="color: #048efb; border: 1px solid #048efb" :disabled="!canAdd" @click="userAddInit()">新增用户</el-button>
+        <el-button style="color: #048efb; border: 1px solid #048efb" :disabled="!canAdd" v-if="canAdd" @click="userAddInit()">新增用户</el-button>
       </div>
 
       <div>
@@ -959,16 +960,16 @@ onMounted(async function () {
           <el-table-column prop="remark" label="备注" />
           <el-table-column prop="operation" label="操作" width="280px">
             <template #default="scope">
-              <el-button type="warning" text :disabled="!canReset" @click="resetPassword(scope.row)">
+              <el-button type="warning" text :disabled="!canReset" @click="resetPassword(scope.row)" v-if="canReset">
                 重置密码
               </el-button>
-              <el-button type="primary" text @click="permissionEditInit(scope.row)"
+              <el-button type="primary" text @click="permissionEditInit(scope.row)" v-if="canEdit"
                 :disabled="!canEdit || scope.row.adminStatus === 0 || scope.row.account === adminData.account">
                 修改权限
               </el-button>
               <el-popconfirm title="确定将此用户删除吗？" @confirm="delConfirm">
                 <template #reference>
-                  <el-button type="danger" text @click="del(scope.row)"
+                  <el-button type="danger" text @click="del(scope.row)" v-if="canDel"
                     :disabled="!canDel ||scope.row.adminStatus === 0 || scope.row.account === adminData.account">
                     删除
                   </el-button>
@@ -984,7 +985,7 @@ onMounted(async function () {
           </el-table-column>
           <el-table-column prop="adminStatus" label="状态">
             <template #default="scope">
-              <el-switch :model-value="scope.row.adminStatus" :active-value="1" :inactive-value="0" size="large"
+              <el-switch :model-value="scope.row.adminStatus" :active-value="1" :inactive-value="0" size="large" v-if="change"
                 :disabled="!change || scope.row.account === adminData.account || statusLoading[scope.row.id]"
                 @change="(targetStatus) => showStatusConfirm(scope.row, targetStatus)" style="
                     --el-switch-on-color: #13ce66;
diff --git a/src/views/refund/gold/addCoinRefund.vue b/src/views/refund/gold/addCoinRefund.vue
index 6b7ed1b..bb6d830 100644
--- a/src/views/refund/gold/addCoinRefund.vue
+++ b/src/views/refund/gold/addCoinRefund.vue
@@ -502,7 +502,7 @@ onMounted(() =>{
           </div>
 
           <el-button type="success" @click="cancel()" style="margin-left: 200px">重置</el-button>
-          <el-button type="primary" :disabled="addDisabled" @click="addBefore"> 提交</el-button>
+          <el-button type="primary" :disabled="addDisabled" @click="addBefore" v-if="findMenuById(menuTree.value,permissionMapping.addCoinRefund)"> 提交</el-button>
         </el-form>
       </div>
     </div>
diff --git a/src/views/refund/gold/coinRefund.vue b/src/views/refund/gold/coinRefund.vue
index f268889..a596f85 100644
--- a/src/views/refund/gold/coinRefund.vue
+++ b/src/views/refund/gold/coinRefund.vue
@@ -3,12 +3,12 @@
     <!-- 这里放置标签切换的按钮 -->
     <el-button-group>
             <el-button :type="activeTab === 'coinRefundDetail' ? 'primary' : 'default'"
-                 @click="navigateTo('coinRefundDetail')" :disabled="!hasDetail">
+                 @click="navigateTo('coinRefundDetail')" :disabled="!hasDetail" v-if="hasDetail">
         金币退款明细
       </el-button>
       <!-- 切换后状态显示 primary 样式否则是默认样式 -->
       <el-button :type="activeTab === 'addCoinRefund' ? 'primary' : 'default'" @click="navigateTo('addCoinRefund')"
-                 :disabled="!hasAdd">
+                 :disabled="!hasAdd" v-if="hasAdd">
         新增退款
       </el-button>
     </el-button-group>
diff --git a/src/views/refund/gold/coinRefundDetail.vue b/src/views/refund/gold/coinRefundDetail.vue
index 83d0f20..6d2925c 100644
--- a/src/views/refund/gold/coinRefundDetail.vue
+++ b/src/views/refund/gold/coinRefundDetail.vue
@@ -14,7 +14,7 @@ import dayjs from "dayjs";
 const adminStore = useAdminStore();
 const { adminData, menuTree } = storeToRefs(adminStore);
 const showEmployeeData = ref(false)
-
+const canLook = findMenuById(menuTree.value,permissionMapping.coinRefundDetail)
 
 const defaultTime = [
   new Date(2000, 1, 1, 0, 0, 0),
@@ -544,7 +544,7 @@ const getMarket = async function () {
           </el-button>
 
           <el-button type="success" @click="reset()">重置</el-button>
-          <el-button type="primary" @click="search()">查询</el-button>
+          <el-button type="primary" @click="search()" v-if="canLook">查询</el-button>
           <el-button type="primary" @click="exportExcel">导出Excel</el-button>
           <el-button type="primary" @click="openExportList">查看导出列表</el-button>
         </div>
diff --git a/src/views/usergold/gold/clientCount.vue b/src/views/usergold/gold/clientCount.vue
index 91e03f4..31588f2 100644
--- a/src/views/usergold/gold/clientCount.vue
+++ b/src/views/usergold/gold/clientCount.vue
@@ -6,14 +6,14 @@
       <el-button
           :type="activeTab === 'clientCountDetail' ? 'primary' : 'default'"
           @click="navigateTo('clientCountDetail')"
-          :disabled="!hasDetail"
+          :disabled="!hasDetail" v-if="hasDetail"
       >
         金币明细
       </el-button>
       <el-button
           :type="activeTab === 'clientCountBalance' ? 'primary' : 'default'"
           @click="navigateTo('clientCountBalance')"
-          :disabled="!hasBalance"
+          :disabled="!hasBalance" v-if="hasBalance"
       >
         金币余额
       </el-button>

From 9b95708d37d1e469b7d9931353b9e68d6ad2dc02 Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Fri, 19 Sep 2025 16:23:42 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/audit/bean/beanAudit.vue     | 15 +++++---
 src/views/audit/gold/rechargeAudit.vue | 65 ++++++++++++++++++++--------------
 src/views/audit/gold/refundAudit.vue   | 17 ++++++---
 3 files changed, 61 insertions(+), 36 deletions(-)

diff --git a/src/views/audit/bean/beanAudit.vue b/src/views/audit/bean/beanAudit.vue
index 177f107..5d2c129 100644
--- a/src/views/audit/bean/beanAudit.vue
+++ b/src/views/audit/bean/beanAudit.vue
@@ -22,9 +22,9 @@
     </el-col>
   </el-card>
 
-  <el-card v-if="hasbeanWaitShow">
+  <el-card >
     <el-tabs v-model="checkTab" type="card" @tab-click="handleClick">
-      <el-tab-pane label="待审核" name="pending" v-if="hasbeanWait"></el-tab-pane>
+      <el-tab-pane label="待审核" name="pending" v-if="hasbeanWait&&hasbeanWaitShow"></el-tab-pane>
       <el-tab-pane label="已通过" name="pass" v-if="hasbeanThrough"></el-tab-pane>
       <el-tab-pane label="已驳回" name="reject" v-if="hasbeanReject"></el-tab-pane>
     </el-tabs>
@@ -142,7 +142,7 @@ const hasbeanWaitThough = ref(false)  // 金豆审核通过（对应beanWaitThou
 const hasbeanWaitReject = ref(false)  // 金豆审核驳回（对应beanWaitReject:47）
 
 // 初始化权限状态（补充金豆审核权限，与充值权限初始化逻辑并列）
-const initPermissions = () => {
+const initPermissions = async() => {
   if (!menuTree.value || !menuTree.value.length) return;
   hasbeanWait.value = hasMenuPermission(menuTree.value, permissionMapping.beanWait);
   hasbeanThrough.value = hasMenuPermission(menuTree.value, permissionMapping.beanThrough);
@@ -500,7 +500,14 @@ const trimJwCode = () => {
   }
 }
 onMounted(async () => {
-  initPermissions()
+  await initPermissions()
+   if(hasbeanWaitShow.value){
+    searchForm.value.status = 0
+  }else if(hasbeanThrough.value){
+    searchForm.value.status = 1
+  }else if(hasbeanReject){
+   searchForm.value.status = 2
+  }
   getmarkets()
   await get()
   await getStats()
diff --git a/src/views/audit/gold/rechargeAudit.vue b/src/views/audit/gold/rechargeAudit.vue
index 909ce48..08f2750 100644
--- a/src/views/audit/gold/rechargeAudit.vue
+++ b/src/views/audit/gold/rechargeAudit.vue
@@ -47,9 +47,9 @@
       </div>
     </el-col>
   </el-card>
-  <el-card v-if="hasrechargeWaitShow">
-    <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane label="待审核" name="wait" v-if="hasrechargeWait"></el-tab-pane>
+  <el-card>
+    <el-tabs v-model="activeName" type="card" @tab-click="handleClick"> 
+      <el-tab-pane label="待审核" name="wait" v-if="hasrechargeWait&&hasrechargeWaitShow"></el-tab-pane>
       <el-tab-pane label="已通过" name="pass" v-if="hasrechargeThrough"></el-tab-pane>
       <el-tab-pane label="已驳回" name="reject" v-if="hasrechargeReject"></el-tab-pane>
       <div>
@@ -119,7 +119,7 @@
           {{ moment(scope.row.auditTime).format('YYYY-MM-DD HH:mm:ss') }}
         </template>
       </el-table-column>
-      <el-table-column v-if="activeName === 'wait'&&(hasrechargeWaitThough||hasrechargeWaitReject)" fixed="right" prop="operation" label="操作" width="150px">
+      <el-table-column v-if="activeName === 'wait'&&(hasrechargeWaitThough||hasrechargeWaitReject)&&hasrechargeWaitShow" fixed="right" prop="operation" label="操作" width="150px">
         <template #default="scope">
           <div class="operation">
             <el-popconfirm title="确定要通过此条记录吗？" @confirm="handleApprove(scope.row)">
@@ -179,6 +179,28 @@ const { adminData, menuTree } = storeToRefs(adminStore);
 import { permissionMapping, hasMenuPermission } from "@/utils/menuTreePermission.js"
 import dayjs from "dayjs";
 
+
+//操作权限
+const hasrechargeThrough = ref(false)  // 充值审核已通过
+const hasrechargeReject = ref(false)  // 充值审核已驳回
+const hasrechargeWait = ref(false)  // 充值审核待审核
+const hasrechargeWaitShow = ref(false) // 充值审核待审核查看
+const hasrechargeWaitThough = ref(false) // 充值审核通过
+const hasrechargeWaitReject = ref(false) // 充值审核驳回
+
+// 初始化权限状态
+const initPermissions = async() => {
+  if (!menuTree.value || !menuTree.value.length) return;
+  hasrechargeThrough.value = hasMenuPermission(menuTree.value, permissionMapping.rechargeThrough);
+  hasrechargeReject.value = hasMenuPermission(menuTree.value, permissionMapping.rechargeReject);
+  hasrechargeWait.value = hasMenuPermission(menuTree.value, permissionMapping.rechargeWait);
+  hasrechargeWaitShow.value = hasMenuPermission(menuTree.value, permissionMapping.rechargeWaitShow);
+  hasrechargeWaitThough.value = hasMenuPermission(menuTree.value, permissionMapping.rechargeWaitThough);
+  hasrechargeWaitReject.value = hasMenuPermission(menuTree.value, permissionMapping.rechargeWaitReject);
+  console.log(hasrechargeWaitThough.value)
+  console.log(hasrechargeWaitReject.value)
+
+};
 const defaultTime = [
   new Date(2000, 1, 1, 0, 0, 0),
   new Date(2000, 2, 1, 23, 59, 59),
@@ -214,7 +236,7 @@ const rechargeAudit = ref({
   startTime: "", // 充值时间开始
   endTime: "", // 充值时间结束
   market: "", // 地区
-  auditStatus: "0",
+  auditStatus: '0',
 })
 // 搜索对象
 const getObj = ref({
@@ -222,27 +244,7 @@ const getObj = ref({
   pageSize: 50
 })
 
-//操作权限
-const hasrechargeThrough = ref(false)  // 充值审核已通过
-const hasrechargeReject = ref(false)  // 充值审核已驳回
-const hasrechargeWait = ref(false)  // 充值审核已驳回
-const hasrechargeWaitShow = ref(false) // 充值审核待审核查看
-const hasrechargeWaitThough = ref(false) // 充值审核通过
-const hasrechargeWaitReject = ref(false) // 充值审核驳回
-
-// 初始化权限状态
-const initPermissions = () => {
-  if (!menuTree.value || !menuTree.value.length) return;
-  hasrechargeThrough.value = hasMenuPermission(menuTree.value, permissionMapping.rechargeThrough);
-  hasrechargeReject.value = hasMenuPermission(menuTree.value, permissionMapping.rechargeReject);
-  hasrechargeWait.value = hasMenuPermission(menuTree.value, permissionMapping.rechargeWait);
-  hasrechargeWaitShow.value = hasMenuPermission(menuTree.value, permissionMapping.rechargeWaitShow);
-  hasrechargeWaitThough.value = hasMenuPermission(menuTree.value, permissionMapping.rechargeWaitThough);
-  hasrechargeWaitReject.value = hasMenuPermission(menuTree.value, permissionMapping.rechargeWaitReject);
-  console.log(hasrechargeWaitThough.value)
-  console.log(hasrechargeWaitReject.value)
 
-};
 
 // 支付方式选项
 const payModel = [
@@ -482,7 +484,9 @@ const handleClick = function (tab, event) {
       ElMessage.error('暂无权限')
       return
     }
-    adminWait()
+    if(hasrechargeWaitShow){
+      adminWait()
+    }
   } else if (tab.props.name === 'pass') {
     if(!hasrechargeThrough){
       ElMessage.error('暂无权限')
@@ -695,7 +699,14 @@ const cancelClick = () => {
 const formatTime = (val) => val ? moment(val).format('YYYY-MM-DD HH:mm:ss') : ''
 // 挂载
 onMounted(async function () {
-  initPermissions()
+  await initPermissions()
+  if(hasrechargeWaitShow.value){
+    rechargeAudit.value.auditStatus = '0'
+  }else if(hasrechargeThrough.value){
+    rechargeAudit.value.auditStatus = '1'
+  }else if(hasrechargeReject){
+    rechargeAudit.value.auditStatus = '2'
+  }
   await getActivity()
   await getMarket()
   await getRecharge()
diff --git a/src/views/audit/gold/refundAudit.vue b/src/views/audit/gold/refundAudit.vue
index c81d2b2..4248286 100644
--- a/src/views/audit/gold/refundAudit.vue
+++ b/src/views/audit/gold/refundAudit.vue
@@ -49,9 +49,9 @@
     </el-col>
   </el-card>
 
-  <el-card v-if="hasrefundWaitShow">
+  <el-card >
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane label="待审核" name="wait" v-if="hasrefundWait"></el-tab-pane>
+      <el-tab-pane label="待审核" name="wait" v-if="hasrefundWait&&hasrefundWaitShow"></el-tab-pane>
       <el-tab-pane label="已通过" name="pass" v-if="hasrefundThrough"></el-tab-pane>
       <el-tab-pane label="已驳回" name="reject" v-if="hasrefundReject"></el-tab-pane>
     </el-tabs>
@@ -118,7 +118,7 @@
           {{ row.auditTime ? moment(row.auditTime).format('YYYY-MM-DD HH:mm:ss') : '--' }}
         </template>
       </el-table-column>
-      <el-table-column v-if="checkTab === 'pending' && (hasrefundWaitThough || hasrefundWaitReject)" fixed="right"
+      <el-table-column v-if="checkTab === 'pending' && (hasrefundWaitThough || hasrefundWaitReject)&&hasrefundWaitShow" fixed="right"
         prop="operation" label="操作" width="150px">
         <template #default="scope">
           <div class="operation">
@@ -243,7 +243,7 @@ const hasrefundWaitThough = ref(false) // 退款审核通过
 const hasrefundWaitReject = ref(false) // 退款审核驳回
 
 // 初始化权限状态
-const initPermissions = () => {
+const initPermissions = async() => {
   if (!menuTree.value || !menuTree.value.length) return;
   // 退款相关权限
   hasrefundThrough.value = hasMenuPermission(menuTree.value, permissionMapping.refundThrough);
@@ -614,7 +614,14 @@ const handleCurrentChange = function (val) {
   get()
 }
 onMounted(async () => {
-  initPermissions()
+  await initPermissions()
+   if(hasrefundWaitShow.value){
+    searchForm.value.auditStatus = '0'
+  }else if(hasrefundThrough.value){
+    searchForm.value.auditStatus = '1'
+  }else if(hasrefundReject){
+    searchForm.value.auditStatus = '2'
+  }
   getRefundGoods()
   await getMarket()
   await get()

From 0516cdc43f05e1b12daef9439643e36829aa93d4 Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Fri, 19 Sep 2025 16:36:26 +0800
Subject: [PATCH 09/10] =?UTF-8?q?fix=E7=8E=B0=E9=87=91=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                             | 2 +-
 src/views/managerecharge/rate.vue        | 2 +-
 src/views/permissions/rolePermission.vue | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 627db57..a08640c 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
     "dev": "vite --host 0.0.0.0",
     "build:test": "vite build --mode test",
     "build:prod": "vite build --mode production",
-    "preview": "vite preview",
+    "prev`  iew": "vite preview",
     "serve": "vite - service serve --host 0.0.0.0 --port 8080"
   },
   "dependencies": {
diff --git a/src/views/managerecharge/rate.vue b/src/views/managerecharge/rate.vue
index a4424a4..ac1b3d8 100644
--- a/src/views/managerecharge/rate.vue
+++ b/src/views/managerecharge/rate.vue
@@ -128,7 +128,7 @@ const hasrateEdit = ref(false)
 const initPermissions = () => {
   if (!menuTree.value || !menuTree.value.length) return;
   hasrateShow.value = hasMenuPermission(menuTree.value, permissionMapping.rateShow);
-  hasrateShow.value = hasMenuPermission(menuTree.value, permissionMapping.rateShow);
+  hasrateEdit.value = hasMenuPermission(menuTree.value, permissionMapping.rateEdit);
 
 };
 // 编辑汇率
diff --git a/src/views/permissions/rolePermission.vue b/src/views/permissions/rolePermission.vue
index 1e5e606..e56c04f 100644
--- a/src/views/permissions/rolePermission.vue
+++ b/src/views/permissions/rolePermission.vue
@@ -592,7 +592,7 @@ onMounted(async function () {
         <el-input v-model="role.name" style="width: 240px" placeholder="请输入角色名称" clearable />
         <div style="margin-left: auto;">
           <el-button type="success" @click="reset()">重置</el-button>
-          <el-button type="primary" @click="searchRole()" :disabled="canLook" v-if="canLook">查询</el-button>
+          <el-button type="primary" @click="searchRole()" :disabled="!canLook" v-if="canLook">查询</el-button>
         </div>
       </div>
     </el-card>

From bf21a8c6b60a43e21d6fd60fc530dc9364c85060 Mon Sep 17 00:00:00 2001
From: lhl <analsak@163.com>
Date: Sat, 20 Sep 2025 10:31:05 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E5=88=B0=E5=BA=95=E6=8A=A5=E4=B8=8D?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/refund/gold/addCoinRefund.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/refund/gold/addCoinRefund.vue b/src/views/refund/gold/addCoinRefund.vue
index bb6d830..918e0ec 100644
--- a/src/views/refund/gold/addCoinRefund.vue
+++ b/src/views/refund/gold/addCoinRefund.vue
@@ -413,7 +413,7 @@ const calculatedRechargeGoods = computed(() => {
   const taskGold = addRefund.value.taskGold === '' ? 0 : +addRefund.value.taskGold;
   return Number((permanentGold + freeGold + taskGold).toFixed(2));
 })
-
+const canAdd = findMenuById(menuTree.value,permissionMapping.addCoinRefund)
 watch(calculatedRechargeGoods, (newVal) => {
   addRefund.value.sumGold = newVal
 })
@@ -502,7 +502,7 @@ onMounted(() =>{
           </div>
 
           <el-button type="success" @click="cancel()" style="margin-left: 200px">重置</el-button>
-          <el-button type="primary" :disabled="addDisabled" @click="addBefore" v-if="findMenuById(menuTree.value,permissionMapping.addCoinRefund)"> 提交</el-button>
+          <el-button type="primary" :disabled="addDisabled" @click="addBefore" v-if="canAdd"> 提交</el-button>
         </el-form>
       </div>
     </div>