Merge remote-tracking branch 'origin/master'

luohairen

2024-11-25 f12c46b1be892c16dcd958ae07a75b527dec2560

 src/layout/components/Sidebar/index.vue

@@ -1,8 +1,5 @@
<template>
    <div
        :class="{ 'has-logo': showLogo }"
        :style="{ backgroundColor: variables.menuLightBackground }"
    >
    <div :class="{ 'has-logo': showLogo }">
        <!-- <logo v-if="showLogo" :collapse="isCollapse" /> -->
        <div class="hamburger-container">
            <div class="border">
@@ -22,7 +19,7 @@
            <el-menu
                :default-active="activeMenu"
                :collapse="isCollapse"
                :background-color="variables.menuLightBackground"
                background-color="#F3F7FC"
                :text-color="variables.menuLightColor"
                :unique-opened="true"
                :active-text-color="settings.theme"