From 3af70533501f4138536ba01edb4f02a3a8d69f6a Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期六, 30 三月 2024 14:29:04 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into dev
---
src/router/index.js | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index 3115976..87e40de 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -6,6 +6,7 @@
import salesRouter from "./sales/index.js"
import serviceRouter from "./service/index.js"
import {getMenuTreeByRole} from "@/api/menus/index"
+import store from '@/store/index.js';
// import backgroundConfigRouter from "./backgroundConfig/index.js"
Vue.use(Router)
@@ -120,6 +121,7 @@
};
const foundObject = res.data.list.find(obj => obj.systemType === 2);
if (foundObject) {
+ store.commit('setMenus', foundObject.menus);
foundObject.menus.forEach(item => {
const nextPath = item.children.find(obj => obj.path === routePath);
if (nextPath) {
@@ -140,9 +142,9 @@
const result = await hasPermission(to.path);
console.log(result,"result")
next();
- if (!isSkip) {
- next('/noData')
- }
+ // if (!isSkip) {
+ // next('/noData')
+ // }
} catch (error) {
console.error('Error in navigation guard:', error);
next();
--
Gitblit v1.8.0