From 65d540d99adadeff8a39a8471337efbec4aee1e6 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Thu, 5 Jun 2025 18:09:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=86=E6=9E=B6=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/canteen2.ico                      | Bin 0 -> 4286 bytes
 public/index.html                        |   2 +-
 src/assets/icons/svg/canteen.svg         |   1 +
 src/assets/icons/svg/canteen2.svg        |   1 +
 src/assets/logo/logo.png                 | Bin 5561 -> 1702 bytes
 src/assets/logo/logo2.png                | Bin 0 -> 5561 bytes
 src/assets/styles/sidebar.scss           |  13 +++--
 src/assets/styles/variables.scss         |  10 ++--
 src/components/TopNav/index.vue          |  20 ++++----
 src/layout/components/Navbar.vue         |  60 ++++++++++++++++++-----
 src/layout/components/TagsView/index.vue |   4 +-
 src/layout/index.vue                     |  30 ++++++++++--
 src/router/index.js                      |  18 +++----
 src/settings.js                          |   4 +-
 14 files changed, 114 insertions(+), 49 deletions(-)
 create mode 100644 public/canteen2.ico
 create mode 100644 src/assets/icons/svg/canteen.svg
 create mode 100644 src/assets/icons/svg/canteen2.svg
 create mode 100644 src/assets/logo/logo2.png

diff --git a/public/canteen2.ico b/public/canteen2.ico
new file mode 100644
index 0000000000000000000000000000000000000000..f78d61fc24c6d9dae24f46b3c5c451dcba3eecd9
GIT binary patch
literal 4286
zcmbuCTWDNG7{@0~$p)I3?C#l3chA}EQc#Om^hps(d=Nprf+DC0BJ@#Elv)t0X<CxK
zG>MH=tb!my5uxgX6nrp<m--;0;Dab=sfwt@)VmT}fB!jWvL~0bdlD!7GjnFX@B4q>
zT)vq#riZ^;&FH^5I&4hQ7_$@5WyXQ}ZDDL9C1`kN8O?myu6w4^D41Z{TVX0VNS`oU
zG=4MG^O2Rl>WvoJ4<dc*!)pG>H)ppKzwB((2g~n#kRQ$bAbu2r=|ZLwo0n2Uvu#YU
zkNKG&F~LMm@%O`-^QXPO&CY@4pMv*sJBQc8eH1K!13?o%G{+Gvf7_=VGLzsfe0T)@
zZJUZ;F^7=7H^I3G|4=`;qn<To_JLseB`Y85-u2W!MzSZVuTZ}aHd3S$p-TM)aQv$0
ziGAye_}l!qGkzwLKOOmFW7!x#ds+LuQK(?+v&f$Fp;c*?wgk;0YY?q}oBuXs7bE#I
z@auaM{LAr=p#Oek&++f|TRBsk2uyXdY{Rl^74pRS7ymCmdtK{)JjVYo?T3L~pUTvl
z^-ts<ZRS!hL4~~?LFew382?|iA8`EDNk3KmmAdj5piWbC#v}B@^?Z!~7ut6^erK!O
z{D=J72YFLw?YfmRz6vAF>=w9YV*ICR-;k1DbM-2?8D8SZlbdp>_=|HnQ#h0}Rn`~%
z3E=kL_nhUc`Cf6R6XJI|-y(l&g)>r`A#bFJe|sxy?TZII3eE!AI|cv6)Z}!0<IYj(
z!Y{p+-^}*{<{)_w=x!5g&5~Vz@qk_6Zy-Bgf*P>-x754@xojH#XVK}idg!iK+?ex0
z-=*oi{J5X???C*@MLS%))y802{=?`c@_V}L!dPuxuIE%=1a^b>z!DI@a@$Mb4lwL1
zN3vG-Y)L=Ncao8899{Vf_@H|NTRrIB2u=Xyo46g<{+a$4xtDiVri!LKJ7oRtz~6EH
zv)r})`@=Jj-D|+-3A~Qq)h{DA47%~p1+7AF{LYH+0oOk|>nZjFDY@mtDdy|46#RSa
zp5c8K%!Fqq&R;#~8KE#~<JceZ|3UpO&^joWi0>!xHgI?HH{_Pf`R)|I?A&K%^k#|9
zY@B~o{mw?idx*BU#Crj_6lmY8?=X8VPkj&g6`X|seCkg8dXHSUEVB;3VqYF_cz4tO
zllgirnDPc_7r+NV{Ck09uL3`SPk|3Q@qfaZu1ZE{JE<(&Xn13^^>%q3e%*gXki>r+
zxvX7V`LO=^J3<a2|A#)N;MaV9mB9aGWJmF9US+#acctxL%l{kw_iB8EyuZCe?zj4(
z9gp?`{BNuif1Lk2<Q~%-yXMw!E&n^n=nY41;ZE(4``sC&R-Sw=f#0pa?m*=Ty*I<y
zRfqiU{i*%A>&m$>uV{~V;`fQ6JZo*p-fnCii{jTC@I!D8JOwna9Q6?h&wl&;c?*4d
zqv*ao1cre8TJxK2^*-=h)~<`?CUo}rQ+hXe=YeOy$KWm?nG3-@C`I2+PkZMWII?04
ze!b^974iG_oo4F{?QH{3Y{hO)IZ-*b#BZw%wYYSb56ACxy{&?}mCZ3efbXXALfQWI
zlTMlv<F~$e`v&0B+cBIQ_uIDp9lj^Dw?h85Z16O>R=<hY$u~*9tmPlvJpWvG{<A#`
oV@qbCx@5+aFvM5}ncg<Wdl!xA{TeJJBg6P=4ACc4(H|5310!EgasU7T

literal 0
HcmV?d00001

diff --git a/public/index.html b/public/index.html
index 925455ca..75296d8c 100644
--- a/public/index.html
+++ b/public/index.html
@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="renderer" content="webkit">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <link rel="icon" href="<%= BASE_URL %>canteen2.ico">
     <title><%= webpackConfig.name %></title>
     <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
 	  <style>
diff --git a/src/assets/icons/svg/canteen.svg b/src/assets/icons/svg/canteen.svg
new file mode 100644
index 00000000..f430fc48
--- /dev/null
+++ b/src/assets/icons/svg/canteen.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1749116452711" class="icon" viewBox="0 0 1099 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4380" width="34.34375" height="32" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M468.715774 431.803817c-7.269107 5.192219-10.384438 13.688577-7.741127 21.712916l0.283212 1.038444c4.436987 13.688577 22.184936 19.069604 34.36305 10.384438 38.233613-27.188347 38.233613-62.306629 38.233613-81.187425V238.275652c0-19.44722 15.010233-32.569374 32.00295-41.160136 6.985895-3.304139 11.517286-10.290034 11.61169-18.031161 0-15.765465-18.031161-25.583479-32.852586-18.125565-28.132387 14.255001-55.320734 38.044805-55.320734 77.50567v145.570941c0.094404 15.671061-0.188808 33.041394-20.580068 47.768416zM369.969208 431.803817c-7.269107 5.192219-10.290034 13.688577-7.741127 21.712916l0.283212 1.038444c4.436987 13.688577 22.27934 19.069604 34.36305 10.384438 38.233613-27.188347 38.233613-62.306629 38.233613-81.187425V238.275652c0-19.44722 15.010233-32.569374 32.00295-41.160136 6.985895-3.304139 11.517286-10.290034 11.61169-18.031161 0-15.765465-18.125565-25.583479-32.852586-18.125565-28.132387 14.255001-55.320734 38.044805-55.320734 77.50567v145.570941c-0.188808 15.671061-0.188808 33.041394-20.580068 47.768416zM265.558403 454.743985c4.342583 13.688577 22.184936 19.164008 34.36305 10.384438 38.233613-27.188347 38.233613-62.306629 38.233613-81.093022V238.275652c0-19.44722 15.010233-32.569374 32.097354-41.160136 6.985895-3.304139 11.517286-10.290034 11.61169-18.031161 0-15.765465-18.125565-25.583479-32.852586-18.125565-28.226791 14.255001-55.320734 38.044805-55.320734 77.50567v145.570941c0 15.765465 0 33.324606-20.674472 48.051628-7.269107 5.192219-10.290034 13.688577-7.741127 21.712916l0.283212 0.94404zM164.26293 529.700747c0 126.123721 86.568452 233.649857 207.783166 274.149165v43.709044c0 10.006822 8.118743 18.125565 18.125564 18.125565h318.896654c10.006822 0 18.125565-8.118743 18.125564-18.125565v-43.425832c121.214714-40.593713 207.783166-148.119849 207.783166-274.149165v-13.688578c0-10.006822-8.118743-18.125565-18.125564-18.125564h-734.462985c-10.006822 0-18.125565 8.118743-18.125565 18.125564v13.405366zM906.844658 271.505854H620.894994c-15.671061 0-28.321195-12.650134-28.321195-28.321195s12.650134-28.321195 28.321195-28.321194h285.949664c15.671061 0 28.321195 12.650134 28.321194 28.321194s-12.650134 28.321195-28.321194 28.321195zM906.844658 384.601825H620.894994c-15.671061 0-28.321195-12.650134-28.321195-28.321194s12.650134-28.321195 28.321195-28.321195h285.949664c15.671061 0 28.321195 12.650134 28.321194 28.321195s-12.650134 28.321195-28.321194 28.321194zM221.754955 271.505854h-29.454042c-15.671061 0-28.321195-12.650134-28.321195-28.321195s12.650134-28.321195 28.321195-28.321194h29.454042c15.671061 0 28.321195 12.650134 28.321195 28.321194s-12.650134 28.321195-28.321195 28.321195zM221.754955 384.601825h-29.454042c-15.671061 0-28.321195-12.650134-28.321195-28.321194s12.650134-28.321195 28.321195-28.321195h29.454042c15.671061 0 28.321195 12.650134 28.321195 28.321195s-12.650134 28.321195-28.321195 28.321194z" p-id="4381" fill="#ffffff"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/canteen2.svg b/src/assets/icons/svg/canteen2.svg
new file mode 100644
index 00000000..c805094d
--- /dev/null
+++ b/src/assets/icons/svg/canteen2.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1749117486370" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4732" width="32" height="32" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M512 341.333333c-164.949333 0-298.666667 133.717333-298.666667 298.666667v42.666667H128v-42.666667c0-212.074667 171.925333-384 384-384s384 171.925333 384 384v42.666667h-85.333333v-42.666667c0-164.949333-133.717333-298.666667-298.666667-298.666667z" fill="#ffffff" p-id="4733"></path><path d="M504.576 470.869333l-38.784 17.792a214.549333 214.549333 0 0 0-71.146667 52.906667l-28.224 32-63.978666-56.469333 28.224-32a299.797333 299.797333 0 0 1 99.541333-73.984l38.762667-17.813334 35.605333 77.568zM85.333333 640h853.333334v85.333333H85.333333v-85.333333zM85.333333 789.333333h853.333334v85.333334H85.333333v-85.333334zM512 213.333333a42.666667 42.666667 0 0 0-42.666667 42.666667v42.666667h-85.333333v-42.666667a128 128 0 0 1 256 0v42.666667h-85.333333v-42.666667a42.666667 42.666667 0 0 0-42.666667-42.666667z" fill="#ffffff" p-id="4734"></path></svg>
\ No newline at end of file
diff --git a/src/assets/logo/logo.png b/src/assets/logo/logo.png
index 121ffe20b5bb79e0f1144d63c256330f384a1b56..e6dd4a0005bb69a0aed16670a61cc6ab04a63345 100644
GIT binary patch
delta 1686
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

literal 5561
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
A-~a#s

diff --git a/src/assets/logo/logo2.png b/src/assets/logo/logo2.png
new file mode 100644
index 0000000000000000000000000000000000000000..121ffe20b5bb79e0f1144d63c256330f384a1b56
GIT binary patch
literal 5561
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
A-~a#s

literal 0
HcmV?d00001

diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss
index abe5b631..39716824 100644
--- a/src/assets/styles/sidebar.scss
+++ b/src/assets/styles/sidebar.scss
@@ -1,10 +1,13 @@
 #app {
 
   .main-container {
-    height: 100%;
+    height: 100%; 
+    // width: calc(100%-240px);
+    width: -webkit-fill-available;
     transition: margin-left .28s;
     margin-left: $base-sidebar-width;
-    position: relative;
+    position: absolute;
+    top: 84px;
   }
 
   .sidebarHide {
@@ -16,10 +19,10 @@
     transition: width 0.28s;
     width: $base-sidebar-width !important;
     background-color: $base-menu-background;
-    height: 100%;
-    position: fixed;
+    height: auto;
+    position: absolute;
     font-size: 0px;
-    top: 0;
+    top: 84px;
     bottom: 0;
     left: 0;
     z-index: 1001;
diff --git a/src/assets/styles/variables.scss b/src/assets/styles/variables.scss
index 53c26e23..3808974f 100644
--- a/src/assets/styles/variables.scss
+++ b/src/assets/styles/variables.scss
@@ -9,17 +9,17 @@ $yellow:#FEC171;
 $panGreen: #30B08F;
 
 // 默认菜单主题风格
-$base-menu-color:#bfcbd9;
-$base-menu-color-active:#f4f4f5;
-$base-menu-background:#00594F;
+$base-menu-color:#000;
+$base-menu-color-active:#000;
+$base-menu-background:#fff;
 $base-logo-title-color: #ffffff;
 
 $base-menu-light-color:rgba(0,0,0,.70);
 $base-menu-light-background:#ffffff;
 $base-logo-light-title-color: #001529;
 
-$base-sub-menu-background:#02423b;
-$base-sub-menu-hover:#0a302c;
+$base-sub-menu-background:#fff;
+$base-sub-menu-hover:#ccc;
 
 // 自定义暗色菜单风格
 /**
diff --git a/src/components/TopNav/index.vue b/src/components/TopNav/index.vue
index 86a91c4c..08a4219b 100644
--- a/src/components/TopNav/index.vue
+++ b/src/components/TopNav/index.vue
@@ -2,13 +2,11 @@
   <el-menu
     :default-active="activeMenu"
     mode="horizontal"
-    @select="handleSelect"
+    @select="handleSelect" style="background: transparent;border-bottom: 0;"
   >
     <template v-for="(item, index) in topMenus">
-      <el-menu-item :style="{'--theme': theme}" :index="item.path" :key="index" v-if="index < visibleNumber">
-        <svg-icon
-        v-if="item.meta && item.meta.icon && item.meta.icon !== '#'"
-        :icon-class="item.meta.icon"/>
+      <el-menu-item :style="{'--theme': theme}" :index="item.path" :key="index" v-if="index < visibleNumber" style="background: transparent;">
+        <svg-icon v-if="item.meta && item.meta.icon && item.meta.icon !== '#'" :icon-class="item.meta.icon"/>
         {{ item.meta.title }}
       </el-menu-item>
     </template>
@@ -171,16 +169,18 @@ export default {
 <style lang="scss">
 .topmenu-container.el-menu--horizontal > .el-menu-item {
   float: left;
-  height: 50px !important;
-  line-height: 50px !important;
-  color: #999093 !important;
+  height: 80px !important;
+  line-height: 80px !important;
+  color: #FFF !important;
+  font-size: 22px;
   padding: 0 5px !important;
   margin: 0 10px !important;
 }
 
 .topmenu-container.el-menu--horizontal > .el-menu-item.is-active, .el-menu--horizontal > .el-submenu.is-active .el-submenu__title {
-  border-bottom: 2px solid #{'var(--theme)'} !important;
-  color: #303133;
+  border-bottom: 0!important;
+  background-color: #4C9A95!important;
+  // color: #303133;
 }
 
 /* submenu item */
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 80e60b11..017206f0 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -1,15 +1,21 @@
 <template>
   <div class="navbar">
-    <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
-
-    <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>
+    <!-- <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" /> -->
+    <!-- <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/> -->
+    <div style="position: absolute;left: 0;top: 20px;width: 15%;">
+      <router-link key="collapse" class="sidebar-logo-link" to="/">
+        <div style="height: 40px;width: 40px;background: #fff;border-radius: 50%;margin-right: 20px;display: flex;align-items: center;justify-content: center;">
+          <img :src="logo" class="sidebar-logo" />
+        </div>
+        <h1 class="sidebar-title">{{ title }} </h1>
+      </router-link>
+    </div> 
     <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
 
     <div class="right-menu">
       <template v-if="device!=='mobile'">
         <search id="header-search" class="right-menu-item" />
-
-
+ 
 
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
 
@@ -50,7 +56,7 @@ import SizeSelect from '@/components/SizeSelect'
 import Search from '@/components/HeaderSearch'
 import bonusGit from '@/components/bonus/Git'
 import bonusDoc from '@/components/bonus/Doc'
-
+import logoImg from '@/assets/logo/logo.png'
 export default {
   components: {
     Breadcrumb,
@@ -85,6 +91,12 @@ export default {
       }
     }
   },
+  data() {
+    return {
+      title: process.env.VUE_APP_TITLE,
+      logo: logoImg
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('app/toggleSideBar')
@@ -106,10 +118,10 @@ export default {
 
 <style lang="scss" scoped>
 .navbar {
-  height: 50px;
+  height: 84px;
   overflow: hidden;
   position: relative;
-  background: #fff;
+  background: #026559;
   box-shadow: 0 1px 4px rgba(0,21,41,.08);
 
   .hamburger-container {
@@ -131,7 +143,8 @@ export default {
 
   .topmenu-container {
     position: absolute;
-    left: 50px;
+    left: 15%;
+    top: 0px;
   }
 
   .errLog-container {
@@ -142,7 +155,7 @@ export default {
   .right-menu {
     float: right;
     height: 100%;
-    line-height: 50px;
+    line-height: 80px;
 
     &:focus {
       outline: none;
@@ -153,7 +166,7 @@ export default {
       padding: 0 8px;
       height: 100%;
       font-size: 18px;
-      color: #5a5e66;
+      color: #fff;
       vertical-align: text-bottom;
 
       &.hover-effect {
@@ -191,4 +204,29 @@ export default {
     }
   }
 }
+
+.sidebar-logo-link {
+    height: 100%;
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    .sidebar-logo {
+      width: 32px;
+      height: 32px;
+      vertical-align: middle; 
+    }
+
+    .sidebar-title {
+      display: inline-block;
+      margin: 0;
+      color: #fff;
+      font-weight: 600;
+      line-height: 50px;
+      font-size: 24px;
+      font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
+      vertical-align: middle;
+    }
+  }
 </style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 96585a5b..5ece9062 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -242,8 +242,8 @@ export default {
   height: 34px;
   width: 100%;
   background: #fff;
-  border-bottom: 1px solid #d8dce5;
-  box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
+  // border-bottom: 1px solid #d8dce5;
+  // box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
   .tags-view-wrapper {
     .tags-view-item {
       display: inline-block;
diff --git a/src/layout/index.vue b/src/layout/index.vue
index eced6d6e..353ae377 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -1,11 +1,12 @@
 <template>
   <div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}">
     <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
+    <navbar/>
     <sidebar v-if="!sidebar.hide" class="sidebar-container"/>
     <div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide}" class="main-container">
-      <div :class="{'fixed-header':fixedHeader}">
-        <navbar/>
-        <tags-view v-if="needTagsView"/>
+      <div :class="{'fixed-header':fixedHeader}" style="display: flex;border-bottom: 1px solid #d8dce5;box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);align-items: center;">
+        <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" style="width: 2%;"/>
+        <tags-view v-if="needTagsView" style="width: 98%;"/>
       </div>
       <app-main/>
       <right-panel>
@@ -44,7 +45,8 @@ import { validateNewPassword } from '@/utils/validate'
 import { updateUserPwd, checkPasswordStatus } from '@/api/system/user'
 import { handleNoWarningLog } from '@/api/system/log'
 import {MessageBox} from "element-ui";
-
+import { mapGetters } from 'vuex'
+import Hamburger from '@/components/Hamburger'
 export default {
   name: 'Layout',
   data() {
@@ -89,11 +91,15 @@ export default {
     Navbar,
     RightPanel,
     Settings,
+    Hamburger,
     Sidebar,
     TagsView
   },
   mixins: [ResizeMixin],
   computed: {
+    ...mapGetters([
+      'sidebar'
+    ]),
     ...mapState({
       theme: state => state.settings.theme,
       sideTheme: state => state.settings.sideTheme,
@@ -123,6 +129,9 @@ export default {
     this.handleNoWarningLog()
   },
   methods: {
+    toggleSideBar() {
+      this.$store.dispatch('app/toggleSideBar')
+    },
     checkPasswordStatus() {
       checkPasswordStatus().then(response => {
         if (response.code === 200) {
@@ -311,4 +320,17 @@ export default {
 .mobile .fixed-header {
   width: 100%;
 }
+
+.hamburger-container {
+    line-height: 46px;
+    height: 100%;
+    float: left;
+    cursor: pointer;
+    transition: background .3s;
+    -webkit-tap-highlight-color:transparent;
+
+    &:hover {
+      background: rgba(0, 0, 0, .025)
+    }
+  }
 </style>
diff --git a/src/router/index.js b/src/router/index.js
index 757e5ec7..0e699369 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -64,15 +64,15 @@ export const constantRoutes = [
   {
     path: '',
     component: Layout,
-    redirect: 'index',
-    children: [
-      {
-        path: 'index',
-        component: () => import('@/views/index_v1'),
-        name: 'Index',
-        meta: { title: '首页', icon: 'dashboard', affix: true }
-      }
-    ]
+    redirect: '/canteen/index',
+    // children: [
+    //   {
+    //     path: 'index',
+    //     component: () => import('@/views/index_v1'),
+    //     name: 'Index',
+    //     meta: { title: '首页', icon: 'dashboard', affix: true }
+    //   }
+    // ]
   },
   {
     path: '/user',
diff --git a/src/settings.js b/src/settings.js
index 6a0b09f4..53537c7d 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -12,7 +12,7 @@ module.exports = {
   /**
    * 是否显示顶部导航
    */
-  topNav: false,
+  topNav: true,
 
   /**
    * 是否显示 tagsView
@@ -27,7 +27,7 @@ module.exports = {
   /**
    * 是否显示logo
    */
-  sidebarLogo: true,
+  sidebarLogo: false,
 
   /**
    * 是否显示动态标题