From a5335b9e9c87ed7aaeabc5b15077d5e3543321ff Mon Sep 17 00:00:00 2001
From: jmal <zhushilun084@gmail.com>
Date: Mon, 11 Jan 2021 23:17:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E8=A7=A3=E6=9E=90?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/permission.js                        | 30 ++++++++++++++++++++----
 src/router/index.js                      |  3 ++-
 src/store/modules/user.js                |  6 ++---
 src/views/setting/sys/cusomerManager.vue |  2 ++
 src/views/setting/sys/roleManager.vue    |  1 +
 5 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/src/permission.js b/src/permission.js
index 08bb090..078b9f5 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -61,11 +61,12 @@ router.beforeEach(async(to, from, next) => {
 
 function setMenuList(next, to){
   if(store.getters.menuList.length === 0){
-    store.dispatch('user/setMenuList').then(() => {
-      if(window.location.pathname === '/login'){
-        next({path: store.getters.menuList[0].path})
+    store.dispatch('user/setMenuList').then((res) => {
+      const to = window.location.pathname
+      if(findPath(res.data, to)){
+        next({path: to})
       } else {
-        next({path: window.location.pathname})
+        next({path: store.getters.menuList[0].path})
       }
     })
   } else {
@@ -73,6 +74,27 @@ function setMenuList(next, to){
   }
 }
 
+/***
+ * 查找菜单里有没有该路径
+ * @param menuList
+ * @param to 该路径(当前路径)
+ * @param parentPath
+ * @returns {boolean}
+ */
+function findPath(menuList, to, parentPath){
+  for( let i = 0; i < menuList.length - 1; i++) {
+    const menu = menuList[i]
+    if(menu.children && menu.children.length > 0){
+      return findPath(menu.children, to, menu.path)
+    }
+    if(parentPath){
+      menu.path = parentPath + '/' + menu.path
+    }
+    if(menu.path === to) return true
+  }
+  return false
+}
+
 router.afterEach(() => {
   // 完成进度条
   NProgress.done()
diff --git a/src/router/index.js b/src/router/index.js
index 23da61b..6d787ea 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -341,12 +341,13 @@ const router = createRouter()
 
 // Detail see: https://github.com/vuejs/vue-router/issues/1234#issuecomment-357941465
 export function resetRouter(params) {
+  router.options.routes = []
   const newRouter = createRouter()
-  // router.matcher = newRouter.matcher // reset router
   if(params){
     newRouter.addRoutes(params)
   }
   newRouter.addRoutes(dynamicRouters)
+  router.matcher = newRouter.matcher // reset router
 }
 router.addRoutes(dynamicRouters)
 export default router
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index b0c55cd..d013e8e 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -2,7 +2,6 @@ import { login, logout, getInfo } from '@/api/user'
 import menuApi from '@/api/menu'
 import { getToken, setToken, getConsumerId, setConsumerId, removeToken, removeConsumerId , setRememberName, removeRememberName } from '@/utils/auth'
 import { resetRouter } from '@/router'
-import getters from "@/store/getters"
 import router from '@/router'
 import Layout from '@/layout'
 import ParentView from '@/components/ParentView'
@@ -47,12 +46,11 @@ const mutations = {
 const actions = {
 
   async setMenuList({ commit, state }) {
-    let noeFound = [];
     return new Promise( (resolve,reject) => {
-      menuApi.menuTree({userId: getters.userId}).then((res) => {
+      menuApi.menuTree({userId: state.userId}).then((res) => {
         state.menuList = getMenuTree(res.data);
         commit('SET_MENU_LIST',state.menuList);
-        router.addRoutes(state.menuList)
+        resetRouter(state.menuList)
         router.options.routes = router.options.routes.concat(state.menuList);
         resolve(res)
       }).catch(error => {
diff --git a/src/views/setting/sys/cusomerManager.vue b/src/views/setting/sys/cusomerManager.vue
index 3079e04..bb342d0 100644
--- a/src/views/setting/sys/cusomerManager.vue
+++ b/src/views/setting/sys/cusomerManager.vue
@@ -241,6 +241,8 @@ export default {
             data.append(formKey,this.form[formKey])
           }
         }
+        data.delete("createTime")
+        data.delete("updateTime")
         return data
       },
       // 保存
diff --git a/src/views/setting/sys/roleManager.vue b/src/views/setting/sys/roleManager.vue
index e606c99..1c8a556 100644
--- a/src/views/setting/sys/roleManager.vue
+++ b/src/views/setting/sys/roleManager.vue
@@ -207,6 +207,7 @@ export default {
           }
         }
         data.delete("createTime")
+        data.delete("updateTime")
         return data
       },
       // 保存