diff --git a/src/assets/logo/short_logo.png b/src/assets/logo/short_logo.png
new file mode 100644
index 00000000..f4f1432d
Binary files /dev/null and b/src/assets/logo/short_logo.png differ
diff --git a/src/components/HeaderSearch/index.vue b/src/components/HeaderSearch/index.vue
index 18c4d399..d7942ec8 100644
--- a/src/components/HeaderSearch/index.vue
+++ b/src/components/HeaderSearch/index.vue
@@ -3,13 +3,11 @@
     :width="330"
     trigger="click"
     transition="el-zoom-in-top"
-    popper-class="ele-notice-pop">
-    <div slot="reference"  >
-      <div>
-        <svg-icon class-name="search-icon" icon-class="search" @click.stop="click" />
-      </div>
-    </div>
-      <div :class="{'show':show}" class="header-search">
+    popper-class="ele-notice-pop"
+    effect="light"
+    :show-arrow="false"
+    >
+    <div :class="{'show':show}" class="header-search">
         <el-select
           ref="headerSearchSelect"
           v-model="search"
@@ -24,6 +22,11 @@
           <el-option v-for="option in options" :key="option.item.path" :value="option.item" :label="option.item.title.join(' > ')" />
         </el-select>
       </div>
+    <div slot="reference"  >
+      <div>
+        <svg-icon class-name="search-icon" icon-class="search" @click.stop="click" />
+      </div>
+    </div>
   </el-popover>
 </template>
 
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index a5855322..e77d9329 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -2,13 +2,13 @@
   <div class="sidebar-logo-container" :class="{'collapse':collapse}" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
     <transition name="sidebarLogoFade">
       <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
-        <!-- <img v-if="logo" :src="logo" class="sidebar-logo" /> -->
-        <!-- <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1> -->
+        <img v-if="logo" :src="shortLogo" style="    width: 30px;height: 30px;margin-top: 0px;"  />
+        <!-- <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">TANEX</h1> -->
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
-        <div style="background: #fff url('../../assets/logo/left_logo_bg.png') no-repeat;background-size: cover;">
-        <img v-if="logo" :src="logo" class="sidebar-logo" />
-        <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
+        <div :style="{backgroundImage:'url('+logoBg+')'}" class="logo-bg">
+          <img v-if="logo" :src="logo" class="sidebar-logo" />
+          <!-- <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1> -->
         </div>
       </router-link>
     </transition>
@@ -16,7 +16,9 @@
 </template>
 
 <script>
+import shortLogoImg from '@/assets/logo/short_logo.png'
 import logoImg from '@/assets/logo/left_logo.png'
+import logoBgImg from '@/assets/logo/left_logo_bg.png'
 import variables from '@/assets/styles/variables.scss'
 
 export default {
@@ -38,13 +40,21 @@ export default {
   data() {
     return {
       title: '',
-      logo: logoImg
+      logo: logoImg,
+      logoBg: logoBgImg,
+      shortLogo: shortLogoImg,
+
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
+
+.logo-bg {
+  background-size: cover;
+  margin: 15px;
+}
 .sidebarLogoFade-enter-active {
   transition: opacity 1.5s;
 }