From bbf6053159d566a096dfa26627dda19657d928af Mon Sep 17 00:00:00 2001 From: wupengfei <834520024@qq.com> Date: 星期一, 10 三月 2025 13:24:14 +0800 Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp --- apps/cMiniApp/src/subpackages/mine/mineSign/InnerPage.vue | 41 +++++++++++++++++++++++++---------------- 1 files changed, 25 insertions(+), 16 deletions(-) diff --git a/apps/cMiniApp/src/subpackages/mine/mineSign/InnerPage.vue b/apps/cMiniApp/src/subpackages/mine/mineSign/InnerPage.vue index c423588..9f87fe6 100644 --- a/apps/cMiniApp/src/subpackages/mine/mineSign/InnerPage.vue +++ b/apps/cMiniApp/src/subpackages/mine/mineSign/InnerPage.vue @@ -8,9 +8,9 @@ title-gutter="12" title-scroll > - <ProTabPane :title="`鍏ㄩ儴`" :pane-key="MineSignType.All"></ProTabPane> - <ProTabPane :title="`寰呯‘璁" :pane-key="MineSignType.WaitConfirm"></ProTabPane> - <ProTabPane :title="`寰呯绾" :pane-key="MineSignType.WaitSign"></ProTabPane> + <ProTabPane :title="`鍏ㄩ儴`" :pane-key="0"></ProTabPane> + <ProTabPane :title="`寰呯‘璁" :pane-key="10"></ProTabPane> + <ProTabPane :title="`寰呯绾" :pane-key="20"></ProTabPane> </ProTabs> <InfiniteLoading scrollViewClassName="common-infinite-scroll-list home-list" @@ -18,10 +18,10 @@ :key="queryState.mineSignType" > <template #renderItem="{ item }"> - <TaskCard> + <TaskCard @click="goTaskDetail(item)"> <template #actions> - <div class="task-card-actions-text" :style="{ color: MineSignTypeColor[10] }"> - {{ MineSignTypeText[10] }} + <div class="task-card-actions-text" :style="{ color: TaskStatusColor[10] }"> + {{ TaskStatusText[10] }} </div> </template> </TaskCard> @@ -32,50 +32,59 @@ <script setup lang="ts"> import { TaskCard, ProTabs, ProTabPane } from '@12333/components'; import { useUserStore } from '@/stores/modules/user'; -import { MineSignType, MineSignTypeColor, MineSignTypeText } from './constants'; +import { TaskStatusText, TaskStatusColor, TaskStatus } from '@/constants'; import { useInfiniteLoading } from '@12333/hooks'; import { OrderInputType } from '@12333/constants'; -import * as orderServices from '@12333/services/api/Order'; +import * as flexWorkerServices from '@12333/services/api/FlexWorker'; +import Taro from '@tarojs/taro'; defineOptions({ name: 'InnerPage', }); const queryState = reactive({ - mineSignType: MineSignType.All, + mineSignType: TaskStatus.All, }); const userStore = useUserStore(); const { infiniteLoadingProps } = useInfiniteLoading( ({ pageParam }) => { - let params: API.FrontOrderListInput = { + let params: API.GetFlexTaskListInput = { pageModel: { rows: 20, page: pageParam, orderInput: [ - queryState.mineSignType === MineSignType.All + queryState.mineSignType === TaskStatus.All ? { property: 'isRecommend', order: OrderInputType.Desc } : { property: 'lastShelfTime', order: OrderInputType.Desc }, ], }, }; - return orderServices.getFrontOrderList(params, { + return flexWorkerServices.getFlexTaskByArrange(params, { showLoading: false, }); }, { - queryKey: ['orderServices/getFrontOrderList', queryState], + queryKey: ['flexWorkerServices/getFlexTaskByArrange', queryState], } ); + +function goTaskDetail(item: API.GetFlexTaskListOutput) { + Taro.navigateTo({ + url: `${RouterPath.taskDetail}?id=${item.id}`, + }); +} </script> <style lang="scss"> @import '@/styles/common.scss'; -.task-card-actions-text { - font-size: 24px; - line-height: 42px; +.mineSign-page-wrapper { + .task-card-actions-text { + font-size: 24px; + line-height: 42px; + } } </style> -- Gitblit v1.9.1