diff --git a/src/router/index.js b/src/router/index.js index 0fc0b22..ff1b609 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,6 +1,6 @@ import Vue from 'vue' import Router from 'vue-router' -import { routers, indexRouter } from './modules/router' +import { routers } from './modules/router' import { MyLocalStorage } from 'assets/js/utils' import { SLIDER_FLAG, LOGIN_FLAG } from 'assets/js/storageConst' @@ -19,42 +19,5 @@ }, routes: routers }) - -// router.beforeEach((to, from, next) => { -// console.log("beforeEach") -// let slider_flag = localStorage.getItem(SLIDER_FLAG) -// let login_flag = MyLocalStorage.Cache.get(LOGIN_FLAG) -// if (to.name === 'slider' && !slider_flag) { -// console.log(111) -// next() -// } else if (!slider_flag) { // 没有索引页就跳转索引页 -// console.log("2222") -// next({ -// name: 'slider' -// }) -// } else if (to.name !== 'login' && !login_flag) { // 没有登陆 -// console.log(3333) -// if (from.name !== 'slider') { -// Toast({ -// message: '登陆超时', -// position: 'bottom', -// duration: 3000 -// }) -// } -// next({ -// name: 'login' -// }) -// } else if (to.name === 'login' && !login_flag) { -// console.log(4444) -// next() -// } else { -// console.log(555) -// next() -// } -// }) -// -// router.afterEach((to) => { -// window.scrollTo(0, 0) -// }) export default router export const routes = routers diff --git a/src/router/index.js b/src/router/index.js index 0fc0b22..ff1b609 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,6 +1,6 @@ import Vue from 'vue' import Router from 'vue-router' -import { routers, indexRouter } from './modules/router' +import { routers } from './modules/router' import { MyLocalStorage } from 'assets/js/utils' import { SLIDER_FLAG, LOGIN_FLAG } from 'assets/js/storageConst' @@ -19,42 +19,5 @@ }, routes: routers }) - -// router.beforeEach((to, from, next) => { -// console.log("beforeEach") -// let slider_flag = localStorage.getItem(SLIDER_FLAG) -// let login_flag = MyLocalStorage.Cache.get(LOGIN_FLAG) -// if (to.name === 'slider' && !slider_flag) { -// console.log(111) -// next() -// } else if (!slider_flag) { // 没有索引页就跳转索引页 -// console.log("2222") -// next({ -// name: 'slider' -// }) -// } else if (to.name !== 'login' && !login_flag) { // 没有登陆 -// console.log(3333) -// if (from.name !== 'slider') { -// Toast({ -// message: '登陆超时', -// position: 'bottom', -// duration: 3000 -// }) -// } -// next({ -// name: 'login' -// }) -// } else if (to.name === 'login' && !login_flag) { -// console.log(4444) -// next() -// } else { -// console.log(555) -// next() -// } -// }) -// -// router.afterEach((to) => { -// window.scrollTo(0, 0) -// }) export default router export const routes = routers diff --git a/src/router/modules/router.js b/src/router/modules/router.js index 4e042df..4b21990 100644 --- a/src/router/modules/router.js +++ b/src/router/modules/router.js @@ -80,6 +80,9 @@ path:'/jobSearch', name: 'jobSearch', component: () => import('@/page/jobSearch/searchPage'), + meta:{ + keepAlive:true + } }, { path:'/searchList', @@ -90,6 +93,11 @@ } }, { + path:'/gaodeMap', + name: 'gaodeMap', + component: () => import('@/page/smap/gaodeMap') + }, + { path:'/mine', name: 'mine', component: () => import('@/page/mine/index') @@ -295,8 +303,6 @@ indexRouter, loginRouter, sliderRouter, - advertisementRouter, - ...uiRouters, ...plusRouters, ...wellRouters ]