From 84bbc4a13aa8283aa417182376e1eb0024596582 Mon Sep 17 00:00:00 2001 From: wupengfei <834520024@qq.com> Date: 星期五, 08 八月 2025 16:38:00 +0800 Subject: [PATCH] feat: 接口对接 --- /dev/null | 84 ------------------------------------------ apps/cMiniApp/src/subpackages/task/components/CompanyTaskList.vue | 2 packages/hooks/index.ts | 1 apps/cMiniApp/src/pages/home/index.vue | 4 +- apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue | 2 apps/bMiniApp/auto-imports.d.ts | 5 -- apps/bMiniApp/src/subpackages/jobApplicationManage/jobApplicationManage/InnerPage.vue | 2 packages/hooks/task.ts | 4 +- 8 files changed, 8 insertions(+), 96 deletions(-) diff --git a/apps/bMiniApp/auto-imports.d.ts b/apps/bMiniApp/auto-imports.d.ts index a2bb986..92fbd7a 100644 --- a/apps/bMiniApp/auto-imports.d.ts +++ b/apps/bMiniApp/auto-imports.d.ts @@ -127,9 +127,6 @@ // @ts-ignore export type { RouterPath, RouterPath } from './src/constants/router' import('./src/constants/router') - // @ts-ignore - export type { HomeOrderType } from './src/hooks/task' - import('./src/hooks/task') } // for vue template auto import import { UnwrapRef } from 'vue' @@ -138,7 +135,6 @@ readonly AppLocalConfig: UnwrapRef<typeof import('./src/constants/app')['AppLocalConfig']> readonly BackType: UnwrapRef<typeof import('./src/constants/enum')['BackType']> readonly EffectScope: UnwrapRef<typeof import('vue')['EffectScope']> - readonly HomeOrderType: UnwrapRef<typeof import('./src/hooks/task')['HomeOrderType']> readonly OssAssets: UnwrapRef<typeof import('./src/constants/img')['OssAssets']> readonly RouterPath: UnwrapRef<typeof import('./src/constants/router')['RouterPath']> readonly TabBarPageRouter: UnwrapRef<typeof import('./src/constants/tabBar')['TabBarPageRouter']> @@ -216,7 +212,6 @@ readonly useRouter: UnwrapRef<typeof import('vue-router')['useRouter']> readonly useSlots: UnwrapRef<typeof import('vue')['useSlots']> readonly useSwitchTab: UnwrapRef<typeof import('./src/hooks/router')['useSwitchTab']> - readonly useTaskList: UnwrapRef<typeof import('./src/hooks/task')['useTaskList']> readonly useTemplateRef: UnwrapRef<typeof import('vue')['useTemplateRef']> readonly useUser: UnwrapRef<typeof import('./src/hooks/user')['useUser']> readonly watch: UnwrapRef<typeof import('vue')['watch']> diff --git a/apps/bMiniApp/src/subpackages/jobApplicationManage/jobApplicationManage/InnerPage.vue b/apps/bMiniApp/src/subpackages/jobApplicationManage/jobApplicationManage/InnerPage.vue index 715026f..3a23ff1 100644 --- a/apps/bMiniApp/src/subpackages/jobApplicationManage/jobApplicationManage/InnerPage.vue +++ b/apps/bMiniApp/src/subpackages/jobApplicationManage/jobApplicationManage/InnerPage.vue @@ -49,10 +49,10 @@ import { JobApplicationCard, ProTabs, ProTabPane } from '@12333/components'; import { RouterPath } from '@/constants'; import { EnumTaskReleaseStatus, BillingMethodEnumUnit } from '@12333/constants'; -import * as flexWorkerServices from '@12333/services/api/FlexWorker'; import Taro from '@tarojs/taro'; import { Message } from '@12333/utils'; import * as taskServices from '@12333/services/apiV2/task'; +import { useTaskList } from '@12333/hooks'; defineOptions({ name: 'InnerPage', diff --git a/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue index 9944fd9..047fe29 100644 --- a/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue +++ b/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue @@ -50,7 +50,7 @@ import { JobApplicationCard, ProTabs, ProTabPane } from '@12333/components'; import Taro from '@tarojs/taro'; import { EnumTaskStatus, BillingMethodEnumUnit, Colors } from '@12333/constants'; -import { useTaskList } from '@/hooks/task'; +import { useTaskList } from '@12333/hooks'; defineOptions({ name: 'InnerPage', diff --git a/apps/cMiniApp/src/hooks/task.ts b/apps/cMiniApp/src/hooks/task.ts deleted file mode 100644 index fe9dc25..0000000 --- a/apps/cMiniApp/src/hooks/task.ts +++ /dev/null @@ -1,84 +0,0 @@ -import { useInfiniteLoading } from '@12333/hooks'; -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', - LastShelfTime = 'LastShelfTime', -} - -type UseTaskListOptions = { - cityCode?: MaybeRef<string>; - enabled?: MaybeRef<boolean>; -}; - -export function useTaskList(options: UseTaskListOptions = {}) { - const { cityCode = '', enabled = true } = options; - - const searchValue = ref(''); - - const queryMenuState = reactive({ - genderLimit: '' as any as EnumUserGender, - settlementCycle: '' as any as EnumSettlementCycle, - benefitCodes: '', - status: '' as any as EnumTaskStatus, - }); - - const queryState = reactive({ - searchValueTrim: '', - orderType: HomeOrderType.Recommend, - }); - - const handleSearch = _.debounce(function () { - queryState.searchValueTrim = trim(searchValue.value); - }, 300); - - const { infiniteLoadingProps } = useInfiniteLoading( - ({ pageParam }) => { - let params: API.GetTaskInfosQuery = { - pageModel: { - rows: 20, - page: pageParam, - orderInput: [ - queryState.orderType === HomeOrderType.Recommend - ? { 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 taskServices.getTaskInfos(params, { - showLoading: false, - }); - }, - { - queryKey: ['taskServices/getTaskInfos', queryState, queryMenuState, cityCode], - enabled: enabled, - } - ); - - return { - searchValue, - queryState, - queryMenuState, - handleSearch, - infiniteLoadingProps, - }; -} diff --git a/apps/cMiniApp/src/pages/home/index.vue b/apps/cMiniApp/src/pages/home/index.vue index e08f524..2bfd7ae 100644 --- a/apps/cMiniApp/src/pages/home/index.vue +++ b/apps/cMiniApp/src/pages/home/index.vue @@ -64,7 +64,7 @@ </template> <script setup lang="ts"> -import { useUser, useTaskList, HomeOrderType } from '@/hooks'; +import { useUser } from '@/hooks'; import { useUserStore } from '@/stores/modules/user'; import { RectDown, Location2 } from '@nutui/icons-vue-taro'; import Taro from '@tarojs/taro'; @@ -74,7 +74,7 @@ import { TaskCard, ProTabs, ProTabPane } from '@12333/components'; import HomeQueryMenuView from './HomeQueryMenuView.vue'; import IconLocaltion from '@/assets/task/icon-localtion.png'; -import { useAllAreaList } from '@12333/hooks'; +import { useAllAreaList, useTaskList } from '@12333/hooks'; import { useAccessLogin } from '@/hooks'; const { locationCity } = useUser(); diff --git a/apps/cMiniApp/src/subpackages/task/components/CompanyTaskList.vue b/apps/cMiniApp/src/subpackages/task/components/CompanyTaskList.vue index f61648b..8075c14 100644 --- a/apps/cMiniApp/src/subpackages/task/components/CompanyTaskList.vue +++ b/apps/cMiniApp/src/subpackages/task/components/CompanyTaskList.vue @@ -7,8 +7,8 @@ </template> <script setup lang="ts"> -import { useTaskList } from '@/hooks'; import { TaskCard } from '@12333/components'; +import { useTaskList } from '@12333/hooks'; import Taro from '@tarojs/taro'; defineOptions({ diff --git a/packages/hooks/index.ts b/packages/hooks/index.ts index 9f10388..8459cc4 100644 --- a/packages/hooks/index.ts +++ b/packages/hooks/index.ts @@ -5,3 +5,4 @@ export * from './setting'; export * from './identify'; export * from './enterprise'; +export * from './task'; diff --git a/apps/bMiniApp/src/hooks/task.ts b/packages/hooks/task.ts similarity index 95% rename from apps/bMiniApp/src/hooks/task.ts rename to packages/hooks/task.ts index f5c6f5f..b0c4928 100644 --- a/apps/bMiniApp/src/hooks/task.ts +++ b/packages/hooks/task.ts @@ -9,7 +9,7 @@ } from '@12333/constants'; import _ from 'lodash'; import { trim } from '@12333/utils'; -import { MaybeRef } from 'vue'; +import { MaybeRef, reactive, ref, unref } from 'vue'; import * as taskServices from '@12333/services/apiV2/task'; export enum HomeOrderType { @@ -32,7 +32,7 @@ settlementCycle: '' as any as EnumSettlementCycle, benefitCodes: '', status: '' as any as EnumTaskStatus, - releaseStatus: '' as any as EnumTaskReleaseStatus, + releaseStatus: EnumTaskReleaseStatus.InProcess, }); const queryState = reactive({ -- Gitblit v1.9.1