diff --git a/src/layout/LayoutColumns/index.vue b/src/layout/LayoutColumns/index.vue index 31c1580..4687814 100644 --- a/src/layout/LayoutColumns/index.vue +++ b/src/layout/LayoutColumns/index.vue @@ -37,10 +37,7 @@ :collapse-transition="false" class="menu-columns" > - + @@ -64,7 +61,6 @@ import { ref, computed, watch } from "vue"; import { useRoute, useRouter } from "vue-router"; import {usePermissionStore} from "@/store/modules/permission" import { useSettingStore } from "@/store/modules/setting"; -import SubItem from '../components/SubMenu/SubItem.vue' import Footer from '../components/Footer/index.vue' import SubMenu from '../components/SubMenu/SubMenu.vue' import TagsView from '../components/TagsView/index.vue' @@ -89,9 +85,6 @@ const themeConfig = computed(() =>SettingStore.themeConfig) const isCollapse = computed(() =>!SettingStore.isCollapse) const activeMenu = computed(() => { const { meta, path } = route - if (meta.activeMenu) { - return meta.activeMenu - } return path }) const basePath = ref('/') @@ -158,7 +151,7 @@ const handleChangeMenu = (item)=>{ transition: all .3s ease; } .active-menu{ - background: #1890ff; + background: $primaryColor; border-radius: 5px; } .title{ diff --git a/src/layout/LayoutHorizontal/HeaderHorizontal/index.vue b/src/layout/LayoutHorizontal/HeaderHorizontal/index.vue index e119afc..bae598c 100644 --- a/src/layout/LayoutHorizontal/HeaderHorizontal/index.vue +++ b/src/layout/LayoutHorizontal/HeaderHorizontal/index.vue @@ -16,12 +16,7 @@ :collapse-transition="false" class="menu-horizontal" > - + @@ -34,7 +29,7 @@ import Height from '../../components/Header/components/Height.vue' import HeaderToolRight from '../../components/Header/ToolRight.vue' import TagsView from '../../components/TagsView/index.vue' -import SubItem from '../../components/SubMenu/SubItem.vue' +import SubMenu from '../../components/SubMenu/SubMenu.vue' import { useRoute } from 'vue-router' import {usePermissionStore} from "@/store/modules/permission" const PermissionStore = usePermissionStore() diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue index f408c4a..c02f18f 100644 --- a/src/layout/components/Sidebar/index.vue +++ b/src/layout/components/Sidebar/index.vue @@ -11,12 +11,7 @@ class="el-menu-vertical-demo" :collapse="isCollapse" > - + @@ -24,7 +19,6 @@ - - diff --git a/src/layout/components/SubMenu/MenuItem.vue b/src/layout/components/SubMenu/MenuItem.vue new file mode 100644 index 0000000..80dfb1d --- /dev/null +++ b/src/layout/components/SubMenu/MenuItem.vue @@ -0,0 +1,35 @@ + + + diff --git a/src/layout/components/SubMenu/SubItem.vue b/src/layout/components/SubMenu/SubItem.vue deleted file mode 100644 index 0578c94..0000000 --- a/src/layout/components/SubMenu/SubItem.vue +++ /dev/null @@ -1,81 +0,0 @@ - - - diff --git a/src/layout/components/SubMenu/SubMenu.vue b/src/layout/components/SubMenu/SubMenu.vue index eac457d..5e09c4a 100644 --- a/src/layout/components/SubMenu/SubMenu.vue +++ b/src/layout/components/SubMenu/SubMenu.vue @@ -1,43 +1,54 @@