合并冲突

spring

2025-09-02 4ca2aeafbb3c753d98ba849fa5ebf817049b5803

 src/layout/components/Sidebar/index.vue

@@ -30,7 +30,6 @@
const sideTheme = computed(() => settingsStore.sideTheme)

const theme = computed(() => settingsStore.theme)

const isCollapse = computed(() => !appStore.sidebar.opened)

console.log(44444, settingsStore.isDark, sideTheme.value)



// 获取菜单背景色

const getMenuBackground = computed(() => {