From 3b2e941a83ad49d3167df864a5a06a81ef944470 Mon Sep 17 00:00:00 2001
From: zhangchen <1652267879@qq.com>
Date: 星期三, 24 九月 2025 23:55:45 +0800
Subject: [PATCH] Merge branch 'ID2130-未签到页面优化' into test
---
src/views/mobile/bedsideAuxiliaryScreen/components/Header.vue | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/views/mobile/bedsideAuxiliaryScreen/components/Header.vue b/src/views/mobile/bedsideAuxiliaryScreen/components/Header.vue
index 97c8608..9a49eca 100644
--- a/src/views/mobile/bedsideAuxiliaryScreen/components/Header.vue
+++ b/src/views/mobile/bedsideAuxiliaryScreen/components/Header.vue
@@ -65,7 +65,7 @@
alt=""
@click="openSettingDeviceDialog"
/>
- <img v-if="userInfo?.code" :src="generateCircularAvatar(userInfo.userName)" class="btn-img" alt="" @click="openLoginDialog" />
+ <img v-if="userInfo?.code" :src="userInfo?.userAvatar" class="btn-img user-avatar" alt="" @click="openLoginDialog" />
<img v-else :src="userImg" class="btn-img" alt="" @click="openLoginDialog" />
</div>
</div>
@@ -167,7 +167,10 @@
const userInfo = computed(() => {
- return bedsideAuxiliaryScreenStore.userInfo;
+ if (!bedsideAuxiliaryScreenStore.userInfo) return null
+ return Object.assign({}, bedsideAuxiliaryScreenStore.userInfo, {
+ userAvatar: bedsideAuxiliaryScreenStore.userInfo?.userAvatar ? bedsideAuxiliaryScreenStore.userInfo?.userAvatar : generateCircularAvatar(bedsideAuxiliaryScreenStore.userInfo?.userName)
+ });
});
watch(
@@ -253,6 +256,7 @@
};
function generateCircularAvatar(name: string, size = 100): string {
+ console.log('name: ', name)
const canvas = document.createElement('canvas');
canvas.width = size;
canvas.height = size;
@@ -310,6 +314,11 @@
height: 10px;
object-fit: contain;
cursor: pointer;
+ &.user-avatar {
+ width: 10px;
+ border-radius: 50%;
+ overflow: hidden;
+ }
&:not(:first-child) {
margin-left: 9px;
}
--
Gitblit v1.8.0