Browse Source

:bug: Fixing a bug.fix avatar

lishangbu 6 years ago
parent
commit
4a77abe58e
4 changed files with 15 additions and 13 deletions
  1. 5 3
      src/page/index/top/index.vue
  2. 2 1
      src/router/avue-router.js
  3. 2 3
      src/util/util.js
  4. 6 6
      src/views/admin/user/info.vue

+ 5 - 3
src/page/index/top/index.vue

@@ -63,7 +63,7 @@
       <el-tooltip effect="dark"
                   content="用户头像"
                   placement="bottom">
-        <img class="top-bar__img"
+        <img id="thumbnail" class="top-bar__img"
              :src="userInfo.avatar">
       </el-tooltip>
       <el-dropdown>
@@ -88,7 +88,7 @@
 </template>
 <script>
 import { mapGetters, mapState } from "vuex";
-import { fullscreenToggel, listenfullscreen } from "@/util/util";
+import { fullscreenToggel, listenfullscreen,handleImg } from "@/util/util";
 import topLock from "./top-lock";
 import topMenu from "./top-menu";
 import topSearch from "./top-search";
@@ -111,7 +111,9 @@ export default {
     return {};
   },
   filters: {},
-  created() {},
+  created() {
+    handleImg(this.userInfo.avatar, 'thumbnail');
+  },
   mounted() {
     listenfullscreen(this.setScreen);
   },

+ 2 - 1
src/router/avue-router.js

@@ -16,12 +16,13 @@ RouterPlugin.install = function (router, store) {
   this.$router.$avueRouter = {
     // 全局配置
     $website: this.$store.getters.website,
+    $defaultTitle: 'PigX微服务快速开发框架',
     routerList: [],
     group: '',
     safe: this,
     // 设置标题
     setTitle: function (title) {
-      title = title ? `${title}——PigX微服务快速开发框架` : 'PigX微服务快速开发框架'
+      title = title ? `${title}——${this.$defaultTitle}` : this.$defaultTitle;
       document.title = title
     },
     closeTag: (value) => {

+ 2 - 3
src/util/util.js

@@ -165,8 +165,7 @@ export const listenfullscreen = (callback) => {
  * 浏览器判断是否全屏
  */
 export const fullscreenEnable = () => {
-  var isFullscreen = document.isFullScreen || document.mozIsFullScreen || document.webkitIsFullScreen
-  return isFullscreen;
+  return document.isFullScreen || document.mozIsFullScreen || document.webkitIsFullScreen
 }
 
 /**
@@ -312,7 +311,7 @@ export const openWindow = (url, title, w, h) => {
  * @returns {PromiseLike<T | never> | Promise<T | never>}
  */
 export function handleImg(fileName, id) {
-  return request({
+  return validatenull(fileName)?null: request({
     url: '/admin/file/' + fileName,
     method: 'get',
     responseType: 'blob'

+ 6 - 6
src/views/admin/user/info.vue

@@ -244,12 +244,12 @@
   }
 
   .avatar-uploader-icon {
-    font-size: 28px;
-    color: #8c939d;
-    width: 178px;
-    height: 178px;
-    line-height: 178px;
-    text-align: center;
+    font-size: 28px!important;
+    color: #8c939d!important;
+    width: 178px!important;
+    height: 178px!important;
+    line-height: 178px!important;
+    text-align: center!important;
   }
 
   .avatar {