Jelajahi Sumber

feat: 默认头像

wanggaokun 1 tahun lalu
induk
melakukan
976811b0a8

+ 5 - 2
src/layouts/components/Header/components/Avatar.vue

@@ -1,10 +1,10 @@
 <template>
   <el-dropdown trigger="click">
-    <div class="avatar" v-if="userStore.avatar.indexOf('undefined') === -1">
+    <div class="avatar" v-if="userStore.avatar.indexOf('undefined') === -1 && userStore.avatar">
       <img :src="userStore.avatar" />
     </div>
     <div class="avatar-dft" v-else>
-      <img src="@/assets/icons/svg/avatar-user.svg" alt="avatar" />
+      <img src="@/assets/images/defAva.png" alt="avatar" />
     </div>
     <template #dropdown>
       <el-dropdown-menu>
@@ -49,6 +49,7 @@ const logout = () => {
     ElMessage.success('退出登录成功!')
   })
 }
+console.log('userStore.avatar', userStore.avatar)
 </script>
 
 <style scoped lang="scss">
@@ -72,7 +73,9 @@ const logout = () => {
   img {
     width: 100%;
     height: 100%;
+    color: var(--color);
     filter: drop-shadow(var(--el-menu-active-color) 100px 0);
+    fill: currentColor;
     transform: translateX(-100px);
   }
 }

+ 2 - 2
src/stores/modules/user.ts

@@ -2,7 +2,7 @@ import { UserState } from '@/stores/interface'
 import piniaPersistConfig from '@/stores/helper/persist'
 import { getToken, setToken, removeToken } from '@/utils/token'
 import { loginApi, getInfoApi, logoutApi } from '@/api/modules/login'
-import defAva from '@/assets/images/defAva.png'
+// import defAva from '@/assets/images/defAva.png'
 import { LoginData } from '@/api/interface/login'
 export const useUserStore = defineStore('admin-user', {
   state: (): UserState => ({
@@ -37,7 +37,7 @@ export const useUserStore = defineStore('admin-user', {
             if (res.code === 200) {
               const data = res.data
               const user = data.user
-              const avatar = user.avatar == '' || user.avatar == null ? defAva : import.meta.env.VITE_APP_BASE_API + user.avatar
+              const avatar = user.avatar == '' || user.avatar == null ? null : import.meta.env.VITE_APP_BASE_API + user.avatar
               if (data.roles && data.roles.length > 0) {
                 // 验证返回的roles是否是一个非空数组
                 this.roles = data.roles