From 4ef86d8a1f494caa1e136ff78f9ea258d01164b1 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期四, 16 十月 2025 09:28:44 +0800
Subject: [PATCH] Merge branch 'master' into dev-1.1.2
---
packages/components/src/Card/TaskCard.vue | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/packages/components/src/Card/TaskCard.vue b/packages/components/src/Card/TaskCard.vue
index 254b6c5..4f071a2 100644
--- a/packages/components/src/Card/TaskCard.vue
+++ b/packages/components/src/Card/TaskCard.vue
@@ -4,6 +4,7 @@
<div class="task-card-title">{{ name }}</div>
<slot name="title-right">
<TaskPrice
+ v-if="releaseStatus !== EnumTaskReleaseStatus.Stopped"
:value="toThousand(serviceFee ?? 0)"
:unit="BillingMethodEnumUnit[billingMethod]"
/>
@@ -25,9 +26,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">
@@ -37,7 +36,11 @@
</div>
<div class="task-card-actions" v-if="showActions">
<slot name="actions">
- <nut-button v-if="releaseStatus === EnumTaskReleaseStatus.InProcess" type="primary"
+ <nut-button
+ v-if="releaseStatus === EnumTaskReleaseStatus.InProcess"
+ type="primary"
+ @click="emit('apply', props.id)"
+ :disabled="!!hireStatus"
>鎶ュ悕</nut-button
>
</slot>
@@ -60,6 +63,7 @@
EnumUserGenderText,
EnumSettlementCycleText,
BillingMethodEnumUnit,
+ EnumTaskUserHireStatus,
} from '@12333/constants';
import TaskPrice from './TaskPrice.vue';
import { CommonTaskCardProps } from './card';
@@ -116,6 +120,7 @@
recommendStatus?: EnumTaskRecommendStatus;
/** 鍒涘缓鏃堕棿 */
createdTime?: string;
+ hireStatus?: EnumTaskUserHireStatus;
};
const props = withDefaults(defineProps<Props>(), {
--
Gitblit v1.9.1