dct 1 rok pred
rodič
commit
be7ea9010e

+ 2 - 2
.env

@@ -1,3 +1,3 @@
 VUE_APP_PROJECT=${APP_PROJECT}
-VUE_APP_PROJECT_NAME=${APP_PROJECT_NAME}
-VUE_APP_LOGO=${APP_LOGO}
+VUE_APP_PROJECT_NAME=多巴胺科技
+VUE_APP_LOGO=duobaan

BIN
build/duobaan/128x128.png


BIN
build/duobaan/16x16.png


BIN
build/duobaan/24x24.png


BIN
build/duobaan/256x256.png


BIN
build/duobaan/32x32.png


BIN
build/duobaan/512x512.png


BIN
build/icons/1024x1024.png


BIN
build/duobaan/icon.ico


BIN
build/icons/128x128.png


BIN
build/icons/16x16.png


BIN
build/icons/24x24.png


BIN
build/icons/256x256.png


BIN
build/icons/32x32.png


BIN
build/icons/48x48.png


BIN
build/icons/512x512.png


BIN
build/icons/64x64.png


BIN
build/icons/icon.ico


BIN
src/assets/imgs/duobaan-logo.png


BIN
src/assets/imgs/duobaan.png


BIN
src/assets/imgs/logo.png


+ 63 - 15
src/components/Layout/components/Navbar.vue

@@ -10,6 +10,11 @@
             class="logo"
           >
         </div>
+        <div
+          v-if="sidebar.opened"
+          class="app-name">
+          {{ appName }}
+        </div>
       </div>
       <hamburger
         class="hamburger-container"
@@ -133,6 +138,7 @@ export default {
   },
   data () {
     return {
+      appName: this.$localStore.get('appName') || process.env.VUE_APP_PROJECT_NAME,
       demoIndex: 0,
       visible: true,
       version: app.getVersion()
@@ -205,13 +211,23 @@ export default {
       .logo-container {
         border-radius: 50%;
         height: 35px;
+        width: 35px;
         background: #fff;
         border-radius: 50%;
         text-align: center;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+
         img {
           height: 25px;
+          width: 30px;
         }
       }
+
+      .app-name {
+        margin-left: 15px;
+      }
     }
   }
 
@@ -229,60 +245,92 @@ export default {
       color: #fff;
     }
   }
+
   .hamburger-container {
     float: left;
     height: 50px;
     padding: 0 10px;
     line-height: 58px;
   }
+
   .breadcrumb-container {
     float: left;
   }
+
   .errLog-container {
-    display: inline-block;  vertical-align: top;
+    display: inline-block;
+    vertical-align: top;
   }
+
   .right-menu {
     display: flex;
     float: right;
     height: 50px;
     align-items: center;
     font-size: 13px;
+
     a {
       color: #fff;
       display: inline-block;
       padding: 0 10px;
-      &:hover{
+
+      &:hover {
         color: #7991AD;
         text-decoration: none;
       }
     }
-    li{
-      border-right:1px solid $blue;
-      &:last-child{
+
+    li {
+      border-right: 1px solid $blue;
+
+      &:last-child {
         border: none;
       }
     }
+
     &:focus {
       outline: none;
     }
   }
 }
 
-.appVersion{
-  display: flex; justify-content: center; align-items: center; position: absolute; right: 10px; bottom: 0px;
-  span{
-    color: $activeblue; font-size: 12px;
+.appVersion {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  position: absolute;
+  right: 10px;
+  bottom: 0px;
+
+  span {
+    color: $activeblue;
+    font-size: 12px;
   }
-  a{
-     cursor: pointer;display: flex; align-items: center; font-size: 12px;color: rgb(255, 0, 0);
+
+  a {
+    cursor: pointer;
+    display: flex;
+    align-items: center;
+    font-size: 12px;
+    color: rgb(255, 0, 0);
   }
-  i{
-    display: inline-block; width: 8px;height: 8px;background: rgb(230, 36, 36); border-radius: 50%; margin-right: 5px;
+
+  i {
+    display: inline-block;
+    width: 8px;
+    height: 8px;
+    background: rgb(230, 36, 36);
+    border-radius: 50%;
+    margin-right: 5px;
   }
 }
 
-.termId{
-position: absolute; right: 120px; bottom: 0px; color: $activeblue;font-size: 12px;
+.termId {
+  position: absolute;
+  right: 120px;
+  bottom: 0px;
+  color: $activeblue;
+  font-size: 12px;
 }
 </style>
 

+ 2 - 2
src/pages/login/index.vue

@@ -348,8 +348,8 @@ $light_gray: #eee;
           align-items: center;
 
           .logo {
-            height: 70px;
-            margin-bottom: 30px;
+            height: 90px;
+            margin-bottom: 20px;
           }
 
           h1 {