用户头像http(s)链接支持

@@ -22,6 +22,7 @@
 // make search results more in line with expectations
 // make search results more in line with expectations
 import Fuse from 'fuse.js/dist/fuse.min.js'
 import Fuse from 'fuse.js/dist/fuse.min.js'
 import path from 'path'
 import path from 'path'
+import { isHttp } from '@/utils/validate'
 
 
 export default {
 export default {
   name: 'HeaderSearch',
   name: 'HeaderSearch',
@@ -72,7 +73,7 @@ export default {
     change(val) {
     change(val) {
       const path = val.path;
       const path = val.path;
       const query = val.query;
       const query = val.query;
-      if(this.ishttp(val.path)) {
+      if(isHttp(val.path)) {
         // http(s):// 路径新窗口打开
         // http(s):// 路径新窗口打开
         const pindex = path.indexOf("http");
         const pindex = path.indexOf("http");
         window.open(path.substr(pindex, path.length), "_blank");
         window.open(path.substr(pindex, path.length), "_blank");
@@ -115,7 +116,7 @@ export default {
         if (router.hidden) { continue }
         if (router.hidden) { continue }
 
 
         const data = {
         const data = {
-          path: !this.ishttp(router.path) ? path.resolve(basePath, router.path) : router.path,
+          path: !isHttp(router.path) ? path.resolve(basePath, router.path) : router.path,
           title: [...prefixTitle]
           title: [...prefixTitle]
         }
         }
 
 
@@ -149,9 +150,6 @@ export default {
       } else {
       } else {
         this.options = []
         this.options = []
       }
       }
-    },
-    ishttp(url) {
-      return url.indexOf('http://') !== -1 || url.indexOf('https://') !== -1
     }
     }
   }
   }
 }
 }

@@ -33,6 +33,7 @@
 
 
 <script>
 <script>
 import { constantRoutes } from "@/router";
 import { constantRoutes } from "@/router";
+import { isHttp } from "@/utils/validate";
 
 
 // 隐藏侧边栏路由
 // 隐藏侧边栏路由
 const hideList = ['/index', '/user/profile'];
 const hideList = ['/index', '/user/profile'];
@@ -78,7 +79,7 @@ export default {
             if(router.path === "/") {
             if(router.path === "/") {
               router.children[item].path = "/" + router.children[item].path;
               router.children[item].path = "/" + router.children[item].path;
             } else {
             } else {
-              if(!this.ishttp(router.children[item].path)) {
+              if(!isHttp(router.children[item].path)) {
                 router.children[item].path = router.path + "/" + router.children[item].path;
                 router.children[item].path = router.path + "/" + router.children[item].path;
               }
               }
             }
             }
@@ -126,7 +127,7 @@ export default {
     handleSelect(key, keyPath) {
     handleSelect(key, keyPath) {
       this.currentIndex = key;
       this.currentIndex = key;
       const route = this.routers.find(item => item.path === key);
       const route = this.routers.find(item => item.path === key);
-      if (this.ishttp(key)) {
+      if (isHttp(key)) {
         // http(s):// 路径新窗口打开
         // http(s):// 路径新窗口打开
         window.open(key, "_blank");
         window.open(key, "_blank");
       } else if (!route || !route.children) {
       } else if (!route || !route.children) {
@@ -160,9 +161,6 @@ export default {
       } else {
       } else {
         this.$store.dispatch('app/toggleSideBarHide', true);
         this.$store.dispatch('app/toggleSideBarHide', true);
       }
       }
-    },
-    ishttp(url) {
-      return url.indexOf('http://') !== -1 || url.indexOf('https://') !== -1
     }
     }
   },
   },
 };
 };

 import { login, logout, getInfo } from '@/api/login'
 import { login, logout, getInfo } from '@/api/login'
 import { getToken, setToken, removeToken } from '@/utils/auth'
 import { getToken, setToken, removeToken } from '@/utils/auth'
+import { isHttp, isEmpty } from "@/utils/validate"
+import defAva from '@/assets/images/profile.jpg'
 
 
 const user = {
 const user = {
   state: {
   state: {
@@ -55,7 +57,10 @@ const user = {
       return new Promise((resolve, reject) => {
       return new Promise((resolve, reject) => {
         getInfo().then(res => {
         getInfo().then(res => {
           const user = res.user
           const user = res.user
-          const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
+          let avatar = user.avatar || ""
+          if (!isHttp(avatar)) {
+            avatar = (isEmpty(avatar)) ? defAva : process.env.VUE_APP_BASE_API + avatar
+          }
           if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
           if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
             commit('SET_ROLES', res.roles)
             commit('SET_ROLES', res.roles)
             commit('SET_PERMISSIONS', res.permissions)
             commit('SET_PERMISSIONS', res.permissions)

 /**
 /**
+ * 判断value字符串是否为空 
+ * @param {string} value
+ * @returns {Boolean}
+ */
+export function isEmpty(value) {
+  if (value == null || value == "" || value == undefined || value == "undefined") {
+    return true;
+  }
+  return false;
+}
+
+/**
+ * 判断url是否是http或https 
+ * @param {string} url
+ * @returns {Boolean}
+ */
+export function isHttp(url) {
+  return url.indexOf('http://') !== -1 || url.indexOf('https://') !== -1
+}
+
+/**
+ * 判断path是否为外链
  * @param {string} path
  * @param {string} path
  * @returns {Boolean}
  * @returns {Boolean}
  */
  */