From 204d2a822b78caac40fa7bb394910a21aa0b96c2 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 24 七月 2024 15:43:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/NormalHeader/index.vue | 2 +-
public/static/icons/touxiang.png | 0
src/views/personal-center/index.vue | 2 +-
src/views/home/components/user-panel/index.vue | 2 +-
4 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/public/static/icons/touxiang.png b/public/static/icons/touxiang.png
new file mode 100644
index 0000000..927f57c
--- /dev/null
+++ b/public/static/icons/touxiang.png
Binary files differ
diff --git a/src/components/NormalHeader/index.vue b/src/components/NormalHeader/index.vue
index dd22149..53301a0 100644
--- a/src/components/NormalHeader/index.vue
+++ b/src/components/NormalHeader/index.vue
@@ -10,7 +10,7 @@
<div class="user-container flex items-center">
<div class="avatar-container w-12 h-12 rounded-full overflow-hidden mr-3">
<div class="avatar-content" v-if="userInfo.imagePath">
- <img :src="'/api/files/'+userInfo.imagePath" class="avatar-img" alt="">
+ <img :src="userInfo.imagePath?'api/files/' + userInfo.imagePath:'/static/icons/touxiang.png'" class="avatar-img" alt="">
</div>
<div class="avatar-content" :style="{ backgroundColor: getColor }">
<div class="name text-xl font-bold text-white">{{ getFirstName }}</div>
diff --git a/src/views/home/components/user-panel/index.vue b/src/views/home/components/user-panel/index.vue
index ed05489..73a8f24 100644
--- a/src/views/home/components/user-panel/index.vue
+++ b/src/views/home/components/user-panel/index.vue
@@ -9,7 +9,7 @@
@click="stateClick()"
>
<div class="avatar-content" v-if="userInfo.imagePath">
- <img :src="'/api/files/'+userInfo.imagePath" class="avatar-img" alt="" />
+ <img :src="userInfo.imagePath?'api/files/' + userInfo.imagePath:'/static/icons/touxiang.png'" class="avatar-img" alt="" />
</div>
<div
class="avatar-content"
diff --git a/src/views/personal-center/index.vue b/src/views/personal-center/index.vue
index d601d38..b50c891 100644
--- a/src/views/personal-center/index.vue
+++ b/src/views/personal-center/index.vue
@@ -27,7 +27,7 @@
class="img"
id="headPortrait"
@click="uploadImage"
- :src="'api/files/' + userData.imagePath"
+ :src="userData.imagePath?'api/files/' + userData.imagePath:'/static/icons/touxiang.png'"
/>
<span>{{ userData.userName }}</span>
</div>
--
Gitblit v1.8.0