{{Project.project_sub_title}}
@@ -71,9 +72,10 @@
diff --git a/src/router/Middle/Admin/AdminAgent/router.map.js b/src/router/Middle/Admin/AdminAgent/router.map.js
new file mode 100644
index 0000000..a19863b
--- /dev/null
+++ b/src/router/Middle/Admin/AdminAgent/router.map.js
@@ -0,0 +1,68 @@
+// 中台代理商路由
+
+
+// 视图组件
+const view = {
+ tabs: () => import('@/layouts/tabs'),
+ blank: () => import('@/layouts/BlankView'),
+ page: () => import('@/layouts/PageView')
+ }
+
+// 路由组件注册
+const AdminAgentRouterMap = {
+ AdminAgent:{
+ name: '代理商管理',
+ icon: 'idcard',
+ component: view.page,
+ authority: {
+ Agent:[''],
+ }
+ },
+ AdminAgentList:{
+ name: '代理商列表',
+ icon: 'idcard',
+ path: '/AdminAgent/AdminAgentList',
+ component: () => import('@/pages/Middle/Admin/AdminAgent/AgentList'),
+ authority: {
+ Agent:[''],
+ }
+ },
+ AdminAgentDetail:{
+ name: '代理商详情',
+ icon: 'idcard',
+ path: '/AdminAgent/AdminAgentDetail',
+ meta: {
+ invisible:true, // 不在菜单中显示
+ },
+ component: () => import('@/pages/Middle/Admin/AdminAgent/AgentDetail'),
+ authority: {
+ Agent:[''],
+ },
+ },
+ AdminAgentAdd:{
+ name: '添加代理商',
+ icon: 'idcard',
+ path: '/AdminAgent/AdminAgentAdd',
+ meta: {
+ invisible:true, // 不在菜单中显示
+ },
+ component: () => import('@/pages/Middle/Admin/AdminAgent/AgentAdd'),
+ authority: {
+ Agent:[''],
+ },
+ },
+ AdminAgentUpdate:{
+ name: '修改代理商',
+ icon: 'idcard',
+ path: '/AdminAgent/AdminAgentUpdate',
+ meta: {
+ invisible:true, // 不在菜单中显示
+ },
+ component: () => import('@/pages/Middle/Admin/AdminAgent/AgentUpdate'),
+ authority: {
+ Agent:[''],
+ },
+ },
+}
+
+export default AdminAgentRouterMap
\ No newline at end of file
diff --git a/src/router/Middle/Admin/AdminCompany/router.map.js b/src/router/Middle/Admin/AdminCompany/router.map.js
new file mode 100644
index 0000000..c3f0525
--- /dev/null
+++ b/src/router/Middle/Admin/AdminCompany/router.map.js
@@ -0,0 +1,71 @@
+// 中台企业路由
+
+
+// 视图组件
+const view = {
+ tabs: () => import('@/layouts/tabs'),
+ blank: () => import('@/layouts/BlankView'),
+ page: () => import('@/layouts/PageView')
+ }
+
+// 路由组件注册
+const AdminCompanyRouterMap = {
+ AdminCompany:{
+ name: '企业管理',
+ icon: 'idcard',
+ component: view.page,
+ meta: {
+ invisible:false, // 不在菜单中显示
+ },
+ authority: {
+ permission:[''],
+ }
+ },
+ AdminCompanyList:{
+ name: '企业列表',
+ icon: 'idcard',
+ path: '/AdminCompany/AdminCompanyList',
+ component: () => import('@/pages/Middle/Admin/AdminCompany/CompanyList'),
+ authority: {
+ permission:[''],
+ }
+ },
+ AdminCompanyDetail:{
+ name: '企业详情',
+ icon: 'idcard',
+ path: '/AdminCompany/AdminCompanyDetail',
+ meta: {
+ invisible:true, // 不在菜单中显示
+ },
+ component: () => import('@/pages/Middle/Admin/AdminCompany/CompanyDetail'),
+ authority: {
+ permission:[''],
+ },
+ },
+ AdminCompanyAdd:{
+ name: '添加企业',
+ icon: 'idcard',
+ path: '/AdminCompany/AdminCompanyAdd',
+ meta: {
+ invisible:true, // 不在菜单中显示
+ },
+ component: () => import('@/pages/Middle/Admin/AdminCompany/CompanyAdd'),
+ authority: {
+ permission:[''],
+ },
+ },
+ AdminCompanyUpdate:{
+ name: '修改企业',
+ icon: 'idcard',
+ path: '/AdminCompany/AdminCompanyUpdate',
+ meta: {
+ invisible:true, // 不在菜单中显示
+ },
+ component: () => import('@/pages/Middle/Admin/AdminCompany/CompanyUpdate'),
+ authority: {
+ permission:[''],
+ },
+ },
+}
+
+export default AdminCompanyRouterMap
\ No newline at end of file
diff --git a/src/router/Middle/Admin/AdminConfig/router.map.js b/src/router/Middle/Admin/AdminConfig/router.map.js
new file mode 100644
index 0000000..fef20e9
--- /dev/null
+++ b/src/router/Middle/Admin/AdminConfig/router.map.js
@@ -0,0 +1,71 @@
+// 中台项目路由
+
+
+// 视图组件
+const view = {
+ tabs: () => import('@/layouts/tabs'),
+ blank: () => import('@/layouts/BlankView'),
+ page: () => import('@/layouts/PageView')
+ }
+
+// 路由组件注册
+const AdminConfigRouterMap = {
+ AdminConfig:{
+ name: '项目管理',
+ icon: 'idcard',
+ component: view.page,
+ meta: {
+ invisible:false, // 不在菜单中显示
+ },
+ authority: {
+ permission:[''],
+ }
+ },
+ AdminConfigList:{
+ name: '项目列表',
+ icon: 'idcard',
+ path: '/AdminConfig/AdminConfigList',
+ component: () => import('@/pages/Middle/Admin/AdminConfig/ConfigList'),
+ authority: {
+ permission:[''],
+ }
+ },
+ AdminConfigDetail:{
+ name: '项目详情',
+ icon: 'idcard',
+ path: '/AdminConfig/AdminConfigDetail',
+ meta: {
+ invisible:true, // 不在菜单中显示
+ },
+ component: () => import('@/pages/Middle/Admin/AdminConfig/ConfigDetail'),
+ authority: {
+ permission:[''],
+ },
+ },
+ AdminConfigAdd:{
+ name: '添加项目',
+ icon: 'idcard',
+ path: '/AdminConfig/AdminConfigAdd',
+ meta: {
+ invisible:true, // 不在菜单中显示
+ },
+ component: () => import('@/pages/Middle/Admin/AdminConfig/ConfigAdd'),
+ authority: {
+ permission:[''],
+ },
+ },
+ AdminConfigUpdate:{
+ name: '修改项目',
+ icon: 'idcard',
+ path: '/AdminConfig/AdminConfigUpdate',
+ meta: {
+ invisible:true, // 不在菜单中显示
+ },
+ component: () => import('@/pages/Middle/Admin/AdminConfig/ConfigUpdate'),
+ authority: {
+ permission:[''],
+ },
+ },
+}
+
+export default AdminConfigRouterMap
\ No newline at end of file
diff --git a/src/router/Middle/Admin/AdminLog/router.map.js b/src/router/Middle/Admin/AdminLog/router.map.js
new file mode 100644
index 0000000..48507f7
--- /dev/null
+++ b/src/router/Middle/Admin/AdminLog/router.map.js
@@ -0,0 +1,47 @@
+// 中台日志路由
+
+
+// 视图组件
+const view = {
+ tabs: () => import('@/layouts/tabs'),
+ blank: () => import('@/layouts/BlankView'),
+ page: () => import('@/layouts/PageView')
+ }
+
+// 路由组件注册
+const AdminLogRouterMap = {
+ AdminLog:{
+ name: '日志管理',
+ icon: 'idcard',
+ component: view.page,
+ meta: {
+ invisible:false, // 不在菜单中显示
+ },
+ authority: {
+ permission:[''],
+ }
+ },
+ AdminLogList:{
+ name: '日志列表',
+ icon: 'idcard',
+ path: '/AdminLog/AdminLogList',
+ component: () => import('@/pages/Middle/Admin/AdminLog/LogList'),
+ authority: {
+ permission:[''],
+ }
+ },
+ AdminLogDetail:{
+ name: '日志详情',
+ icon: 'idcard',
+ path: '/AdminLog/AdminLogDetail',
+ meta: {
+ invisible:true, // 不在菜单中显示
+ },
+ component: () => import('@/pages/Middle/Admin/AdminLog/LogDetail'),
+ authority: {
+ permission:[''],
+ },
+ },
+}
+
+export default AdminLogRouterMap
\ No newline at end of file
diff --git a/src/router/Middle/Admin/AdminPermission/router.map.js b/src/router/Middle/Admin/AdminPermission/router.map.js
new file mode 100644
index 0000000..de402cd
--- /dev/null
+++ b/src/router/Middle/Admin/AdminPermission/router.map.js
@@ -0,0 +1,68 @@
+// 中台权限路由
+
+
+// 视图组件
+const view = {
+ tabs: () => import('@/layouts/tabs'),
+ blank: () => import('@/layouts/BlankView'),
+ page: () => import('@/layouts/PageView')
+ }
+
+// 路由组件注册
+const AdminPermissionRouterMap = {
+ AdminPermission:{
+ name: '权限管理',
+ icon: 'idcard',
+ component: view.page,
+ authority: {
+ permission:[''],
+ }
+ },
+ AdminPermissionList:{
+ name: '权限列表',
+ icon: 'idcard',
+ path: '/AdminPermission/AdminPermissionList',
+ component: () => import('@/pages/Middle/Admin/AdminPermission/PermissionList'),
+ authority: {
+ permission:[''],
+ }
+ },
+ AdminPermissionDetail:{
+ name: '权限详情',
+ icon: 'idcard',
+ path: '/AdminPermission/AdminPermissionDetail',
+ meta: {
+ invisible:true, // 不在菜单中显示
+ },
+ component: () => import('@/pages/Middle/Admin/AdminPermission/PermissionDetail'),
+ authority: {
+ permission:[''],
+ },
+ },
+ AdminPermissionAdd:{
+ name: '添加权限',
+ icon: 'idcard',
+ path: '/AdminPermission/AdminPermissionAdd',
+ meta: {
+ invisible:true, // 不在菜单中显示
+ },
+ component: () => import('@/pages/Middle/Admin/AdminPermission/PermissionAdd'),
+ authority: {
+ permission:[''],
+ },
+ },
+ AdminPermissionUpdate:{
+ name: '修改权限',
+ icon: 'idcard',
+ path: '/AdminPermission/AdminPermissionUpdate',
+ meta: {
+ invisible:true, // 不在菜单中显示
+ },
+ component: () => import('@/pages/Middle/Admin/AdminPermission/PermissionUpdate'),
+ authority: {
+ permission:[''],
+ },
+ },
+}
+
+export default AdminPermissionRouterMap
\ No newline at end of file
diff --git a/src/router/Middle/Admin/AdminService/router.map.js b/src/router/Middle/Admin/AdminService/router.map.js
new file mode 100644
index 0000000..cd93a9c
--- /dev/null
+++ b/src/router/Middle/Admin/AdminService/router.map.js
@@ -0,0 +1,68 @@
+// 中台服务路由
+
+
+// 视图组件
+const view = {
+ tabs: () => import('@/layouts/tabs'),
+ blank: () => import('@/layouts/BlankView'),
+ page: () => import('@/layouts/PageView')
+ }
+
+// 路由组件注册
+const AdminServiceRouterMap = {
+ AdminService:{
+ name: '服务管理',
+ icon: 'idcard',
+ component: view.page,
+ authority: {
+ permission:[''],
+ }
+ },
+ AdminServiceList:{
+ name: '服务列表',
+ icon: 'idcard',
+ path: '/AdminService/AdminServiceList',
+ component: () => import('@/pages/Middle/Admin/AdminService/ServiceList'),
+ authority: {
+ permission:[''],
+ }
+ },
+ AdminServiceDetail:{
+ name: '服务详情',
+ icon: 'idcard',
+ path: '/AdminService/AdminServiceDetail',
+ meta: {
+ invisible:true, // 不在菜单中显示
+ },
+ component: () => import('@/pages/Middle/Admin/AdminService/ServiceDetail'),
+ authority: {
+ permission:[''],
+ },
+ },
+ AdminServiceAdd:{
+ name: '添加服务',
+ icon: 'idcard',
+ path: '/AdminService/AdminServiceAdd',
+ meta: {
+ invisible:true, // 不在菜单中显示
+ },
+ component: () => import('@/pages/Middle/Admin/AdminService/ServiceAdd'),
+ authority: {
+ permission:[''],
+ },
+ },
+ AdminServiceUpdate:{
+ name: '修改服务',
+ icon: 'idcard',
+ path: '/AdminService/AdminServiceUpdate',
+ meta: {
+ invisible:true, // 不在菜单中显示
+ },
+ component: () => import('@/pages/Middle/Admin/AdminService/ServiceUpdate'),
+ authority: {
+ permission:[''],
+ },
+ },
+}
+
+export default AdminServiceRouterMap
\ No newline at end of file
diff --git a/src/router/Middle/Admin/AdminStore/router.map.js b/src/router/Middle/Admin/AdminStore/router.map.js
new file mode 100644
index 0000000..b43791c
--- /dev/null
+++ b/src/router/Middle/Admin/AdminStore/router.map.js
@@ -0,0 +1,68 @@
+// 中台门店路由
+
+
+// 视图组件
+const view = {
+ tabs: () => import('@/layouts/tabs'),
+ blank: () => import('@/layouts/BlankView'),
+ page: () => import('@/layouts/PageView')
+ }
+
+// 路由组件注册
+const AdminStoreRouterMap = {
+ AdminStore:{
+ name: '门店管理',
+ icon: 'idcard',
+ component: view.page,
+ authority: {
+ Store:[''],
+ }
+ },
+ AdminStoreList:{
+ name: '门店列表',
+ icon: 'idcard',
+ path: '/AdminStore/AdminStoreList',
+ component: () => import('@/pages/Middle/Admin/AdminStore/StoreList'),
+ authority: {
+ Store:[''],
+ }
+ },
+ AdminStoreDetail:{
+ name: '门店详情',
+ icon: 'idcard',
+ path: '/AdminStore/AdminStoreDetail',
+ meta: {
+ invisible:true, // 不在菜单中显示
+ },
+ component: () => import('@/pages/Middle/Admin/AdminStore/StoreDetail'),
+ authority: {
+ Store:[''],
+ },
+ },
+ AdminStoreAdd:{
+ name: '添加门店',
+ icon: 'idcard',
+ path: '/AdminStore/AdminStoreAdd',
+ meta: {
+ invisible:true, // 不在菜单中显示
+ },
+ component: () => import('@/pages/Middle/Admin/AdminStore/StoreAdd'),
+ authority: {
+ Store:[''],
+ },
+ },
+ AdminStoreUpdate:{
+ name: '修改门店',
+ icon: 'idcard',
+ path: '/AdminStore/AdminStoreUpdate',
+ meta: {
+ invisible:true, // 不在菜单中显示
+ },
+ component: () => import('@/pages/Middle/Admin/AdminStore/StoreUpdate'),
+ authority: {
+ Store:[''],
+ },
+ },
+}
+
+export default AdminStoreRouterMap
\ No newline at end of file
diff --git a/src/router/Middle/Admin/AdminUser/router.map.js b/src/router/Middle/Admin/AdminUser/router.map.js
index 569aad1..40ef5bc 100644
--- a/src/router/Middle/Admin/AdminUser/router.map.js
+++ b/src/router/Middle/Admin/AdminUser/router.map.js
@@ -9,15 +9,51 @@ const view = {
}
// 路由组件注册
-const BaseAdminRouterMap = {
- Admin:{
+const AdminUserRouterMap = {
+ AdminUser:{
name: '用户管理',
icon: 'idcard',
component: view.page,
+ meta: {
+ invisible:true, // 不在菜单中显示
+ },
authority: {
permission:[''],
}
},
+ AdminUserList:{
+ name: '用户列表',
+ icon: 'idcard',
+ path: '/AdminUser/AdminUserList',
+ component: () => import('@/pages/Middle/Admin/AdminUser/UserList'),
+ authority: {
+ permission:[''],
+ }
+ },
+ AdminUserAdd:{
+ name: '添加用户',
+ icon: 'idcard',
+ path: '/AdminUser/AdminUserAdd',
+ component: () => import('@/pages/Middle/Admin/AdminUser/UserAdd'),
+ meta: {
+ invisible:true, // 不在菜单中显示
+ },
+ authority: {
+ permission:[''],
+ },
+ },
+ AdminUserUpdate:{
+ name: '修改用户',
+ icon: 'idcard',
+ path: '/AdminUser/AdminUserUpdate',
+ component: () => import('@/pages/Middle/Admin/AdminUser/UserUpdate'),
+ meta: {
+ invisible:true, // 不在菜单中显示
+ },
+ authority: {
+ permission:[''],
+ },
+ },
}
-export default BaseAdminRouterMap
\ No newline at end of file
+export default AdminUserRouterMap
\ No newline at end of file
diff --git a/src/router/Middle/Base/BaseAdmin/router.map.js b/src/router/Middle/Base/BaseAdmin/router.map.js
index 0208093..cea3c55 100644
--- a/src/router/Middle/Base/BaseAdmin/router.map.js
+++ b/src/router/Middle/Base/BaseAdmin/router.map.js
@@ -10,7 +10,7 @@ const view = {
// 路由组件注册
const BaseAdminRouterMap = {
- Admin:{
+ BaseAdmin:{
name: '用户管理',
icon: 'idcard',
component: view.page,
diff --git a/src/router/async/base.map.js b/src/router/async/base.map.js
index 52ae69a..3ce4362 100644
--- a/src/router/async/base.map.js
+++ b/src/router/async/base.map.js
@@ -20,6 +20,7 @@ const view = {
},
dashboard: {
name: '仪表盘',
+ redirect: '/dashboard/workplace',
component: view.blank
},
workplace: {
diff --git a/src/router/async/router.map.js b/src/router/async/router.map.js
index 968a12b..5e80556 100644
--- a/src/router/async/router.map.js
+++ b/src/router/async/router.map.js
@@ -1,5 +1,15 @@
import BaseRouterMap from './base.map.js'
// 以下为中台服务的路由配置
+
+
+import AdminUserRouterMap from '@/router/Middle/Admin/AdminUser/router.map.js'
+import AdminConfigRouterMap from '@/router/Middle/Admin/AdminConfig/router.map.js'
+import AdminServiceRouterMap from '@/router/Middle/Admin/AdminService/router.map.js'
+import AdminPermissionRouterMap from '@/router/Middle/Admin/AdminPermission/router.map.js'
+import AdminCompanyRouterMap from '@/router/Middle/Admin/AdminCompany/router.map.js'
+import AdminLogRouterMap from '@/router/Middle/Admin/AdminLog/router.map.js'
+import AdminAgentRouterMap from '@/router/Middle/Admin/AdminAgent/router.map.js'
+
import BaseConfigRouterMap from '@/router/Middle/Base/BaseConfig/router.map.js'
import BaseServiceRouterMap from '@/router/Middle/Base/BaseService/router.map.js'
import BaseCompanyRouterMap from '@/router/Middle/Base/BaseCompany/router.map.js'
@@ -7,14 +17,21 @@ import BaseAdminRouterMap from '@/router/Middle/Base/BaseAdmin/router.map.js'
-
// 合并BaseRouterMap ConfigRouterMap ServiceRouterMap
const routerMap = Object.assign({},
BaseRouterMap,
+ AdminUserRouterMap,
+ AdminConfigRouterMap,
+ AdminServiceRouterMap,
+ AdminPermissionRouterMap,
+ AdminCompanyRouterMap,
+ AdminLogRouterMap,
+ AdminAgentRouterMap,
+
+ BaseAdminRouterMap,
BaseConfigRouterMap,
BaseServiceRouterMap,
BaseCompanyRouterMap,
- BaseAdminRouterMap,
)
diff --git a/src/router/guards.js b/src/router/guards.js
index 2a78484..88086de 100644
--- a/src/router/guards.js
+++ b/src/router/guards.js
@@ -95,7 +95,9 @@ const redirectGuard = (to, from, next, options) => {
if (store.state.setting.layout === 'mix') { // 如果是混合导航模式
+ console.log("==混合导航模式==")
const firstMenu = store.getters['setting/firstMenu'] // 获取第一个菜单
+
// console.log("store.getters['setting/firstMenu']", store.getters['setting/firstMenu'])
if (firstMenu.find(item => item.fullPath === to.fullPath)) { // 如果是第一个菜单列表,
store.commit('setting/setActivatedFirst', to.fullPath) // 设置激活的第一个菜单
@@ -103,6 +105,8 @@ const redirectGuard = (to, from, next, options) => {
// console.log("store.getters['setting/subMenu']", store.getters['setting/subMenu'])
if (subMenu.length > 0) { // 如果有子菜单
const redirect = getFirstChild(subMenu) // 获取第一个子菜单
+ console.log("subMenu.length", subMenu.length)
+ console.log("redirect", redirect)
return next({path: redirect.fullPath}) // 重定向到第一个子菜单
}
}
diff --git a/src/store/modules/account.js b/src/store/modules/account.js
index 3e3ee5e..448c92d 100644
--- a/src/store/modules/account.js
+++ b/src/store/modules/account.js
@@ -3,15 +3,15 @@ export default {
state: {
uid: 0,
routesConfig: undefined, // 路由配置
- user: [], // 用户信息
- permissions: [], // 权限
- settings: [], // 用户配置
- project: [], // 项目信息
- company: [], // 公司信息
+ user: undefined, // 用户信息
+ permissions: undefined, // 权限
+ settings: undefined, // 用户配置
+ project: undefined, // 项目信息
+ company: undefined, // 公司信息
},
getters: {
uid: state => { // 用户id
- if (!state.uid) { // 如果没有用户uid
+ if (state.uid == 0) { // 如果没有用户uid
try {
const uid = localStorage.getItem(process.env.VUE_APP_UID_KEY) // 获取用户id
state.uid = uid // 将用户信息赋值给state.user
@@ -19,6 +19,7 @@ export default {
console.error(e)
}
}
+ state.uid = localStorage.getItem(process.env.VUE_APP_UID_KEY) // 获取用户id
return state.uid // 如果有用户信息，直接返回
},
user: state => { // 用户信息
@@ -80,6 +81,8 @@ export default {
console.error(e.message)
}
}
+ console.log("gggggggggggggggggggggggggggggggggggggggggggggggggggggggg")
+ return state.project // 如果有项目信息，则返回项目信息
},
company: state => { // 公司信息
if (!state.company) { // 如果没有公司信息
@@ -92,6 +95,8 @@ export default {
console.error(e.message)
}
}
+ state.company = JSON.parse(state.company) // 将字符串转换为json对象
+ return state.company // 如果有公司信息，则返回公司信息
},
},
diff --git a/src/utils/request.js b/src/utils/request.js
index ba0b6b5..709535e 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -67,6 +67,13 @@ function setAuthorization(auth, authType = AUTH_TYPE.BEARER) { // 设置认证
}
}
+/**
+ * 设置企业信息
+ */
+function setCompany(company) {
+ Cookie.set('company', company)
+}
+
/**
* 移出认证信息
* @param authType {AUTH_TYPE} 认证类型
@@ -173,5 +180,6 @@ export {
removeAuthorization,
checkAuthorization,
loadInterceptors,
- parseUrlParams
+ parseUrlParams,
+ setCompany
}
diff --git a/src/utils/routerUtil.js b/src/utils/routerUtil.js
index 0f45d41..ba0a350 100644
--- a/src/utils/routerUtil.js
+++ b/src/utils/routerUtil.js
@@ -139,15 +139,12 @@ function loadRoutes(routesConfig) { // 加载路由
const { router, store, i18n } = appOptions
const Permission = store.getters['account/permissions'] // 获取权限
- console.log("======Permission:",Permission)
-
if (routesConfig) { // 如果routesConfig已经存在
store.commit('account/setRoutesConfig', routesConfig) // 通过store的account模块的setRoutesConfig方法更新路由配置
} else {
routesConfig = store.getters['account/routesConfig'] // 通过store的account模块的routesConfig方法获取路由配置
}
// 如果 routesConfig 有值，则更新到本地，否则从本地获取
- console.log("=====setRoutesConfig:", routesConfig)
// 根据权限过滤路由配置
const filteredRoutesConfig = filterRoutesConfig(routesConfig, Permission) // 根据权限过滤路由配置