add

src/main.js

@@ -7,33 +7,26 @@ import ElementPlus from "element-plus";
 import "element-plus/lib/theme-chalk/index.css";
 import "dayjs/locale/zh-cn";
 import locale from "element-plus/lib/locale/lang/zh-cn";
-import { ElMessage } from "element-plus";
 
 // import { fetchCurrentUser } from "./service/user";
 import { checkPathAuth } from "./utils/authUtil";
 import { redirectToLogin } from "./utils/util";
+import { ElMessage } from "element-plus";
 
 // 处理路由权限
 router.beforeResolve(async (to, from, next) => {
+
   if (!to.meta.requireAuth) {
     next();
     return true;
   }
-  if(!store.state.permissions && !store.state.userInfo) {
-    redirectToLogin();
-    // location.href = '/'
-    // next();
-    // return this.$message("您没有权限");
-    // return ElMessage.error('您没有权限');
-  }
+
   // if (!store.state.permissions) {
-  //   ElMessage.error('您没有权限');
-  //   // this.$message('您暂无权限');
+  //   const { status, user } = await fetchCurrentUser();
   //   let isDefault = window.localStorage.getItem('isDefault');
   //   if(isDefault == 2) {
   //     user.email = getCookie('username');
   //   }
-  //   const { status, user } = await fetchCurrentUser();
   //   if (status === 'success') {
   //     store.commit('updateUserInfo', user);
   //     await store.dispatch('updateUserPermission', { email: user.email })
@@ -43,14 +36,15 @@ router.beforeResolve(async (to, from, next) => {
   //   }
   // }
 
-
   if (!checkPathAuth(to.path)) {
       redirectToLogin();
-    return ElMessage.error('您没有权限');
+      return ElMessage("您没有权限");
+    // router.push({name: 'Forbidden'})
   } else {
     next();
+    return true;
   }
-});
+})
 
 createApp(App)
   .use(router)

src/pages/Groupmeal/components/PageHeader/index.vue

@@ -22,7 +22,7 @@
         key="usermenu"
         class="user-menu"
       >
-        <user></user>
+        <user @logout="handleLogout"></user>
       </el-menu-item>
     </el-menu>
   </div>
@@ -31,6 +31,8 @@
 <script>
 import headerConfig from "./config";
 import User from "./User.vue";
+import { createNamespacedHelpers } from 'vuex'
+const { mapActions } = createNamespacedHelpers('login')
 
 export default {
   name: "PageHeader",
@@ -48,7 +50,12 @@ export default {
     }
   },
   beforeMount () { },
-  methods: {}
+  methods: {
+    ...mapActions(['logout']),
+    handleLogout() {
+      this.logout()
+    },
+  }
 };
 </script>
 

src/pages/Withdrawal/Examine/index.vue

@@ -356,7 +356,7 @@ export default {
 
     if (!res) {
       redirectToLogin();
-      return this.$message("您没有权限");
+      return ElMessage("您没有权限");
     }
 
     let withdrawlPermission = res.filter(
@@ -366,7 +366,7 @@ export default {
     if (withdrawlPermission.length === 0) {
       // push to forbidden
       redirectToLogin();
-      return this.$message("您没有权限");
+      return ElMessage("您没有权限");
     }
     console.log("withdrawlPermission", withdrawlPermission);
     withdrawlPermission = withdrawlPermission[0];
@@ -376,7 +376,7 @@ export default {
     );
     if (subpermissions.length === 0) {
       redirectToLogin();
-      return this.$message("您没有权限");
+      return ElMessage("您没有权限");
     }
   },
   methods: {

src/pages/Withdrawal/components/PageHeader/config.js

@@ -6,14 +6,14 @@ const headerConfig = [
   {
     path: "/op/withdrawal/roleManageRole",
     name: "角色管理",
-    // requireAuthentication: true,
-    // requiredPermission: "role_management"
+    requireAuthentication: true,
+    requiredPermission: "role_management"
   },
   {
     path: "/op/withdrawal/user",
     name: "用户管理",
-    // requireAuthentication: true,
-    // requiredPermission: "user_management"
+    requireAuthentication: true,
+    requiredPermission: "user_management"
   }
 ];
 

src/pages/Withdrawal/components/PageHeader/index.vue

@@ -29,8 +29,8 @@
 import headerConfig from "./config";
 import User from "./User.vue";
 import { createNamespacedHelpers } from 'vuex'
-const { mapGetters } = createNamespacedHelpers('user')
 const { mapActions } = createNamespacedHelpers('login')
+const { mapGetters } = createNamespacedHelpers('user')
 export default {
   name: "PageHeader",
   components: {

src/pages/Withdrawal/layout/index.vue

@@ -14,7 +14,7 @@
 import PageHeader from '../components/PageHeader';
 
 export default {
-  components: { PageHeader },
+components: { PageHeader },
 };
 </script>
 

src/router/index.js

@@ -11,7 +11,7 @@ import ManageRole from "../pages/Role/manage-role.vue";
 import RoleDetail from "../pages/Role/role-detail.vue";
 import goodsRouter from "./Goods/index";
 import withdrawalRoutes from "./Withdrawal/index";
-// import groupmealRouters from "./Groupmeal/index";
+import groupmealRouters from "./Groupmeal/index";
 import activityRouters from "./Activity/index";
 import Login from "@/pages/Login/index"; //登录
 
@@ -107,7 +107,8 @@ const routes = [
   // 活动管理路由
   ...activityRouters,
   // 钱包审核
-  ...withdrawalRoutes
+  ...withdrawalRoutes,
+  ...groupmealRouters
 ];
 
 const router = createRouter({

src/store/modules/user.js

@@ -35,7 +35,6 @@ export default {
         if (!permissions) {
           return;
         }
-
         const permissionMap = permissions.reduce((prev, permission) => {
           prev[permission.name] = permission;
           return prev;