up

src/components/LxHeader/index.vue

@@ -40,9 +40,9 @@ export default {
     // padding-top: 10px;
     font-weight: bold;
     font-size: 15px;
-    color: #122583;
+    color: #b3241d;
     white-space: nowrap;
-    border-bottom: 2px solid #122583;
+    border-bottom: 2px solid #b3241d;
     > span {
       position: relative;
       top: 2px;

src/layout/components/Navbar.vue

@@ -7,7 +7,7 @@
     <div class="right-menu">
       <el-dropdown class="avatar-container" trigger="click">
         <div class="avatar-wrapper">
-          <img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">
+          <img src="../../assets/face.jpg" class="user-avatar">
           <i class="el-icon-caret-bottom" />
         </div>
         <el-dropdown-menu slot="dropdown" class="user-dropdown">

src/layout/components/Sidebar/Item.vue

@@ -20,11 +20,11 @@ export default {
       if (icon.includes('el-icon')) {
         vnodes.push(<i class={[icon, 'sub-el-icon']} />)
       }
-      else if(icon.includes("Icon")){
+      else if(icon.includes("viewicon")){
           let _icon=icon.split("/")[1];
           vnodes.push(<Icon type={_icon} class='sub-el-icon' size="18" />)
       }
-      else if(icon.includes("MeIcon")){
+      else if(icon.includes("iconfont")){
           let _icon=icon.split("/")[1];
           vnodes.push(<Icon custom={[_icon, 'iconfont','sub-el-icon']} size="18" />)
       }

src/layout/components/Sidebar/Logo.vue

@@ -2,11 +2,11 @@
   <div class="sidebar-logo-container" :class="{'collapse':collapse}">
     <transition name="sidebarLogoFade">
       <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
-        <img v-if="logo" src="../../../assets/logo-mini-blue.png?v=1" class="sidebar-logo">
+        <img v-if="logo" src="../../../assets/logo-mini.png?v=1" class="sidebar-logo">
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
-        <img v-if="logo" src="../../../assets/logo-mini-blue.png" class="sidebar-logo"> <img src="/logo-blue.png?v=1"
+        <img v-if="logo" src="../../../assets/logo-mini.png" class="sidebar-logo">
-          class="sidebar-name-logo" />
+        <img src="../../../assets/logo.png?v=1" class="sidebar-name-logo" />
       </router-link>
     </transition>
   </div>
@@ -23,7 +23,7 @@
     },
     data() {
       return {
-        title: '智能工具箱管理平台',
+        title: '',
         logo: 'https://wpimg.wallstcn.com/69a1c46c-eb1c-4b46-8bd4-e9e686ef5251.png'
       }
     }
@@ -36,7 +36,7 @@
   }
   .sidebar-name-logo {
     width: 120px;
-    height: 38px;
+    height: 20px;
   }
 
   .sidebarLogoFade-enter,

src/styles/element-variables.scss

@@ -1,5 +1,5 @@
 /* 改变主题色变量 */
-$--color-primary: #122583;
+$--color-primary: #b3241d;
 
 /* 改变 icon 字体路径变量，必需 */
 $--font-path: '~element-ui/lib/theme-chalk/fonts';

src/styles/sidebar.scss

@@ -18,7 +18,7 @@
     bottom: 0;
     left: 0;
     z-index: 1001;
-    overflow: hidden;
+    overflow: visible;
 
     // reset element-ui css
     .horizontal-collapse-transition {
@@ -87,7 +87,7 @@
        //border-right: 5px solid $subMenuActiveText !important;
     }
         .is-active>.el-submenu__title {
-          color: $subMenuActiveText !important;
+          // color: $subMenuActiveText !important;
         }
 
 

src/styles/variables copy.scss

@@ -1,25 +0,0 @@
-// sidebar
-$menuText:#bfcbd9;
-$menuActiveText:#409EFF;
-$subMenuActiveText:#f4f4f5; //https://github.com/ElemeFE/element/issues/12951
-
-$menuBg:#304156;
-$menuHover:#263445;
-
-$subMenuBg:#1f2d3d;
-$subMenuHover:#001528;
-
-$sideBarWidth: 210px;
-
-// the :export directive is the magic sauce for webpack
-// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
-:export {
-  menuText: $menuText;
-  menuActiveText: $menuActiveText;
-  subMenuActiveText: $subMenuActiveText;
-  menuBg: $menuBg;
-  menuHover: $menuHover;
-  subMenuBg: $subMenuBg;
-  subMenuHover: $subMenuHover;
-  sideBarWidth: $sideBarWidth;
-}

src/styles/variables.scss

@@ -1,19 +1,19 @@
 // sidebar
 $menuText:#606266;
-$menuActiveText:#122583;
+$menuActiveText:#ffffff;
-$subMenuActiveText:#122583; //https://github.com/ElemeFE/element/issues/12951
+$subMenuActiveText:#ffffff; //https://github.com/ElemeFE/element/issues/12951
 
 $menuBg:#ffffff;//#304156
-$menuHover:#e0f2ff;
+$menuHover:#d96d68;
-$menuActiveBg:#1ea946;
+$menuActiveBg:#b3241d;
 
 
 $subMenuBg:#ffffff;//#1f2d3d
-$subMenuHover:#edf6ff;
+$subMenuHover:#d96d68;
-$submenuActiveBg:#1ea946;
+$submenuActiveBg:#b3241d;
 
 $sideBarWidth: 210px;
-$primaryColor: #122583;
+$primaryColor: #b3241d;
 // the :export directive is the magic sauce for webpack
 // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
 :export {

src/styles/viewui-mine.less

@@ -1,4 +1,4 @@
 @import '~view-design/src/styles/index.less';
 
 // Here are the variables to cover, such as:
-@primary-color: #122583;
+@primary-color: #b3241d;