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/Card.vue | 46 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 42 insertions(+), 4 deletions(-)
diff --git a/src/views/mobile/bedsideAuxiliaryScreen/components/Card.vue b/src/views/mobile/bedsideAuxiliaryScreen/components/Card.vue
index 0eb434e..f7f3f13 100644
--- a/src/views/mobile/bedsideAuxiliaryScreen/components/Card.vue
+++ b/src/views/mobile/bedsideAuxiliaryScreen/components/Card.vue
@@ -3,14 +3,18 @@
class="bedside-auxiliary-screen-card"
:style="{
'--bg-color': props.backgroundColor,
- '--height': props.height + 'px',
}"
>
- <div class="card-header">
+ <div class="card-header" :class="props.headerClassName">
<img :src="props.icon" class="card-icon" alt="" srcset="" />
<span class="card-title">{{ props.title }}</span>
+ <span class="card-right-text" v-if="$slots.right">
+ <slot name="right" />
+ </span>
</div>
- <div class="card-main"></div>
+ <div class="card-main">
+ <slot />
+ </div>
</div>
</template>
@@ -20,20 +24,29 @@
title: string; // 标题
icon: string;
height?: number;
+ headerClassName?: string; // 头部类名
}
const props = defineProps<Props>();
</script>
<style lang="less" scoped>
+* {
+ box-sizing: border-box;
+}
.bedside-auxiliary-screen-card {
display: flex;
flex-direction: column;
- height: var(--height);
+ // height: 100%;
padding: 3px 4px;
border-radius: 2px;
background-color: var(--bg-color, #70a3dd);
+ overflow: hidden;
+ overflow-y: auto;
+ height: 100%;
.card-header {
+ position: relative;
+ flex: 0 0 6px;
display: flex;
align-items: center;
margin-bottom: 2px;
@@ -56,11 +69,36 @@
overflow: hidden;
text-overflow: ellipsis;
}
+ .card-right-text {
+ position: absolute;
+ right: 0;
+ top: 50%;
+ transform: translateY(-50%);
+ font-family: PingFangSC, PingFang SC;
+ font-weight: 500;
+ font-size: 4px;
+ color: #333333;
+ line-height: 5px;
+ text-align: right;
+ font-style: normal;
+ }
}
.card-main {
flex: 1;
+ overflow: hidden;
overflow-y: auto;
+ min-height: 0;
}
+ .card-main > * {
+ min-height: 0;
+ overflow: hidden;
+ }
+}
+:deep(.el-scrollbar__view) {
+ min-height: 0;
+ height: 100%;
+ overflow: hidden;
+ overflow-y: auto;
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0