diff --git a/src/components/bg-menu.vue b/src/components/bg-menu.vue index 58bbe1184ab99c1d625cff9f5758c92ec11c323b..59e0012b3fc639c42bfc2545de6ff56178460732 100644 --- a/src/components/bg-menu.vue +++ b/src/components/bg-menu.vue @@ -242,7 +242,7 @@ export default { pathToUrl(item, parent) { //判断是否是新窗口打开 if (item.new_window) { - window.open(item.path, "_blank"); + window.open(item.sourcePath ? item.sourcePath : item.path, "_blank"); } else { // 当前窗口打开 if (item.path.indexOf("#") > -1) { diff --git a/src/components/login-by-code.vue b/src/components/login-by-code.vue index 5138b20f7f8bdf6e18ee00e9c523a13e42a102ed..9fdc3a8a58ed7dd11fcd24706a89f9e74c30183e 100644 --- a/src/components/login-by-code.vue +++ b/src/components/login-by-code.vue @@ -166,7 +166,7 @@ const getUser = () => { store.commit("setMenuObj", menuObj); // } generateRoutes(); - router.push("/"); + router.push("/forewarning/list"); } }); }; diff --git a/src/router/function.js b/src/router/function.js index 472bf5ee25e39f4888d11e8839a7af7dc59ece89..b01a8aaca06914a6837e3cdbcb3197e65e69ccad 100644 --- a/src/router/function.js +++ b/src/router/function.js @@ -278,7 +278,10 @@ function getViews(path) { var menuToRouter = (menu) => { menu.forEach((e) => { e.name = getName(e.path); - if (e.path.indexOf("#") != -1 && e.new_window !== 1) { + if (e.path.indexOf("#") != -1) { + if (e.path.indexOf("http") === 0) { + e.sourcePath = e.path; + } e.path = e.path.split("#")[1]; } if (e.children && e.menuType == 0) {