From df7c6af1c1cfd2e9bda249e381aecb5482120d14 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期三, 19 二月 2025 10:09:10 +0800 Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp --- packages/components/src/Card/TaskCard.vue | 37 +++++++++++++++++++++++-------------- 1 files changed, 23 insertions(+), 14 deletions(-) diff --git a/packages/components/src/Card/TaskCard.vue b/packages/components/src/Card/TaskCard.vue index 01186b3..27a75cb 100644 --- a/packages/components/src/Card/TaskCard.vue +++ b/packages/components/src/Card/TaskCard.vue @@ -2,22 +2,26 @@ <div class="task-card-wrapper"> <div class="task-card-title-wrapper"> <div class="task-card-title">瀹㈡埧鏈嶅姟鍛�</div> - <TaskPrice /> + <slot name="title-right"> + <TaskPrice :value="212" /> + </slot> </div> - <div class="task-card-welfare-list"> - <div class="task-card-welfare-list-item">鏃ョ粨</div> - <div class="task-card-welfare-list-item">鐢峰コ涓嶉檺</div> - <div class="task-card-welfare-list-item">鍖呬笁椁�</div> - </div> - <div class="task-card-time">涓婄彮鏃堕棿:07:00-15:30</div> + <slot> + <div class="task-card-welfare-list"> + <div class="task-card-welfare-list-item">鏃ョ粨</div> + <div class="task-card-welfare-list-item">鐢峰コ涓嶉檺</div> + <div class="task-card-welfare-list-item">鍖呬笁椁�</div> + </div> + <div class="task-card-time">涓婄彮鏃堕棿:07:00-15:30</div> + </slot> <div class="task-card-footer"> <div class="task-card-left"> <div class="task-card-footer-tag">H</div> <div class="task-card-footer-address">瀹佹尝闆疯开妫厭搴�</div> </div> - <div class="task-card-actions"> + <div class="task-card-actions" v-if="showActions"> <slot name="actions"> - <nut-button type="primary">鎶ュ悕</nut-button> + <nut-button type="primary" @click.stop="handleSign">鎶ュ悕</nut-button> </slot> </div> </div> @@ -26,16 +30,21 @@ <script setup lang="ts"> import TaskPrice from './TaskPrice.vue'; +import { CommonTaskCardProps } from './card'; defineOptions({ name: 'TaskCard', }); -type Props = { - title?: string; +type Props = CommonTaskCardProps & { + showActions?: boolean; }; -const props = withDefaults(defineProps<Props>(), {}); +const props = withDefaults(defineProps<Props>(), { + showActions: true, +}); + +function handleSign() {} </script> <style lang="scss"> @@ -82,7 +91,7 @@ .task-card-time { font-size: 24px; - color: boleGetCssVar('text-color', 'secondary'); + color: boleGetCssVar('text-color', 'regular'); line-height: 36px; margin-bottom: 6px; } @@ -111,7 +120,7 @@ .task-card-footer-address { font-size: 22px; - color: boleGetCssVar('text-color', 'secondary'); + color: boleGetCssVar('text-color', 'regular'); line-height: 36px; flex: 1; min-width: 0; -- Gitblit v1.9.1