From 6d8cde914540d6e2ecbd0fafda94be48af89c4da Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期一, 01 十二月 2025 16:14:32 +0800
Subject: [PATCH] Merge branch 'dev-1.3.0.3' into dev-1.3.0.4
---
packages/components/src/Card/TaskCard.vue | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/packages/components/src/Card/TaskCard.vue b/packages/components/src/Card/TaskCard.vue
index e45fad3..cf9cc09 100644
--- a/packages/components/src/Card/TaskCard.vue
+++ b/packages/components/src/Card/TaskCard.vue
@@ -1,11 +1,13 @@
<template>
- <div class="task-card-wrapper">
+ <div class="task-card-wrapper" :class="{ 'un-read': !isRead }">
<div class="task-card-title-wrapper">
<div class="task-card-title">{{ name }}</div>
<slot name="title-right">
<TaskPrice
+ v-if="releaseStatus !== EnumTaskReleaseStatus.Stopped"
:value="toThousand(serviceFee ?? 0)"
:unit="BillingMethodEnumUnit[billingMethod]"
+ :billingMethod="billingMethod"
/>
</slot>
</div>
@@ -25,9 +27,7 @@
</div>
</div>
<div class="task-card-time">
- {{ dayjs(beginTime).format('YYYY骞碝M鏈圖D鏃�') }}鑷硔{
- dayjs(endTime).format('YYYY骞碝M鏈圖D鏃�')
- }}
+ {{ dayjs(beginTime).format('YYYY骞碝M鏈圖鏃�') }}鑷硔{ dayjs(endTime).format('YYYY骞碝M鏈圖鏃�') }}
</div>
</slot>
<div class="task-card-footer">
@@ -41,6 +41,7 @@
v-if="releaseStatus === EnumTaskReleaseStatus.InProcess"
type="primary"
@click="emit('apply', props.id)"
+ :disabled="!!hireStatus"
>鎶ュ悕</nut-button
>
</slot>
@@ -63,6 +64,7 @@
EnumUserGenderText,
EnumSettlementCycleText,
BillingMethodEnumUnit,
+ EnumTaskUserHireStatus,
} from '@12333/constants';
import TaskPrice from './TaskPrice.vue';
import { CommonTaskCardProps } from './card';
@@ -119,10 +121,15 @@
recommendStatus?: EnumTaskRecommendStatus;
/** 鍒涘缓鏃堕棿 */
createdTime?: string;
+ hireStatus?: EnumTaskUserHireStatus;
+
+ isRead?: boolean;
};
const props = withDefaults(defineProps<Props>(), {
showActions: true,
+
+ isRead: true,
});
const emit = defineEmits<{
@@ -139,6 +146,21 @@
background-color: #fff;
border-radius: 12px;
+ &.un-read {
+ position: relative;
+
+ &::before {
+ content: '';
+ position: absolute;
+ width: 12px;
+ height: 12px;
+ border-radius: 50%;
+ background-color: red;
+ right: 18px;
+ top: 12px;
+ }
+ }
+
&:last-child {
margin-bottom: 0;
}
--
Gitblit v1.9.1