From bddfec7e062404ea563299b75c91d9b172339d0a Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 08 八月 2025 16:31:05 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/cMiniApp/src/hooks/task.ts | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/apps/cMiniApp/src/hooks/task.ts b/apps/cMiniApp/src/hooks/task.ts
index 1a789e7..fe9dc25 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',
@@ -11,22 +18,25 @@
}
type UseTaskListOptions = {
- cityName?: MaybeRef<string>;
+ cityCode?: MaybeRef<string>;
+ enabled?: MaybeRef<boolean>;
};
export function useTaskList(options: UseTaskListOptions = {}) {
- const { cityName = '' } = options;
+ const { cityCode = '', enabled = true } = options;
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 +45,32 @@
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: unref(cityCode),
+ 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, cityCode],
+ enabled: enabled,
}
);
--
Gitblit v1.9.1