diff --git a/ruoyi-ui/src/permission.js b/ruoyi-ui/src/permission.js index b901d8921..09e961d2a 100644 --- a/ruoyi-ui/src/permission.js +++ b/ruoyi-ui/src/permission.js @@ -66,7 +66,7 @@ router.beforeEach((to, from, next) => { } else { //console.log(whiteList.indexOf(to.path)); // 没有token - if (whiteList.indexOf(to.path) !== -1 ||to.path.indexOf("/experience/choose/") != -1||to.path.indexOf("/experience/apply/") != -1||to.path.indexOf("/experience/result/") != -1) { + if (whiteList.indexOf(to.path) !== -1 ||to.path.indexOf("/experience") != -1) { // 在免登录白名单,直接进入 next() } else { diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js index 123349722..54414f463 100644 --- a/ruoyi-ui/src/router/index.js +++ b/ruoyi-ui/src/router/index.js @@ -53,23 +53,25 @@ export const constantRoutes = [{ import('@/views/error/401'), hidden: true }, - { - path: '/experience/choose/:id(\\d+)', - component: () => - import('@/views/benyi/experience/choose'), - hidden: true - }, { path: '/experience/apply/:id(\\d+)', component: () => - import('@/views/benyi/experience/apply'), - hidden: true - }, - { - path: '/experience/result/:id(\\d+)', - component: () => - import('@/views/benyi/experience/result'), - hidden: true + import('@/views/benyi/experience/choose'), + hidden: true, + children: [ + { + path: '/experience/apply/:id(\\d+)', + component: () => + import('@/views/benyi/experience/apply'), + hidden: true + }, + { + path: '/experience/result/:id(\\d+)', + component: () => + import('@/views/benyi/experience/result'), + hidden: true + } + ] }, { path: '', diff --git a/ruoyi-ui/src/views/benyi/experience/apply.vue b/ruoyi-ui/src/views/benyi/experience/apply.vue index d23781f98..52104a2f4 100644 --- a/ruoyi-ui/src/views/benyi/experience/apply.vue +++ b/ruoyi-ui/src/views/benyi/experience/apply.vue @@ -18,7 +18,6 @@
确 定 - 返 回 + 重 置
@@ -156,7 +153,7 @@ export default { \ No newline at end of file diff --git a/ruoyi-ui/src/views/benyi/experience/result.vue b/ruoyi-ui/src/views/benyi/experience/result.vue index f84f5228f..80a6beda0 100644 --- a/ruoyi-ui/src/views/benyi/experience/result.vue +++ b/ruoyi-ui/src/views/benyi/experience/result.vue @@ -1,5 +1,5 @@ -