隐藏logo

jshERP-web/src/components/page/GlobalHeader.vue

@@ -196,7 +196,7 @@
 
       /* dark 样式 */
       &.dark {
-        color: #000000;
+        color: #ffffff;
         box-shadow: 0 0 4px rgba(0, 0, 0, 0.2);
         background-color: white !important;
       }

jshERP-web/src/components/page/GlobalLayout.vue

@@ -569,10 +569,10 @@
       height: 64px;
       position: relative;
       line-height: 64px;
-      padding-left: 24px;
+      padding-left: 10px;
       -webkit-transition: all .3s;
       transition: all .3s;
-      background: #002140;
+      background: #ffffff;
       overflow: hidden;
 
       img, h1 {
@@ -587,7 +587,7 @@
       h1 {
         color: #fff;
         font-size: 18px;
-        margin: 0 0 0 8px;
+        margin: 0 0 10px 8px;
         font-family: "Chinese Quote", -apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
         font-weight: 600;
       }

jshERP-web/src/components/tools/Logo.vue

@@ -1,12 +1,13 @@
 <template>
   <div class="logo">
-    <router-link :to="{name:'dashboard'}">
+    <h1 v-if="showTitle">{{ title }}</h1>
+<!--    <router-link :to="{name:'dashboard'}">-->
       <!-- update-begin- author:sunjianlei --- date:20190814 --- for: logo颜色根据主题颜色变化 -->
-      <img v-if="layoutMode === 'sidemenu'" src="~@/assets/logo.png" alt="logo">
+<!--      <img v-if="layoutMode === 'sidemenu'" src="~@/assets/logo.png" alt="logo">-->
-      <img v-else src="~@/assets/logo_top.png" alt="logo">
+<!--      <img v-else src="~@/assets/logo_top.png" alt="logo">-->
       <!-- update-begin- author:sunjianlei --- date:20190814 --- for: logo颜色根据主题颜色变化 -->
-      <h1 v-if="showTitle">{{ title }}</h1>
+
-    </router-link>
+<!--    </router-link>-->
   </div>
 </template>
 
@@ -37,17 +38,22 @@
   .sider {
     box-shadow: none !important;
     .logo {
+      color: #ffffff;
       height: @height !important;
       line-height: @height !important;
       box-shadow: none !important;
       transition: background 300ms;
-
+      h1 {
+        font-size: 24px;
+        color: #ffffff;
+      }
       a {
         color: white;
         &:hover {
           color: rgba(255, 255, 255, 0.8);
         }
       }
+
     }
 
     &.light .logo {