From e81a93e56fc382b3f4efc26425a4e894a12d5907 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期三, 13 八月 2025 09:54:08 +0800
Subject: [PATCH] feat: 接口对接
---
apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue | 85 +++++++++++++++++++++---------------------
apps/cMiniApp/src/subpackages/mine/mineSign/InnerPage.vue | 2
apps/cMiniApp/src/subpackages/mine/mineHire/InnerPage.vue | 2
3 files changed, 44 insertions(+), 45 deletions(-)
diff --git a/apps/cMiniApp/src/subpackages/mine/mineHire/InnerPage.vue b/apps/cMiniApp/src/subpackages/mine/mineHire/InnerPage.vue
index 69b284a..6404b11 100644
--- a/apps/cMiniApp/src/subpackages/mine/mineHire/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/mine/mineHire/InnerPage.vue
@@ -91,7 +91,7 @@
function goTaskDetail(item: API.GetPersonalHireTaskInfosQueryResultItem) {
Taro.navigateTo({
- url: `${RouterPath.taskDetail}?id=${item.id}`,
+ url: `${RouterPath.taskDetail}?id=${item.id}&from=mine`,
});
}
</script>
diff --git a/apps/cMiniApp/src/subpackages/mine/mineSign/InnerPage.vue b/apps/cMiniApp/src/subpackages/mine/mineSign/InnerPage.vue
index 0e86abd..f0a47a1 100644
--- a/apps/cMiniApp/src/subpackages/mine/mineSign/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/mine/mineSign/InnerPage.vue
@@ -94,7 +94,7 @@
function goTaskDetail(item: API.GetPersonalApplyTaskInfosQueryResultItem) {
Taro.navigateTo({
- url: `${RouterPath.taskDetail}?id=${item.id}`,
+ url: `${RouterPath.taskDetail}?id=${item.id}&from=mine`,
});
}
</script>
diff --git a/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue b/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue
index f66686a..0efdd59 100644
--- a/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue
@@ -107,42 +107,47 @@
:isFlex="false"
@click="handleCall"
></PageFooterAction>
- <PageFooterBtn
- v-if="showApplyBtn"
- type="primary"
- @click="handleApply"
- :disabled="detail?.hireStatus === EnumTaskUserHireStatus.Wait"
- >{{ `鎶ュ悕锛�${detail?.applyCount ?? 0}浜哄凡鎶ュ悕锛塦 }}</PageFooterBtn
- >
- <PageFooterBtn
- v-if="detail.applyButton === GetTaskInfoQueryResultApplyButton.WaitHire"
- color="#999999"
- disabled
- >寰呯‘璁�</PageFooterBtn
- >
- <!-- <PageFooterBtn
+ <template v-if="from === 'mine'">
+ <PageFooterBtn
+ v-if="detail.applyButton === GetTaskInfoQueryResultApplyButton.WaitHire"
+ color="#999999"
+ disabled
+ >寰呯‘璁�</PageFooterBtn
+ >
+ <!-- <PageFooterBtn
v-if="detail.applyButton === GetTaskInfoQueryResultApplyButton.WaitSignContract"
>鍘荤绾�</PageFooterBtn
> -->
- <PageFooterBtn
- v-if="detail.hireButton === GetTaskInfoQueryResultHireButton.InProcess"
- color="#999999"
- disabled
- >杩涜涓�</PageFooterBtn
- >
- <!-- <PageFooterBtn
+ <PageFooterBtn
+ v-if="detail.hireButton === GetTaskInfoQueryResultHireButton.InProcess"
+ color="#999999"
+ disabled
+ >杩涜涓�</PageFooterBtn
+ >
+ <!-- <PageFooterBtn
v-if="detail.hireButton === GetTaskInfoQueryResultHireButton.ApplyCheckReceive"
>鐢宠楠屾敹</PageFooterBtn
> -->
- <PageFooterBtn
- v-if="detail.hireButton === GetTaskInfoQueryResultHireButton.Completed"
- color="#999999"
- disabled
- >宸插畬鎴�</PageFooterBtn
- >
- <PageFooterBtn v-if="detail.releaseStatus === EnumTaskReleaseStatus.Stopped" color="#999999"
- >宸插仠姝�</PageFooterBtn
- >
+ <PageFooterBtn
+ v-if="detail.hireButton === GetTaskInfoQueryResultHireButton.Completed"
+ color="#999999"
+ disabled
+ >宸插畬鎴�</PageFooterBtn
+ >
+ </template>
+ <template v-else>
+ <PageFooterBtn
+ v-if="detail?.releaseStatus === EnumTaskReleaseStatus.InProcess"
+ type="primary"
+ @click="handleApply"
+ :disabled="detail?.hireStatus"
+ >{{ `鎶ュ悕锛�${detail?.applyCount ?? 0}浜哄凡鎶ュ悕锛塦 }}</PageFooterBtn
+ >
+
+ <PageFooterBtn v-if="detail.releaseStatus === EnumTaskReleaseStatus.Stopped" color="#999999"
+ >宸插仠姝�</PageFooterBtn
+ >
+ </template>
</PageFooter>
</LoadingLayout>
</template>
@@ -184,14 +189,8 @@
*/
const router = Taro.useRouter();
-const taskId = router.params?.id ?? '';
-
-const showApplyBtn = computed(() => {
- return (
- detail.value?.releaseStatus === EnumTaskReleaseStatus.InProcess &&
- (detail.value?.hireStatus === EnumTaskUserHireStatus.Wait || !detail.value?.hireStatus)
- );
-});
+const id = router.params?.id ?? '';
+const from = router.params?.from ?? '';
const {
isLoading,
@@ -199,10 +198,10 @@
data: detail,
refetch,
} = useQuery({
- queryKey: ['taskServices/getTaskInfo', taskId],
+ queryKey: ['taskServices/getTaskInfo', id],
queryFn: async () => {
return await taskServices.getTaskInfo(
- { id: taskId },
+ { id: id },
{
showLoading: false,
}
@@ -218,7 +217,7 @@
const goComplaint = useAccessLogin(() => {
Taro.navigateTo({
- url: `${RouterPath.complaint}?id=${taskId}`,
+ url: `${RouterPath.complaint}?id=${id}`,
});
});
@@ -233,7 +232,7 @@
const handleApply = useAccessLogin(async () => {
try {
let params: API.ApplyTaskCommand = {
- ids: [taskId],
+ ids: [id],
};
let res = await taskUserServices.applyTask(params);
if (res) {
@@ -252,7 +251,7 @@
message: `纭畾${detail.value?.isCollected ? '鍙栨秷鏀惰棌' : '鏀惰棌'}鍚楋紵`,
});
let params: API.CollectTaskCommand = {
- ids: [taskId],
+ ids: [id],
isCollect: !detail.value?.isCollected,
};
let res = await taskUserServices.collectTask(params);
--
Gitblit v1.9.1