diff --git a/src/components/custom-scroll-title/index.vue b/src/components/custom-scroll-title/index.vue index a889cef..6472b01 100644 --- a/src/components/custom-scroll-title/index.vue +++ b/src/components/custom-scroll-title/index.vue @@ -168,7 +168,7 @@ function handleTitleClick(val) { width: 30%; height: 100%; overflow: hidden; - line-height: 60px; + line-height: 90px; .title_content { position: absolute; top: 10px; diff --git a/src/layouts/index.vue b/src/layouts/index.vue index 48b5ce3..1c35e7b 100644 --- a/src/layouts/index.vue +++ b/src/layouts/index.vue @@ -58,11 +58,14 @@ onMounted(() => { &-header { width: 100%; height: 60px; - margin-bottom: 60px; + // margin-bottom: 60px; } &-main { flex: 1; min-height: calc(100vh - 60px); } + .base-laytout-header { + height: 90px; + } } diff --git a/src/router/index.js b/src/router/index.js index c644a7a..275def0 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2,6 +2,8 @@ import { createRouter, createWebHistory } from 'vue-router'; import Layout from '@/layouts/index.vue'; import demoRouters from './modules/demo'; +import path from 'path-browserify'; +import v2 from './modules/v2'; export const constantRoutes = [ // { @@ -22,58 +24,59 @@ export const constantRoutes = [ component: Layout, redirect: '/home', meta: { title: '首页', icon: 'House' }, - children: [ - { - path: '/home', - component: () => import('@/views/home/index.vue'), - name: 'home', - meta: { title: '首页', icon: 'House' }, - }, - { - path: '/land', - component: () => import('@/views/land/index.vue'), - name: 'land', - meta: { title: '土地资源', icon: 'House' }, - }, - { - path: '/inputs', - name: 'inputs', - component: () => import('@/views/inputs/index.vue'), - hidden: true, - }, - { - path: '/entities', - name: 'entities', - component: () => import('@/views/entities/index.vue'), - hidden: true, - }, - { - path: '/breed', - name: 'breed', - component: () => import('@/views/breed/index.vue'), - hidden: true, - }, - { - path: '/plant', - name: 'plant', - component: () => import('@/views/plant/index.vue'), - hidden: true, - }, - { - path: '/trace', - name: 'trace', - component: () => import('@/views/trace/index.vue'), - hidden: true, - }, - { - path: '/early', - name: 'early', - component: () => import('@/views/early/index.vue'), - hidden: true, - }, - ], + // children: [ + // { + // path: '/home', + // component: () => import('@/views/home/index.vue'), + // name: 'home', + // meta: { title: '首页', icon: 'House' }, + // }, + // { + // path: '/land', + // component: () => import('@/views/land/index.vue'), + // name: 'land', + // meta: { title: '土地资源', icon: 'House' }, + // }, + // { + // path: '/inputs', + // name: 'inputs', + // component: () => import('@/views/inputs/index.vue'), + // hidden: true, + // }, + // { + // path: '/entities', + // name: 'entities', + // component: () => import('@/views/entities/index.vue'), + // hidden: true, + // }, + // { + // path: '/breed', + // name: 'breed', + // component: () => import('@/views/breed/index.vue'), + // hidden: true, + // }, + // { + // path: '/plant', + // name: 'plant', + // component: () => import('@/views/plant/index.vue'), + // hidden: true, + // }, + // { + // path: '/trace', + // name: 'trace', + // component: () => import('@/views/trace/index.vue'), + // hidden: true, + // }, + // { + // path: '/early', + // name: 'early', + // component: () => import('@/views/early/index.vue'), + // hidden: true, + // }, + // ], }, ...demoRouters, + v2, { path: '/test', name: 'test', diff --git a/src/router/modules/v2.js b/src/router/modules/v2.js new file mode 100644 index 0000000..0e91c01 --- /dev/null +++ b/src/router/modules/v2.js @@ -0,0 +1,59 @@ +import Layout from '@/layouts/index.vue'; + +export default { + path: '/v2', + name: 'layout', + component: Layout, + redirect: '/v2/home', + meta: { title: '首页', icon: 'House' }, + children: [ + { + path: 'home', + component: () => import('@/views/home/index.vue'), + name: 'home', + meta: { title: '首页', icon: 'House' }, + }, + { + path: 'land', + component: () => import('@/views/land/index.vue'), + name: 'land', + meta: { title: '土地资源', icon: 'House' }, + }, + { + path: 'inputs', + name: 'inputs', + component: () => import('@/views/inputs/index.vue'), + hidden: true, + }, + { + path: 'entities', + name: 'entities', + component: () => import('@/views/entities/index.vue'), + hidden: true, + }, + { + path: 'breed', + name: 'breed', + component: () => import('@/views/breed/index.vue'), + hidden: true, + }, + { + path: 'plant', + name: 'plant', + component: () => import('@/views/plant/index.vue'), + hidden: true, + }, + { + path: 'trace', + name: 'trace', + component: () => import('@/views/trace/index.vue'), + hidden: true, + }, + { + path: 'early', + name: 'early', + component: () => import('@/views/early/index.vue'), + hidden: true, + }, + ], +};