Browse Source

fix: layout style

xiaoxian521 3 years ago
parent
commit
9e7d78fd80

BIN
src/assets/avatars.jpg


+ 1 - 1
src/layout/components/appMain.vue

@@ -75,7 +75,7 @@ const transitionMain = defineComponent({
       hideTabs && layout ? 'padding-top: 48px;' : '',
       !hideTabs && layout ? 'padding-top: 85px;' : '',
       hideTabs && !layout ? 'padding-top: 48px' : '',
-      !hideTabs && !layout ? 'padding-top: 98px;' : ''
+      !hideTabs && !layout ? 'padding-top: 85px;' : ''
     ]"
   >
     <router-view>

+ 4 - 5
src/layout/components/navbar.vue

@@ -1,17 +1,18 @@
 <script setup lang="ts">
 import { useI18n } from "vue-i18n";
 import { emitter } from "/@/utils/mitt";
+import Notice from "./notice/index.vue";
+import avatars from "/@/assets/avatars.jpg";
+import { transformI18n } from "/@/plugins/i18n";
 import Hamburger from "./sidebar/hamBurger.vue";
 import { useRouter, useRoute } from "vue-router";
 import { storageSession } from "/@/utils/storage";
 import Breadcrumb from "./sidebar/breadCrumb.vue";
-import Notice from "./notice/index.vue";
 import { useAppStoreHook } from "/@/store/modules/app";
 import { unref, watch, getCurrentInstance } from "vue";
 import { deviceDetection } from "/@/utils/deviceDetection";
 import screenfull from "../components/screenfull/index.vue";
 import globalization from "/@/assets/svg/globalization.svg";
-import { transformI18n } from "/@/plugins/i18n";
 
 const instance =
   getCurrentInstance().appContext.config.globalProperties.$storage;
@@ -106,9 +107,7 @@ function translationEn() {
       <!-- 退出登陆 -->
       <el-dropdown trigger="click">
         <span class="el-dropdown-link">
-          <img
-            src="https://avatars.githubusercontent.com/u/44761321?s=400&u=30907819abd29bb3779bc247910873e7c7f7c12f&v=4"
-          />
+          <img :src="avatars" />
           <p>{{ usename }}</p>
         </span>
         <template #dropdown>

+ 7 - 6
src/layout/components/sidebar/horizontal.vue

@@ -12,6 +12,7 @@ import { emitter } from "/@/utils/mitt";
 import Notice from "../notice/index.vue";
 import { templateRef } from "@vueuse/core";
 import SidebarItem from "./sidebarItem.vue";
+import avatars from "/@/assets/avatars.jpg";
 import { algorithm } from "/@/utils/algorithm";
 import screenfull from "../screenfull/index.vue";
 import { useRoute, useRouter } from "vue-router";
@@ -174,16 +175,15 @@ onMounted(() => {
       <!-- 退出登陆 -->
       <el-dropdown trigger="click">
         <span class="el-dropdown-link">
-          <img
-            src="https://avatars.githubusercontent.com/u/44761321?s=400&u=30907819abd29bb3779bc247910873e7c7f7c12f&v=4"
-          />
+          <img :src="avatars" />
           <p>{{ usename }}</p>
         </span>
         <template #dropdown>
           <el-dropdown-menu class="logout">
-            <el-dropdown-item icon="el-icon-switch-button" @click="logout">{{
-              $t("message.hsLoginOut")
-            }}</el-dropdown-item>
+            <el-dropdown-item @click="logout">
+              <i class="ri-logout-circle-r-line"></i
+              >{{ $t("message.hsLoginOut") }}</el-dropdown-item
+            >
           </el-dropdown-menu>
         </template>
       </el-dropdown>
@@ -225,6 +225,7 @@ onMounted(() => {
 
 .logout {
   .el-dropdown-menu__item {
+    display: inline-flex;
     padding: 0 18px !important;
   }
 

+ 2 - 5
src/views/welcome.vue

@@ -7,6 +7,7 @@ import {
   ReBar
 } from "/@/components/ReCharts/index";
 import { ref, computed } from "vue";
+import avatars from "/@/assets/avatars.jpg";
 
 const date: Date = new Date();
 let loading = ref<boolean>(true);
@@ -34,11 +35,7 @@ const openDepot = (): void => {
   <div class="welcome">
     <el-card class="top-content">
       <div class="left-mark">
-        <img
-          src="https://avatars.githubusercontent.com/u/44761321?s=400&u=30907819abd29bb3779bc247910873e7c7f7c12f&v=4"
-          title="直达仓库地址"
-          @click="openDepot"
-        />
+        <img :src="avatars" title="直达仓库地址" @click="openDepot" />
         <span>{{ greetings }}</span>
       </div>
     </el-card>