From 2b7fccce78fe4d57d73f4cf350cbe16b75a72fd4 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期五, 08 八月 2025 14:34:36 +0800 Subject: [PATCH] fix: 任务详情 --- apps/cMiniApp/src/hooks/task.ts | 34 +++++++++++++++++++++++++--------- 1 files changed, 25 insertions(+), 9 deletions(-) diff --git a/apps/cMiniApp/src/hooks/task.ts b/apps/cMiniApp/src/hooks/task.ts index 1a789e7..bdb6b3a 100644 --- a/apps/cMiniApp/src/hooks/task.ts +++ b/apps/cMiniApp/src/hooks/task.ts @@ -1,9 +1,16 @@ import { useInfiniteLoading } from '@12333/hooks'; -import { OrderInputType, Gender } from '@12333/constants'; -import * as flexWorkerServices from '@12333/services/api/FlexWorker'; +import { + EnumPagedListOrder, + EnumSettlementCycle, + EnumTaskRecommendStatus, + EnumTaskReleaseStatus, + EnumTaskStatus, + EnumUserGender, +} from '@12333/constants'; import _ from 'lodash'; import { trim } from '@12333/utils'; import { MaybeRef } from 'vue'; +import * as taskServices from '@12333/services/apiV2/task'; export enum HomeOrderType { Recommend = 'Recommend', @@ -20,13 +27,15 @@ const searchValue = ref(''); const queryMenuState = reactive({ - gender: '' as any as Gender, + genderLimit: '' as any as EnumUserGender, + settlementCycle: '' as any as EnumSettlementCycle, + benefitCodes: '', + status: '' as any as EnumTaskStatus, }); const queryState = reactive({ searchValueTrim: '', orderType: HomeOrderType.Recommend, - companyId: '', }); const handleSearch = _.debounce(function () { @@ -35,24 +44,31 @@ const { infiniteLoadingProps } = useInfiniteLoading( ({ pageParam }) => { - let params: API.GetFlexTaskListInput = { + let params: API.GetTaskInfosQuery = { pageModel: { rows: 20, page: pageParam, orderInput: [ queryState.orderType === HomeOrderType.Recommend - ? { property: 'isRecommend', order: OrderInputType.Desc } - : { property: 'lastShelfTime', order: OrderInputType.Desc }, + ? { property: 'recommendStatus', order: EnumPagedListOrder.Desc } + : { property: 'createdTime', order: EnumPagedListOrder.Desc }, ], }, + keywords: queryState.searchValueTrim, + // cityCode: 'string', + settlementCycle: queryMenuState.settlementCycle, + benefitCodes: [queryMenuState.benefitCodes].filter(Boolean), + genderLimit: queryMenuState.genderLimit, + status: queryMenuState.status, + releaseStatus: EnumTaskReleaseStatus.InProcess, }; - return flexWorkerServices.getFlexTaskByArrange(params, { + return taskServices.getTaskInfos(params, { showLoading: false, }); }, { - queryKey: ['flexWorkerServices/getFlexTaskByArrange', queryState, queryMenuState, cityName], + queryKey: ['taskServices/getTaskInfos', queryState, queryMenuState, cityName], } ); -- Gitblit v1.9.1