From 8a09f4c0ecc8e300b3e427343b87cfd520ddcd38 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 12 八月 2025 16:24:03 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue | 2 ++
packages/components/src/Card/TaskCard.vue | 5 ++++-
apps/cMiniApp/src/subpackages/mine/mineCollectTask/InnerPage.vue | 11 ++++++-----
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/apps/cMiniApp/src/subpackages/mine/mineCollectTask/InnerPage.vue b/apps/cMiniApp/src/subpackages/mine/mineCollectTask/InnerPage.vue
index c912d41..d9bad76 100644
--- a/apps/cMiniApp/src/subpackages/mine/mineCollectTask/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/mine/mineCollectTask/InnerPage.vue
@@ -9,6 +9,7 @@
>
<template #renderItem="{ item }">
<TaskCard
+ :id="item.id"
:name="item.name"
:address-name="item.addressName"
:begin-time="item.beginTime"
@@ -18,10 +19,10 @@
:billing-method="item.billingMethod"
:settlement-cycle="item.settlementCycle"
:benefits="item.benefits"
+ :show-actions="true"
+ :release-status="item.releaseStatus"
+ @apply="goTaskDetail"
>
- <template #actions>
- <nut-button @click="goTaskDetail(item)" type="primary">鎶ュ悕</nut-button>
- </template>
</TaskCard>
</template>
</InfiniteLoading>
@@ -41,9 +42,9 @@
defaultQueryMenuState: {},
});
-function goTaskDetail(item: API.GetTaskInfosQueryResultItem) {
+function goTaskDetail(id: string) {
Taro.navigateTo({
- url: `${RouterPath.taskCheckDetail}?id=${item.id}`,
+ url: `${RouterPath.taskDetail}?id=${id}`,
});
}
diff --git a/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue b/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue
index 9631f42..da245b4 100644
--- a/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue
@@ -111,6 +111,7 @@
v-if="detail.releaseStatus === EnumTaskReleaseStatus.InProcess"
type="primary"
@click="handleApply"
+ :disabled="detail?.hireStatus === EnumTaskUserHireStatus.Wait"
>{{ `鎶ュ悕锛�${detail?.applyCount ?? 0}浜哄凡鎶ュ悕锛塦 }}</PageFooterBtn
>
<PageFooterBtn v-if="detail.releaseStatus === EnumTaskReleaseStatus.Stopped" color="#999999"
@@ -142,6 +143,7 @@
EnumSettlementCycleText,
BillingMethodEnumUnit,
EnumTaskReleaseStatus,
+ EnumTaskUserHireStatus,
} from '@12333/constants';
import { useAccessLogin } from '@/hooks';
diff --git a/packages/components/src/Card/TaskCard.vue b/packages/components/src/Card/TaskCard.vue
index 254b6c5..e45fad3 100644
--- a/packages/components/src/Card/TaskCard.vue
+++ b/packages/components/src/Card/TaskCard.vue
@@ -37,7 +37,10 @@
</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)"
>鎶ュ悕</nut-button
>
</slot>
--
Gitblit v1.9.1