Merge branch 'master' of http://42.193.1.25:9521/r/dream_web

zhanghua

2024-09-12 64adf0faa3ee49de1d4ba3abe6c9de5bb565f44b

 src/layout/components/Sidebar/index.vue

@@ -1,5 +1,5 @@
<template>
  <div :class="{'has-logo':showLogo}">
  <div :class="{'has-logo':showLogo}" style="border-right: 1px solid #DDE0E2;">
    <logo v-if="showLogo" :collapse="isCollapse" />
    <el-scrollbar wrap-class="scrollbar-wrapper">
      <el-menu
@@ -43,7 +43,7 @@
      return path
    },
    showLogo() {
      return this.$store.state.settings.sidebarLogo
      return true;
    },
    variables() {
      return variables