add：暂时隐藏数据刷新

add:消息推送接口对接
add:频道校验暂时关闭

src/main.ts

@@ -17,6 +17,7 @@ import {useAdminStore} from './store'
 import request from "@/util/request";
 import "./global.css";
 import '@/assets/css/btn.css';
+import {useMessageStore} from "@/store";
 
 
 const app = createApp(App)
@@ -43,4 +44,6 @@ app.use(ElementPlus, {
 
 // 在 app 挂载之后再使用 store
 const adminStore = useAdminStore()
-adminStore.initFromLocalStorage()
+const messageStore = useMessageStore()
+adminStore.initFromLocalStorage()
+messageStore.initFromLocalStorage()

src/router/index.js

@@ -1,7 +1,7 @@
-import { createRouter, createWebHashHistory } from 'vue-router';
-import axios from "axios";
-import { storeToRefs } from "pinia";
-import { useAdminStore } from "@/store/index.js";
+import {createRouter, createWebHashHistory} from 'vue-router';
+import {storeToRefs} from "pinia";
+import {useAdminStore, useMessageStore} from "@/store/index.js";
+import API from '@/util/http.js';
 
 
 // 路由定义（包含权限映射 meta.permissionId）
@@ -16,7 +16,7 @@ const routes = [
         component: () => import("../views/login.vue"),
     },
     {
-        meta: { requireAuth: true },
+        meta: {requireAuth: true},
         path: '/',
         component: () => import("../views/home.vue"),
         children: [
@@ -25,48 +25,48 @@ const routes = [
                 path: 'workbench',
                 name: "workbench",
                 component: () => import("../views/workspace/index.vue"),
-                meta: { permissionId: 2 }
+                meta: {permissionId: 2}
             },
             //金币管理
             {
                 path: '/goldManage',
                 name: 'goldManage',
-                meta: { permissionId: 3 },
+                meta: {permissionId: 3},
                 children: [
                     // 审核
                     {
                         path: '/audit',
                         name: "audit",
                         component: () => import("../views/audit/gold/audit.vue"),
-                        meta: { permissionId: 4 },
+                        meta: {permissionId: 4},
                         children: [
                             // 充值审核
                             {
                                 path: 'rechargeAudit',
                                 name: "rechargeAudit",
                                 component: () => import("../views/audit/gold/rechargeAudit.vue"),
-                                meta: { permissionId: [6, 7, 8, 9, 10, 11, 12] }
+                                meta: {permissionId: [6, 7, 8, 9, 10, 11, 12]}
                             },
                             // 退款审核
                             {
                                 path: 'refundAudit',
                                 name: "refundAudit",
                                 component: () => import("../views/audit/gold/refundAudit.vue"),
-                                meta: { permissionId: [13, 14, 15, 16, 17, 18, 19] }
+                                meta: {permissionId: [13, 14, 15, 16, 17, 18, 19]}
                             },
                         ]
                     }, {
                         path: '/beanAudit',
                         name: "beanAudit",
                         component: () => import("../views/audit/bean/beanAudit.vue"),
-                        meta: { permissionId: 20 },
+                        meta: {permissionId: 20},
                         children: [
                             // 充值审核
                             {
                                 path: 'addbeanAudit',
                                 name: "addbeanAudit",
                                 component: () => import("../views/audit/bean/beanAudit.vue"),
-                                meta: { permissionId: [21, 22, 23, 24, 25, 26] }
+                                meta: {permissionId: [21, 22, 23, 24, 25, 26]}
                             },
                         ]
                     },
@@ -77,21 +77,21 @@ const routes = [
                         path: '/coinConsume',
                         name: "coinConsume",
                         component: () => import("../views/consume/gold/coinConsume.vue"),
-                        meta: { permissionId: 39 },
+                        meta: {permissionId: 39},
                         children: [
                             // 金币新增消耗
                             {
                                 path: 'add',
                                 name: "addCoinConsume",
                                 component: () => import("../views/consume/gold/addCoinConsume.vue"),
-                                meta: { permissionId: 41 }
+                                meta: {permissionId: 41}
                             },
                             // 金币消耗明细详情
                             {
                                 path: 'detail',
                                 name: "coinConsumeDetail",
                                 component: () => import("../views/consume/gold/coinConsumeDetail.vue"),
-                                meta: { permissionId: 40 }
+                                meta: {permissionId: 40}
                             }
                         ]
                     },
@@ -100,35 +100,35 @@ const routes = [
                         path: '/beanConsume',
                         name: "beanConsume",
                         component: () => import("../views/consume/bean/beanConsume.vue"),
-                        meta: { permissionId: 42 },
+                        meta: {permissionId: 42},
                         children: [
                             // 金豆新增消耗
                             {
                                 path: 'add',
                                 name: "addBeanConsume",
                                 component: () => import("../views/consume/bean/addBeanConsume.vue"),
-                                meta: { permissionId: 46 }
+                                meta: {permissionId: 46}
                             },
                             // 直播
                             {
                                 path: 'live',
                                 name: "liveStream",
                                 component: () => import("../views/consume/bean/liveStream.vue"),
-                                meta: { permissionId: 43 }
+                                meta: {permissionId: 43}
                             },
                             // 铁粉
                             {
                                 path: 'fan',
                                 name: "dieHardFan",
                                 component: () => import("../views/consume/bean/dieHardFan.vue"),
-                                meta: { permissionId: 44 }
+                                meta: {permissionId: 44}
                             },
                             // 文章视频
                             {
                                 path: 'article',
                                 name: "articleVideo",
                                 component: () => import("../views/consume/bean/articleVideo.vue"),
-                                meta: { permissionId: 45 }
+                                meta: {permissionId: 45}
                             }
 
                         ]
@@ -139,7 +139,7 @@ const routes = [
                         path: '/rate',
                         name: "rate",
                         component: () => import("../views/managerecharge/rate.vue"),
-                        meta: { permissionId: [27, 28, 29] }
+                        meta: {permissionId: [27, 28, 29]}
                     },
 
                     // 金币充值
@@ -147,21 +147,21 @@ const routes = [
                         path: '/coinRecharge',
                         name: "coinRecharge",
                         component: () => import("../views/recharge/gold/coinRecharge.vue"),
-                        meta: { permissionId: 31 },
+                        meta: {permissionId: 31},
                         children: [
                             // 金币新增充值
                             {
                                 path: 'add',
                                 name: "addCoinRecharge",
                                 component: () => import("../views/recharge/gold/addCoinRecharge.vue"),
-                                meta: { permissionId: 33 }
+                                meta: {permissionId: 33}
                             },
                             // 金币充值明细
                             {
                                 path: 'detail',
                                 name: "coinRechargeDetail",
                                 component: () => import("../views/recharge/gold/coinRechargeDetail.vue"),
-                                meta: { permissionId: 32 }
+                                meta: {permissionId: 32}
                             }
                         ]
                     },
@@ -171,28 +171,28 @@ const routes = [
                         path: '/beanRecharge',
                         name: "beanRecharge",
                         component: () => import("../views/recharge/bean/beanRecharge.vue"),
-                        meta: { permissionId: 34 },
+                        meta: {permissionId: 34},
                         children: [
                             // 金豆新增充值
                             {
                                 path: 'add',
                                 name: "addBeanRecharge",
                                 component: () => import("../views/recharge/bean/addBeanRecharge.vue"),
-                                meta: { permissionId: 37 }
+                                meta: {permissionId: 37}
                             },
                             // 金豆系统充值
                             {
                                 path: 'system',
                                 name: "beanSystemRecharge",
                                 component: () => import("../views/recharge/bean/beanSystemRecharge.vue"),
-                                meta: { permissionId: 35 }
+                                meta: {permissionId: 35}
                             },
                             // 金豆线上充值
                             {
                                 path: 'online',
                                 name: "beanOnlineRecharge",
                                 component: () => import("../views/recharge/bean/beanOnlineRecharge.vue"),
-                                meta: { permissionId: 36 }
+                                meta: {permissionId: 36}
                             }
                         ]
                     },
@@ -202,21 +202,21 @@ const routes = [
                         path: '/coinRefund',
                         name: "coinRefund",
                         component: () => import("../views/refund/gold/coinRefund.vue"),
-                        meta: { permissionId: 47 },
+                        meta: {permissionId: 47},
                         children: [
                             // 金币新增退款
                             {
                                 path: 'add',
                                 name: "addCoinRefund",
                                 component: () => import("../views/refund/gold/addCoinRefund.vue"),
-                                meta: { permissionId: 48 }
+                                meta: {permissionId: 48}
                             },
                             // 金币退款明细详情
                             {
                                 path: 'detail',
                                 name: "coinRefundDetail",
                                 component: () => import("../views/refund/gold/coinRefundDetail.vue"),
-                                meta: { permissionId: 49 }
+                                meta: {permissionId: 49}
                             }
                         ]
                     },
@@ -226,21 +226,21 @@ const routes = [
                         path: '/usergold',
                         name: "usergold",
                         component: () => import("../views/usergold/gold/clientCount.vue"),
-                        meta: { permissionId: 51 },
+                        meta: {permissionId: 51},
                         children: [
                             // 金币明细
                             {
                                 path: 'detail',
                                 name: "clientCountDetail",
                                 component: () => import("../views/usergold/gold/clientCountDetail.vue"),
-                                meta: { permissionId: 52 }
+                                meta: {permissionId: 52}
                             },
                             // 金币余额
                             {
                                 path: 'balance',
                                 name: "clientCountBalance",
                                 component: () => import("../views/usergold/gold/clientCountBalance.vue"),
-                                meta: { permissionId: 53 }
+                                meta: {permissionId: 53}
                             },
                         ]
                     },
@@ -248,25 +248,25 @@ const routes = [
                         path: '/userbean',
                         name: "userbean",
                         component: () => import("../views/usergold/bean/userbean.vue"),
-                        meta: { permissionId: 54 }
+                        meta: {permissionId: 54}
                     },
                     {
                         path: '/history',
                         name: "history",
                         component: () => import("../views/history/history.vue"),
-                        meta: { permissionId: 55 },
+                        meta: {permissionId: 55},
                         children: [
                             {
                                 path: 'newHistory',
                                 name: "newHistory",
                                 component: () => import("../views/history/newHistory.vue"),
-                                meta: { permissionId: 56 }
+                                meta: {permissionId: 56}
                             },
                             {
                                 path: 'oldHistory',
                                 name: "oldHistory",
                                 component: () => import("../views/history/oldHistory.vue"),
-                                meta: { permissionId: 57 }
+                                meta: {permissionId: 57}
                             }
                         ]
                     },
@@ -276,21 +276,21 @@ const routes = [
                         path: '/permissions',
                         name: "permissions",
                         component: () => import("../views/permissions/permissions.vue"),
-                        meta: { permissionId: 128 },
+                        meta: {permissionId: 128},
                         children: [
                             // 用户权限
                             {
                                 path: 'userPermission',
                                 name: "userPermission",
                                 component: () => import("../views/permissions/userPermission.vue"),
-                                meta: { permissionId: 129 }
+                                meta: {permissionId: 129}
                             },
                             // 角色权限
                             {
                                 path: 'rolePermission',
                                 name: "rolePermission",
                                 component: () => import("../views/permissions/rolePermission.vue"),
-                                meta: { permissionId: 130 }
+                                meta: {permissionId: 130}
                             }
                         ]
                     }
@@ -300,40 +300,40 @@ const routes = [
             {
                 path: '/moneyManage',
                 name: 'moneyManage',
-                meta: { permissionId: 58 },
+                meta: {permissionId: 58},
                 children: [
                     // 收款明细
                     {
                         path: 'receiveDetail',
                         name: "receiveDetail",
-                        meta: { permissionId: 74 },
+                        meta: {permissionId: 74},
                         children: [
                             // 客服页面
                             {
                                 path: 'receiveService',
                                 name: "receiveService",
                                 component: () => import("../views/moneyManage/receiveDetail/receiveService.vue"),
-                                meta: { permissionId: 60 }
+                                meta: {permissionId: 60}
                             },
                             // 地区负责人页面
                             {
                                 path: 'receiveManager',
                                 name: "receiveManager",
                                 component: () => import("../views/moneyManage/receiveDetail/receiveManage.vue"),
-                                meta: { permissionId: [67, 79] }
+                                meta: {permissionId: [67, 79]}
                             },
                             {//地区财务
                                 path: 'receiveFinance',
                                 name: "receiveFinance",
                                 component: () => import("../views/moneyManage/receiveDetail/receiveFinance.vue"),
-                                meta: { permissionId: [67, 79] }
+                                meta: {permissionId: [67, 79]}
                             },
                             //总部管理员及财务
                             {
                                 path: 'receiveHeader',
                                 name: "receiveHeader",
                                 component: () => import("../views/moneyManage/receiveDetail/receiveHead.vue"),
-                                meta: { permissionId: 91 }
+                                meta: {permissionId: 91}
                             },
                         ]
                     },
@@ -342,35 +342,35 @@ const routes = [
                         path: 'refundDetail',
                         name: "refundDetail",
                         component: () => import("../views/moneyManage/refundDetail/refundDetail.vue"),
-                        meta: { permissionId: 98 },
+                        meta: {permissionId: 98},
                         children: [
                             // 客服页面
                             {
                                 path: 'refundService',
                                 name: "refundService",
                                 component: () => import("../views/moneyManage/refundDetail/refundService.vue"),
-                                meta: { permissionId: 99 }
+                                meta: {permissionId: 99}
                             },
                             // 地区财务页面
                             {
                                 path: 'refundFinance',
                                 name: "refundFinance",
                                 component: () => import("../views/moneyManage/refundDetail/refundFinance.vue"),
-                                meta: { permissionId: 103 }
+                                meta: {permissionId: 103}
                             },
                             // 地区负责人页面
                             {
                                 path: 'refundCharge',
                                 name: "refundCharge",
                                 component: () => import("../views/moneyManage/refundDetail/refundCharge.vue"),
-                                meta: { permissionId: 107 }
+                                meta: {permissionId: 107}
                             },
                             //总部管理员及财务
                             {
                                 path: 'refundHeader',
                                 name: "refundHeader",
                                 component: () => import("../views/moneyManage/refundDetail/refundHeader.vue"),
-                                meta: { permissionId: 111 }
+                                meta: {permissionId: 111}
                             },
                         ]
                     },
@@ -379,7 +379,7 @@ const routes = [
                         path: 'executor',
                         name: "executor",
                         component: () => import("../views/moneyManage/executor/executor.vue"),
-                        meta: { permissionId: 115 }
+                        meta: {permissionId: 115}
                     },
                 ]
             },
@@ -387,29 +387,29 @@ const routes = [
             {
                 path: 'channelManage',
                 name: 'channelManage',
-                meta: { permissionId: 124 },
+                meta: {permissionId: 124},
                 children: [
                     // 打赏
                     {
                         path: 'reward',
                         name: "reward",
                         component: () => import("../views/channelManage/reward/reward.vue"),
-                        meta: { permissionId: 125 }
+                        meta: {permissionId: 125}
                     },
                     // 铁粉
                     {
                         path: 'fans',
                         name: "fans",
                         component: () => import("../views/channelManage/fans/fans.vue"),
-                        meta: { permissionId: 126 }
+                        meta: {permissionId: 126}
                     },
                     // 购物车
                     {
                         path: 'cart',
                         name: "cart",
                         component: () => import("../views/noPermissionPage.vue"),
-                        meta: { permissionId: 127 }
-                    }   
+                        meta: {permissionId: 127}
+                    }
                 ]
             },
             // 活动管理
@@ -417,7 +417,7 @@ const routes = [
                 path: 'activityManage',
                 name: "activityManage",
                 component: () => import("../views/activityManage/activity.vue"),
-                meta: { permissionId: 119 } 
+                meta: {permissionId: 119}
             },
             // 没有权限
             {
@@ -457,12 +457,11 @@ const getAllPermissionIds = (menuTree) => {
     return permissionIds;
 };
 
-
 // 全局路由守卫
 router.beforeEach(async (to, from, next) => {
 
     const adminStore = useAdminStore()
-    const { adminData, menuTree } = storeToRefs(adminStore)
+    const {adminData, menuTree} = storeToRefs(adminStore)
 
     const token = localStorage.getItem("token");
     const machineId = localStorage.getItem("machineId");
@@ -520,4 +519,24 @@ router.beforeEach(async (to, from, next) => {
     next();
 });
 
+// 全局后置守卫：每次路由切换后执行
+router.afterEach(async () => {
+    try {
+        // 执行/getMessage请求
+        const newMessageRes = await API({
+            url: '/getMessage',
+            method: 'POST',
+            data: {}
+        });
+        console.log('newMessageRes=======================:', newMessageRes.data)
+        // 存入全局状态，供所有页面访问
+        const messageStore = useMessageStore();
+        // 过滤 flag=1的消息
+        newMessageRes.data = newMessageRes.data.filter(item => item.flag !== 1);
+
+        messageStore.setMessages(newMessageRes.data);
+    } catch (error) {
+        console.error('获取消息失败：', error);
+    }
+});
 export default router;

src/store/index.js

@@ -1,4 +1,6 @@
 // src/store/index.js
+// useMessageStore
+// 引入Pinia的defineStore
 import {defineStore} from 'pinia'
 
 export const useAdminStore = defineStore('admin', {
@@ -68,4 +70,35 @@ export const useAdminStore = defineStore('admin', {
             // localStorage.removeItem('token')
         }
     }
+})
+
+// 最基础的messageStore
+// 模仿adminStore风格的messageStore
+export const useMessageStore = defineStore('messages', {
+    state: () => ({
+        messages: [], // 消息列表数据
+    }),
+    actions: {
+        // 设置消息列表并同步到localStorage
+        setMessages(data) {
+            this.messages = data
+            localStorage.setItem('messages', JSON.stringify(data))
+        },
+
+        // 从localStorage初始化消息相关数据
+        initFromLocalStorage() {
+            const messages = localStorage.getItem('messages')
+            if (messages) {
+                this.messages = JSON.parse(messages)
+            }
+        },
+
+        // 清空消息状态并移除localStorage数据
+        clearMessages() {
+            this.messages = []
+            localStorage.removeItem('messages')
+
+        },
+
+    }
 })

src/utils/getMessage.js

@@ -0,0 +1,71 @@
+// 所有导入放在顶部
+import API from '@/util/http.js';
+import {ref} from "vue";
+
+// 声明变量
+const messageList1 = ref()
+
+/**
+ * 格式化时间为相对时间
+ * @param {String} timeStr - 原始时间字符串
+ * @returns {String} 格式化后的时间
+ */
+function formatTime(timeStr) {
+    // 函数逻辑不变...
+    const now = new Date();
+    const msgTime = new Date(timeStr);
+    const diffMs = now - msgTime;
+    const diffMins = Math.floor(diffMs / (1000 * 60));
+    const diffHours = Math.floor(diffMins / 60);
+    const diffDays = Math.floor(diffHours / 24);
+
+    if (diffHours < 1) {
+        return `${diffMins}分钟前`;
+    } else if (diffDays < 1) {
+        return `${diffHours}小时前`;
+    } else if (diffDays === 1) {
+        return '昨天';
+    } else {
+        return `${msgTime.getFullYear()}-${String(msgTime.getMonth() + 1).padStart(2, '0')}-${String(msgTime.getDate()).padStart(2, '0')}`;
+    }
+}
+
+
+/**
+ * 按日期分组消息（返回扁平化列表，每条消息包含group字段）
+ * @param {Array} messages - 原始消息列表
+ * @returns {Array} 带分组信息的消息列表
+ */
+export function groupMessages(messages) {
+    const today = new Date();
+    today.setHours(0, 0, 0, 0);
+    const yesterday = new Date(today);
+    yesterday.setDate(yesterday.getDate() - 1);
+
+    // 直接返回处理后的消息数组（每条消息带group字段）
+    return messages
+        .filter(msg => msg.flag !== 1)
+        .map(msg => {
+
+            const msgTime = new Date(msg.czTime);
+            const formattedTime = formatTime(msg.czTime);
+            let group;
+
+            if (msgTime >= today) {
+                group = '今天';
+            } else if (msgTime >= yesterday) {
+                group = '昨天';
+            } else {
+                group = '更早';
+            }
+
+            return {...msg, czTime: formattedTime, group};
+        });
+}
+
+// // 异步获取消息
+// export const newMessageRes = await API({
+//     url: '/getMessage',
+//     method: 'POST',
+//     data: {}
+// });

src/utils/goToCheck.js

@@ -0,0 +1,36 @@
+export function getOrderPage(status) {
+    // 收款相关状态（0-5）
+    const receiveStatusMap = {
+        0: '/moneyManage/receiveDetail/receiveFinance',       // 线下财务待审核
+        1: '/moneyManage/receiveDetail/receiveService',       // 线下财务审核通过待填手续费
+        2: '/moneyManage/receiveDetail/receiveService',       // 线下财务审核驳回
+        3: '/moneyManage/receiveDetail/receiveService',       // link线上财务复核待填手续费
+        // 4: '/moneyManage/receiveDetail',       // 收款流程全部结束
+        5: '/moneyManage/receiveDetail/receiveService'        // 手动撤回待编辑提交
+    };
+
+    // 退款相关状态（6及10-41中退款流程状态）
+    const refundStatusMap = {
+        6: '/moneyManage/refundDetail',        // 退款
+        10: '/moneyManage/refundDetail/refundFinance',  // 地区财务待审核
+        11: '/moneyManage/refundDetail/refundFinance',  // 地区财务手动撤回待编辑提交
+        12: '/moneyManage/refundDetail/refundFinance',  // 地区财务驳回
+        20: '/moneyManage/refundDetail/refundCharge',   // 地区负责人待审核
+        22: '/moneyManage/refundDetail/refundCharge',   // 地区负责人驳回
+        30: '/moneyManage/refundDetail/refundHeader',   // 总部财务待审核
+        32: '/moneyManage/refundDetail/refundHeader',   // 总部财务驳回
+        40: '/moneyManage/refundDetail/refundService',  // 执行人待处理
+        41: '/moneyManage/refundDetail/refundService'   // 执行人已处理，退款结束
+    };
+
+    // 优先匹配退款状态（包含6和10-41区间）
+    if (refundStatusMap.hasOwnProperty(status)) {
+        return refundStatusMap[status];
+    }
+    // 匹配收款状态（0-5）
+    if (receiveStatusMap.hasOwnProperty(status)) {
+        return receiveStatusMap[status];
+    }
+    // 未知状态返回工作台
+    return '/workbench';
+}

src/views/home.vue

@@ -1,19 +1,23 @@
 <script setup>
-// 导航栏在这
-import {computed, onMounted, onUnmounted, ref} from 'vue'
+import {computed, onMounted, ref} from 'vue'
 import {useRoute, useRouter} from 'vue-router'
 import {ElMessage} from 'element-plus'
 import ChangePassword from '@/components/dialogs/changePassword.vue'
 import {useAdminStore} from '@/store'
 import {storeToRefs} from 'pinia'
 import {filterMenu, getRoutePath} from "@/utils/menuUtils.js";
-// 刷新数据功能
 import API from '@/util/http.js'
-import bell from '@/assets/SvgIcons/bell.svg'
 
+import bell from '@/assets/SvgIcons/bell.svg'
 import noMessage from '@/assets/images/no-message.svg'
+import goTop from '@/assets/SvgIcons/go-top.svg'
+
+import {getOrderPage} from '@/utils/goToCheck.js'
+import {groupMessages} from "@/utils/getMessage.js"
 
-// 使用import.meta.glob导入所有SVG图标（修复版本）
+import {useMessageStore} from '@/store/index.js'
+
+// ------------------ ICONS ------------------
 const icons = import.meta.glob('@/assets/SvgIcons/*.svg', {eager: true})
 
 const menuNameMap = {
@@ -25,124 +29,83 @@ const menuNameMap = {
   '权限管理': 'permission-management',
 }
 
-// 创建获取图标路径的函数（修复版本）
 const getIconPath = (menuName) => {
   const englishName = menuNameMap[menuName] || menuName;
 
-  // 构建可能的key格式
   const possibleKeys = [
     `@/assets/SvgIcons/${englishName}.svg`,
     `./SvgIcons/${englishName}.svg`,
     `/src/assets/SvgIcons/${englishName}.svg`
   ]
 
-  // 在icons对象中查找对应的图标
   for (const key of possibleKeys) {
     if (icons[key]) {
       const iconModule = icons[key]
-      // 返回模块的default属性或直接返回值
       return iconModule.default || iconModule
     }
   }
 }
 
-// 数据刷新功能实现
+// ------------------ 刷新数据 ------------------
 const refreshData = async () => {
   try {
-    // 显示加载提示，duration保持打开提示不自动关闭，showclose显示未×，点击可关闭提示
     ElMessage({message: '数据刷新中，请稍候...', type: 'info'});
-
-    // 调用Mysql接口获取最新数据
     const response = await API({url: '/Mysql', method: 'POST', data: {}});
-    if (response && response.code === 200) {
 
+    if (response && response.code === 200) {
       const currentRoute = route.fullPath;
-      router.replace('/blank'); // 临时跳转到一个空页面
-      setTimeout(() => {
-        router.replace(currentRoute); // 跳转回原页面
-      }, 10);
-
+      router.replace('/blank');
+      setTimeout(() => router.replace(currentRoute), 10);
       ElMessage.success('数据刷新成功');
     } else {
       ElMessage.error('数据刷新失败：' + (response?.msg || '未知错误'));
     }
   } catch (error) {
-    console.error('数据刷新异常：', error);
+    console.error(error)
     ElMessage.error('数据刷新异常，请重试');
   }
 }
 
-// 存储接口返回的菜单数据
-const menuList = ref([])
+// ------------------ 菜单逻辑 ------------------
+const route = useRoute()
+const router = useRouter()
 
-// 获取仓库实例
 const adminStore = useAdminStore()
-// 解构状态（保持响应式） 获得 adminData（用户信息） 和 menuTree（菜单树）
 const {adminData, menuTree, flag} = storeToRefs(adminStore)
 
-// 筛选权限菜单 ,menuTree 是组件通信拿的
-menuList.value = filterMenu(menuTree.value)
-
-console.log("menuList", menuList.value)
-// 获取当前路由
-const route = useRoute()
+const menuList = ref(filterMenu(menuTree.value))
 
-// 通用函数：从菜单树中递归找出最匹配的 index
 function findBestMatch(menuList, path) {
   let bestMatch = ''
 
   function traverse(menus) {
     for (const item of menus) {
       const itemPath = getRoutePath(item)
-      // 如果当前菜单的 path 是当前路径的前缀，可能是候选项
       if (path.startsWith(itemPath) && itemPath.length > bestMatch.length) {
         bestMatch = itemPath
       }
-
-      if (item.children && item.children.length > 0) {
-        traverse(item.children)
-      }
+      if (item.children?.length) traverse(item.children)
     }
   }
 
   traverse(menuList)
-  return bestMatch || path // fallback 到当前路径
+  return bestMatch || path
 }
 
-// 响应式高亮菜单
-const activeMenu = computed(() => {
-  return findBestMatch(menuList.value, route.path)
-})
-const router = useRouter()
-const messageVisible = ref(false)
+const activeMenu = computed(() => findBestMatch(menuList.value, route.path))
 
-// 查看个人信息弹出框
-const openMessage = function () {
-  messageVisible.value = true
-}
-// 关闭个人信息
-const closeMessage = function () {
-  messageVisible.value = false
-}
-const message = function () {
-  openMessage()
-}
+// ------------------ 用户信息 / 密码修改 ------------------
+const messageVisible = ref(false)
+const openMessage = () => (messageVisible.value = true)
+const closeMessage = () => (messageVisible.value = false)
 
-// 显示修改密码弹窗
 const showPasswordDialog = ref(false)
 const pwdRef = ref()
 
-//打开修改密码弹窗
-const openChangePassword = () => {
-  showPasswordDialog.value = true
-}
-
-//关闭后清空密码表单
-function onPwdDialogClosed() {
-  // 调用子组件暴露的 resetFields
-  pwdRef.value?.resetFields()
-}
+const openChangePassword = () => (showPasswordDialog.value = true)
+const onPwdDialogClosed = () => pwdRef.value?.resetFields()
 
+// ------------------ 退出登录 ------------------
 function logout() {
   const machineId = localStorage.getItem('machineId')
   localStorage.removeItem('token')
@@ -151,124 +114,117 @@ function logout() {
   ElMessage.success('退出成功')
 }
 
-// 切换员工数据开关状态
+// ------------------ 员工数据开关 ------------------
 const toggleFlag = () => {
   const newFlag = flag.value === 1 ? 0 : 1
   adminStore.setFlag(newFlag)
   ElMessage.success(newFlag === 1 ? '员工数据已隐藏' : '员工数据已显示')
-  console.log('flag', newFlag)
 }
 
+// ------------------ 消息中心（完全修复版） ------------------
+const messageStore = useMessageStore()
+const {messages} = storeToRefs(messageStore)
 
-// 消息推送逻辑
-// 控制 MessageDialog 显示状态
+// 获取消息
+const getMessage = async () => {
+  try {
+    const res = await API({
+      url: '/getMessage',
+      method: 'POST',
+      data: {}
+    });
+
+    if (res?.data) {
+      const cleanList = res.data.filter(i => i.flag !== 1)
+      messageStore.setMessages(cleanList)
+    }
+  } catch (e) {
+    console.error("getMessage error:", e)
+  }
+}
 
-const messageNum = ref(0)
+// 点击铃铛 → 打开弹窗并刷新
 const showMessageDialog = ref(false)
-// 消息小红点状态
-const messageDot = ref(true)
-
-// 点击铃铛图标时打开
-const openMessageDialog = () => {
+const openMessageDialog = async () => {
   showMessageDialog.value = true
-  messageDot.value = false
-
-}
-// 点击关闭时关闭
-const closeMessageDialog = () => {
-  showMessageDialog.value = false
-}
-
-
-// 模拟消息数据
-const messageList = ref([
-  {id: 1, title: '现金管理—收款明细', desc: 'XXX（用户）的收款单被驳回', time: '2分钟前', group: '今天'},
-  {id: 2, title: '现金管理—收款明细', desc: 'XXX（用户）的收款单被驳回', time: '1小时前', group: '今天'},
-  {id: 2, title: '现金管理—收款明细', desc: 'XXX（用户）的收款单被驳回', time: '1小时前', group: '今天'},
-  {id: 2, title: '现金管理—收款明细', desc: 'XXX（用户）的收款单被驳回', time: '1小时前', group: '今天'},
-  {id: 3, title: '现金管理—收款明细', desc: 'XXX（用户）的收款单被驳回', time: '昨天 09:30', group: '昨天'},
-  {id: 4, title: '现金管理—收款明细', desc: 'XXX（用户）的收款单被驳回', time: '昨天 08:30', group: '昨天'},
-  {id: 5, title: '现金管理—收款明细', desc: 'XXX（用户）的收款单被驳回', time: '2025-11-05 10:05:20', group: '更早'},
-  {id: 6, title: '现金管理—收款明细', desc: 'XXX（用户）的收款单被驳回', time: '2025-11-05 10:05:20', group: '更早'},
-  {id: 7, title: '现金管理—收款明细', desc: 'XXX（用户）的收款单被驳回', time: '2025-11-05 10:05:20', group: '更早'},
-  {id: 8, title: '现金管理—收款明细', desc: 'XXX（用户）的收款单被驳回', time: '2025-11-05 10:05:20', group: '更早'},
-  {id: 9, title: '现金管理—收款明细', desc: 'XXX（用户）的收款单被驳回', time: '2025-11-05 10:05:20', group: '更早'},
-  {id: 10, title: '现金管理—收款明细', desc: 'XXX（用户）的收款单被驳回', time: '2025-11-05 10:05:20', group: '更早'},
-  {id: 11, title: '现金管理—收款明细', desc: 'XXX（用户）的收款单被驳回', time: '2025-11-05 10:05:20', group: '更早'},
-  {id: 12, title: '现金管理—收款明细', desc: 'XXX（用户）的收款单被驳回', time: '2025-11-05 10:05:20', group: '更早'},
-  {id: 13, title: '现金管理—收款明细', desc: 'XXX（用户）的收款单被驳回', time: '2025-11-05 10:05:20', group: '更早'},
-  {id: 14, title: '现金管理—收款明细', desc: 'XXX（用户）的收款单被驳回', time: '2025-11-05 10:05:20', group: '更早'},
-  {id: 15, title: '现金管理—收款明细', desc: 'XXX（用户）的收款单被驳回', time: '2025-11-05 10:05:20', group: '更早'},
-  {id: 16, title: '现金管理—收款明细', desc: 'XXX（用户）的收款单被驳回', time: '2025-11-05 10:05:20', group: '更早'},
-]);
-
-// 按时间分组
-const groupedMessages = ref({});
-messageList.value.forEach(item => {
-  if (!groupedMessages.value[item.group]) {
-    groupedMessages.value[item.group] = [];
-  }
-  groupedMessages.value[item.group].push(item);
-});
+  await getMessage() // 等待消息更新
+}
 
-// 控制是否显示全部
-const showAll = ref(false);
+// 关闭消息窗口
+const closeMessageDialog = () => showMessageDialog.value = false
 
+// 小红点（完全响应式）
+const messageDot = computed(() => messages.value.length > 0)
 
-// 计算属性：根据showAll状态返回需要显示的消息
-const displayMessages = computed(() => {
-  if (showAll.value) {
-    return groupedMessages.value;
-  }
+// 消息数量（完全响应式）
+const messageNum = computed(() => messages.value.length)
+
+// 按日期分组（computed）
+const messageList = computed(() => groupMessages(messages.value))
 
-  // 默认只展示前两条消息（跨分组）
-  const limitedMessages = {};
-  let count = 0;
+// 按日期生成最终结构（computed）
+const groupedMessages = computed(() => {
+  const result = {}
+  messageList.value.forEach(item => {
+    if (!result[item.group]) result[item.group] = []
+    result[item.group].push(item)
+  })
+  return result
+})
+
+// 显示全部 or 显示前两条
+const showAll = ref(false)
 
-  // 保持分组顺序（今天 -> 昨天 -> 更早）
-  const groupOrder = ['今天', '昨天', '更早'];
+const displayMessages = computed(() => {
+  if (showAll.value) return groupedMessages.value
 
-  for (const groupName of groupOrder) {
-    const group = groupedMessages.value[groupName];
-    if (!group) continue;
+  let count = 0
+  const limited = {}
+  const groupOrder = ['今天', '昨天', '更早']
 
-    limitedMessages[groupName] = [];
+  for (const g of groupOrder) {
+    const group = groupedMessages.value[g]
+    if (!group) continue
+
+    limited[g] = []
     for (const item of group) {
       if (count < 2) {
-        limitedMessages[groupName].push(item);
-        count++;
-      } else {
-        break;
+        limited[g].push(item)
+        count++
       }
     }
-
-    // 如果该分组没有数据了就删除
-    if (limitedMessages[groupName].length === 0) {
-      delete limitedMessages[groupName];
-    }
-
-    if (count >= 2) break;
+    if (limited[g].length === 0) delete limited[g]
+    if (count >= 2) break
   }
+  return limited
+})
 
-  return limitedMessages;
-});
-
-// 切换显示全部/收起
-const toggleShowAll = () => {
-  showAll.value = !showAll.value;
-};
-
-// 控制返回顶部按钮状态
+const toggleShowAll = () => showAll.value = !showAll.value
 
+// 返回顶部
 const scrollContainer = ref(null)
-const scrollToTop = () => {
-  scrollContainer.value?.scrollTo({top: 0, behavior: 'smooth'})
+const scrollToTop = () => scrollContainer.value?.scrollTo({top: 0, behavior: 'smooth'})
+
+// 点击消息 → 已读 + 跳转
+const handleMessageClick = async (item) => {
+  const res = await API({
+    url: '/getMessage/update',
+    method: 'POST',
+    data: {id: item.id}
+  });
+
+  if (res.code === 200) {
+    closeMessageDialog()
+    await router.push(getOrderPage(item.status))
+    await getMessage()
+    ElMessage.success('跳转成功')
+  } else {
+    ElMessage.error('跳转失败')
+  }
 }
 
-import goTop from '@/assets/SvgIcons/go-top.svg'
-
+onMounted(() => getMessage())
 </script>
-
 <template>
   <div class="main-container">
     <!-- 背景毛玻璃层（作为内容容器） -->
@@ -353,7 +309,7 @@ import goTop from '@/assets/SvgIcons/go-top.svg'
               </span>
                 <template #dropdown>
                   <el-dropdown-menu>
-                    <el-dropdown-item @click="refreshData()">数据刷新</el-dropdown-item>
+                    <!--                    <el-dropdown-item @click="refreshData()">数据刷新</el-dropdown-item>-->
                     <!-- 员工数据开关 -->
                     <el-dropdown-item @click="toggleFlag()">
                       {{ flag === 1 ? '显示员工数据' : '隐藏员工数据' }}
@@ -432,7 +388,7 @@ import goTop from '@/assets/SvgIcons/go-top.svg'
         消息中心 ({{ messageNum }})
       </div>
       <!--      todo 这是为了样式显示 一定要改逻辑-->
-      <div v-if="messageNum !== 0">
+      <div v-if="messageNum === 0">
         <div class="no-message">
           <el-image :src="noMessage"></el-image>
           <p class="no-message-text">暂无未办消息，快去处理工作吧～</p>
@@ -461,13 +417,19 @@ import goTop from '@/assets/SvgIcons/go-top.svg'
             <div style="display: flex; margin-bottom: 10px">
               <span class="red-dot"></span>
               <span class="message-card-title">{{ item.title }}</span>
-              <div class="message-time">{{ item.time }}</div>
+              <div
+                  class="message-time"
+                  :style="{ color: item.czTime.includes('分钟') ? 'red' : '' }"
+              >
+                {{ item.czTime }}
+              </div>
             </div>
 
             <p class="message-desc">{{ item.desc }}</p>
             <el-button
                 type="primary"
                 style="margin: 0 auto; display: block;"
+                @click="handleMessageClick(item)"
             >
               前往查看
             </el-button>
@@ -481,6 +443,7 @@ import goTop from '@/assets/SvgIcons/go-top.svg'
         <div>
           <el-button
               type="text"
+              v-if="messageNum > 2"
               class="view-all"
               @click="toggleShowAll"
           >

src/views/permissions/rolePermission.vue

@@ -1,16 +1,17 @@
 <script setup>
-import { nextTick, onMounted, reactive, ref } from 'vue'
-import { ElMessage } from 'element-plus'
+import {nextTick, onMounted, reactive, ref} from 'vue'
+import {ElMessage} from 'element-plus'
 import _ from 'lodash'
 import request from '@/util/http'
 import API from '@/util/http'
-import { useAdminStore } from "@/store/index.js"
-import { storeToRefs } from "pinia"
+import {useAdminStore} from "@/store/index.js"
+import {storeToRefs} from "pinia"
+
 const adminStore = useAdminStore();
-const { adminData, menuTree } = storeToRefs(adminStore);
-import { permissionMapping, findMenuById } from "@/utils/menuTreePermission.js"
-import { tr } from 'element-plus/es/locales.mjs'
- 
+const {adminData, menuTree} = storeToRefs(adminStore);
+import {permissionMapping, findMenuById} from "@/utils/menuTreePermission.js"
+import {tr} from 'element-plus/es/locales.mjs'
+
 // 表单验证ref
 const Ref = ref(null)
 const roleData = ref([])
@@ -138,7 +139,7 @@ const handleDialogClose = function () {
 const permissionList = ref([])
 const getRoles = async function () {
   try {
-    const res = await API({ url: '/role/selectAll' })
+    const res = await API({url: '/role/selectAll'})
     permissionList.value = res.data.map(item => ({
       label: item.roleName,
       value: item.id
@@ -237,7 +238,7 @@ const getLists = async function () {
     }
     const res = await API({
       url: '/menu/tree',
-      data: { id: roleId }
+      data: {id: roleId}
     })
     data.value = res.data
     data.value = filterPermission(data.value)
@@ -247,7 +248,7 @@ const getLists = async function () {
     if (addRole.value.parentId && addRole.value.parentId !== 2) {
       const result = await API({
         url: '/general/roleMarket',
-        data: { id: addRole.value.parentId }
+        data: {id: addRole.value.parentId}
       })
       if (result.code === 200) {
         if (typeof result.data === 'string' && result.data) {
@@ -305,25 +306,24 @@ const goldenBeanMenuIds = new Set([
 //   23// 金豆客户账户明细
 const filterGoldenBeanMenus = (tree) => {
   return tree
-    .filter(item => {
-      // 排除金豆相关的顶层菜单
-      if (goldenBeanMenuIds.has(item.id)) {
-        return false
-      }
-      // 递归处理子菜单
-      if (item.children && item.children.length > 0) {
-        item.children = filterGoldenBeanMenus(item.children)
-      }
-      return true
-    })
+      .filter(item => {
+        // 排除金豆相关的顶层菜单
+        if (goldenBeanMenuIds.has(item.id)) {
+          return false
+        }
+        // 递归处理子菜单
+        if (item.children && item.children.length > 0) {
+          item.children = filterGoldenBeanMenus(item.children)
+        }
+        return true
+      })
 }
 // 过滤权限模块(????????)俺不会
 const filterPermission = (tree) => {
   return tree.filter(item => {
     if (item.id === permissionMapping.permission_management) {
       return false
-    }
-    else if (item.children && item.children.length > 0) {
+    } else if (item.children && item.children.length > 0) {
       item.children = filterPermission(item.children)
     }
     return true
@@ -331,7 +331,7 @@ const filterPermission = (tree) => {
 }
 // 处理编辑角色权限时的勾选事件
 const handleEditRolePermissionCheck = (checkedNodes, checkedInfo) => {
-  const { checkedKeys, checkedNodes: allCheckedNodes } = checkedInfo
+  const {checkedKeys, checkedNodes: allCheckedNodes} = checkedInfo
 
   // 判断是否有选中的节点
   if (allCheckedNodes.length === 0) {
@@ -356,7 +356,7 @@ const handleEditRolePermissionCheck = (checkedNodes, checkedInfo) => {
 //用于标记是否勾选频道管理
 const ifHasChannel = ref(false)
 const handleCheckChange = async (checkedNodes, checkedInfo) => {
-  const { checkedKeys, checkedNodes: allCheckedNodes } = checkedInfo
+  const {checkedKeys, checkedNodes: allCheckedNodes} = checkedInfo
 
   // 判断是否有选中的节点
   if (allCheckedNodes.length === 0) {
@@ -429,7 +429,7 @@ const permissionEditRoleObj = ref({
   parentId: null,
   parentName: '',
   checkedKeys: [],
-  channel:''
+  channel: ''
 })
 
 // 编辑角色弹窗
@@ -476,8 +476,8 @@ const permissionEditRoleInit = async function (row) {
   permissionEditRoleObj.value.parentId = row.fatherId
   permissionEditRoleObj.value.parentName = row.fatherName
   permissionEditRoleObj.value.channel = row.channel
-  console.log('permissionEditRoleObj.value',permissionEditRoleObj.value);
-  
+  console.log('permissionEditRoleObj.value', permissionEditRoleObj.value);
+
   if (EditIds.includes(124)) {
     ifHasChannel.value = true
   } else {
@@ -492,7 +492,7 @@ const permissionEditRoleInit = async function (row) {
     // 调用 /tree 接口，使用上级角色 ID 获取权限列表
     const res = await API({
       url: '/menu/tree',
-      data: { id: roleId }
+      data: {id: roleId}
     });
     data.value = res.data;
     data.value = filterPermission(data.value)
@@ -602,11 +602,11 @@ const selectParentNodesForSubmit = (treeData, nodeId, checkedKeys) => {
 
 const Rolerules = reactive({
   roleName: [
-    { required: true, message: '请输入角色名称', trigger: 'blur' },
-    { min: 2, max: 20, message: '角色名称长度应在2-20个字符之间', trigger: 'blur' }
+    {required: true, message: '请输入角色名称', trigger: 'blur'},
+    {min: 2, max: 20, message: '角色名称长度应在2-20个字符之间', trigger: 'blur'}
   ],
   market: [
-    { required: true, message: '请选择归属地区', trigger: 'change' }
+    {required: true, message: '请选择归属地区', trigger: 'change'}
   ],
   checkedKeys: [
     {
@@ -643,7 +643,7 @@ onMounted(async function () {
     <el-card class="card1" style="margin-bottom: 1vh;">
       <div style="display: flex;">
         <el-text size="large">角色名称：</el-text>
-        <el-input v-model="role.name" style="width: 240px" placeholder="请输入角色名称" clearable />
+        <el-input v-model="role.name" style="width: 240px" placeholder="请输入角色名称" clearable/>
         <div style="margin-left: auto;">
           <el-button type="primary" @click="searchRole()" :disabled="!canLook" v-if="canLook">查询</el-button>
           <el-button type="success" @click="reset()">重置</el-button>
@@ -654,20 +654,21 @@ onMounted(async function () {
     <el-card class="card2">
       <div class="add-item">
         <el-button style="color: #048efb; border: 1px solid #048efb" @click="permissionAddInit()" :disabled="!canAdd"
-          v-if="canAdd">新增角色</el-button>
+                   v-if="canAdd">新增角色
+        </el-button>
       </div>
       <div>
         <el-table :data="roleData" style="width: 82vw;height:71.3vh" show-overflow-tooltip
-          :row-style="{ height: '56px' }">
+                  :row-style="{ height: '56px' }">
           <el-table-column type="index" label="序号" width="100px" fixed="left">
             <template #default="scope">
               <span>{{
-                scope.$index + 1 + (getRoleObj.pageNum - 1) * getRoleObj.pageSize
-              }}</span>
+                  scope.$index + 1 + (getRoleObj.pageNum - 1) * getRoleObj.pageSize
+                }}</span>
             </template>
           </el-table-column>
 
-          <el-table-column prop="roleName" label="角色名称" />
+          <el-table-column prop="roleName" label="角色名称"/>
           <el-table-column prop="fatherName" label="上级角色">
             <template #default="scope">
               {{ scope.row.fatherName || '-' }}
@@ -683,7 +684,7 @@ onMounted(async function () {
           <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) || !canEdit" v-if="canEdit">
+                         :disabled="(scope.row.id === 2) || (scope.row.id === 1) || !canEdit" v-if="canEdit">
                 编辑
               </el-button>
             </template>
@@ -693,8 +694,10 @@ onMounted(async function () {
 
       <div style="margin-top: 20px;display: flex;">
         <el-pagination background :current-page="getRoleObj.pageNum" :page-size="getRoleObj.pageSize"
-          :page-sizes="[5, 10, 20, 50, 100]" layout="total, sizes, prev, pager, next, jumper" :total="roleTotal"
-          @size-change="handleRolePageSizeChange" @current-change="handleRoleCurrentChange"></el-pagination>
+                       :page-sizes="[5, 10, 20, 50, 100]" layout="total, sizes, prev, pager, next, jumper"
+                       :total="roleTotal"
+                       @size-change="handleRolePageSizeChange"
+                       @current-change="handleRoleCurrentChange"></el-pagination>
       </div>
     </el-card>
   </div>
@@ -702,8 +705,8 @@ onMounted(async function () {
   <!-- 角色菜单树展示 -->
   <el-dialog v-model="menuTreeVisible" :title='`权限详情：${currentRoleName}`' width="600px">
     <el-tree :data="currentRoleMenuTree" node-key="id" :props="{ label: 'menuName', children: 'children' }"
-      show-checkbox check-strictly :expand-on-click-node="false"
-      :default-expanded-keys="currentRoleMenuTree.map(item => item.id)" :default-checked-keys="Rolecheckedkeys" />
+             show-checkbox check-strictly :expand-on-click-node="false"
+             :default-expanded-keys="currentRoleMenuTree.map(item => item.id)" :default-checked-keys="Rolecheckedkeys"/>
     <template #footer>
       <el-button @click="menuTreeVisible = false" type="primary">关闭</el-button>
     </template>
@@ -711,29 +714,30 @@ onMounted(async function () {
 
   <!-- 新增角色 -->
   <el-dialog v-model="permissionAddVisible" title="新增角色" width="800px" :close-on-click-modal="false"
-    @close="handleDialogClose">
+             @close="handleDialogClose">
     <template #footer>
       <el-form ref="Ref" :rules="Rolerules" :model="addRole" label-width="auto"
-        style="max-width: 600px; align-items: center">
+               style="max-width: 600px; align-items: center">
         <el-form-item prop="roleName" label="角色名称:" required>
-          <el-input v-model="addRole.roleName" placeholder="请输入角色名称" style="width: 220px" />
+          <el-input v-model="addRole.roleName" placeholder="请输入角色名称" style="width: 220px"/>
         </el-form-item>
         <el-form-item prop="parentName" label="上级角色:">
-          <el-select v-model="addRole.parentId" placeholder="请选择上级角色" style="width: 220px" @change="getLists" clearable>
+          <el-select v-model="addRole.parentId" placeholder="请选择上级角色" style="width: 220px" @change="getLists"
+                     clearable>
             <el-option v-for="item in permissionList" :key="item.value" :label="item.label"
-              :value="item.value"></el-option>
+                       :value="item.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item prop="market" label="归属地区:" required>
           <el-select v-model="addRole.market" placeholder="请选择归属地区" style="width: 220px" clearable>
-            <el-option v-for="item in addRoleMarket" :key="item" :label="item" :value="item" />
+            <el-option v-for="item in addRoleMarket" :key="item" :label="item" :value="item"/>
           </el-select>
           <text>(此地区无实际意义，仅用于各分部负责人查看其地区角色)</text>
         </el-form-item>
         <el-form-item prop="checkedKeys" label="权限列表:" required>
           <el-tree v-if="data.length > 0" :data="data" show-checkbox node-key="id"
-            :props="{ label: 'menuName', children: 'children' }" :checked-keys="addRole.checkedKeys"
-            :check-strictly="false" @check="handleCheckChange">
+                   :props="{ label: 'menuName', children: 'children' }" :checked-keys="addRole.checkedKeys"
+                   :check-strictly="false" @check="handleCheckChange">
             <template #default="{ node }">
               <span>{{ node.label }}</span>
             </template>
@@ -742,9 +746,9 @@ onMounted(async function () {
             <span style="color: #999;">暂无数据</span>
           </div>
         </el-form-item>
-        <el-form-item v-show="ifHasChannel" prop="channel" label="频道名称:" required>
+        <el-form-item v-show="ifHasChannel"  label="频道名称:" required>
           <el-select v-model="addRole.channel" placeholder="请选择频道" style="width: 220px" filterable clearable>
-            <el-option v-for="item in channelList" :key="item" :label="item" :value="item" />
+            <el-option v-for="item in channelList" :key="item" :label="item" :value="item"/>
           </el-select>
         </el-form-item>
       </el-form>
@@ -762,25 +766,25 @@ onMounted(async function () {
   <el-dialog v-model="permissionEditRoleVisible" title="编辑角色" width="800px" :close-on-click-modal="false">
     <template #footer>
       <el-form ref="Ref" :rules="Rolerules" :model="permissionEditRoleObj" label-width="auto"
-        style="max-width: 600px; align-items: center">
+               style="max-width: 600px; align-items: center">
         <el-form-item prop="roleName" label="角色名称:" required>
-          <el-input v-model="permissionEditRoleObj.roleName" placeholder="请输入角色名称" style="width: 220px" />
+          <el-input v-model="permissionEditRoleObj.roleName" placeholder="请输入角色名称" style="width: 220px"/>
         </el-form-item>
         <el-form-item prop="parentName" label="上级角色:">
           <el-input v-model="permissionEditRoleObj.parentName" placeholder="无上级角色" disabled style="width: 220px">
             <el-option v-for="item in permissionList" :key="item.value" :label="item.label"
-              :value="item.value"></el-option>
+                       :value="item.value"></el-option>
           </el-input>
         </el-form-item>
         <el-form-item prop="market" label="归属地区" required>
-          <el-input v-model="permissionEditRoleObj.market" placeholder="请输入归属地区" style="width: 220px" disabled />
+          <el-input v-model="permissionEditRoleObj.market" placeholder="请输入归属地区" style="width: 220px" disabled/>
           <text>(此地区无实际意义，仅用于各分部负责人查看其地区角色)</text>
         </el-form-item>
         <el-form-item prop="checkedKeys" label="权限列表:" required>
           <el-tree v-if="data.length > 0" :data="data" show-checkbox node-key="id" ref="treeRef"
-            :props="{ label: 'menuName', children: 'children' }"
-            :default-checked-keys="permissionEditRoleObj.checkedKeys" :check-strictly="false"
-            @check="handleEditRolePermissionCheck">
+                   :props="{ label: 'menuName', children: 'children' }"
+                   :default-checked-keys="permissionEditRoleObj.checkedKeys" :check-strictly="false"
+                   @check="handleEditRolePermissionCheck">
             <!-- <template #default="{ node, data }"> data删掉了，不影响功能 -->
             <template #default="{ node }">
               <span>{{ node.label }}</span>
@@ -791,9 +795,9 @@ onMounted(async function () {
           </div>
         </el-form-item>
 
-        <el-form-item v-show="ifHasChannel" prop="channel" label="频道名称:" required>
+        <el-form-item v-show="ifHasChannel" label="频道名称:" required>
           <el-select v-model="permissionEditRoleObj.channel" placeholder="请选择频道" style="width: 220px" clearable>
-            <el-option v-for="item in channelList" :key="item" :label="item" :value="item" />
+            <el-option v-for="item in channelList" :key="item" :label="item" :value="item"/>
           </el-select>
         </el-form-item>
       </el-form>
@@ -829,7 +833,7 @@ onMounted(async function () {
 :deep(.el-table__header-wrapper),
 :deep(.el-table__body-wrapper),
 :deep(.el-table__cell),
-/* 表格 */
+  /* 表格 */
 :deep(.el-table__body td) {
   background-color: #F3FAFE !important;
 }