Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子li

2021-07-08 e30079d65629bd97b06c9442f6f0d58df5ac84dd

 ruoyi-ui/src/components/TopNav/index.vue

@@ -73,9 +73,9 @@
            if(router.path === "/") {
              router.children[item].path = "/redirect/" + router.children[item].path;
            } else {
           if(!this.ishttp(router.children[item].path)) {
              if(!this.ishttp(router.children[item].path)) {
                router.children[item].path = router.path + "/" + router.children[item].path;
           }
              }
            }
            router.children[item].parentPath = router.path;
          }