From acd6c55ea7b11e06130c20bcd5ffd98c8e880a1f Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 12 八月 2025 16:32:18 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/cMiniApp/src/subpackages/mine/mineHire/InnerPage.vue | 67 +++++++++++++++++++++------------
1 files changed, 42 insertions(+), 25 deletions(-)
diff --git a/apps/cMiniApp/src/subpackages/mine/mineHire/InnerPage.vue b/apps/cMiniApp/src/subpackages/mine/mineHire/InnerPage.vue
index 15ab8a5..69b284a 100644
--- a/apps/cMiniApp/src/subpackages/mine/mineHire/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/mine/mineHire/InnerPage.vue
@@ -1,6 +1,6 @@
<template>
<ProTabs
- v-model="queryState.mineHireType"
+ v-model="queryState.status"
name="home-tab"
:showPaneContent="false"
class="home-tabs"
@@ -9,20 +9,38 @@
title-scroll
>
<ProTabPane :title="`鍏ㄩ儴`" :pane-key="0"></ProTabPane>
- <ProTabPane :title="`杩涜涓璥" :pane-key="10"></ProTabPane>
- <ProTabPane :title="`寰呴獙鏀禶" :pane-key="20"></ProTabPane>
- <ProTabPane :title="`宸插畬鎴恅" :pane-key="30"></ProTabPane>
+ <ProTabPane
+ :title="`杩涜涓璥"
+ :pane-key="GetPersonalHireTaskInfosQueryStatus.InProcess"
+ ></ProTabPane>
+ <ProTabPane
+ :title="`宸插畬鎴恅"
+ :pane-key="GetPersonalHireTaskInfosQueryStatus.Completed"
+ ></ProTabPane>
</ProTabs>
<InfiniteLoading
scrollViewClassName="common-infinite-scroll-list home-list"
v-bind="infiniteLoadingProps"
- :key="queryState.mineHireType"
+ :key="queryState.status"
>
<template #renderItem="{ item }">
- <TaskCard @click="goTaskDetail(item)">
+ <TaskCard
+ :name="item.name"
+ :begin-time="item.beginTime"
+ :end-time="item.endTime"
+ :billing-method="item.billingMethod"
+ :benefits="item.benefits"
+ :service-fee="item.serviceFee"
+ :settlement-cycle="item.settlementCycle"
+ :address-name="item.addressName"
+ @click="goTaskDetail(item)"
+ >
<template #actions>
- <div class="task-card-actions-text" :style="{ color: TaskStatusColor[10] }">
- {{ TaskStatusText[10] }}
+ <div
+ class="task-card-actions-text"
+ :style="{ color: GetPersonalHireTaskInfosQueryStatusColor[item.status] }"
+ >
+ {{ GetPersonalHireTaskInfosQueryStatusText[item.status] }}
</div>
</template>
</TaskCard>
@@ -32,11 +50,14 @@
<script setup lang="ts">
import { TaskCard, ProTabs, ProTabPane } from '@12333/components';
-import { useUserStore } from '@/stores/modules/user';
-import { TaskStatusText, TaskStatusColor, TaskStatus } from '@/constants';
import { useInfiniteLoading } from '@12333/hooks';
-import { OrderInputType } from '@12333/constants';
-import * as flexWorkerServices from '@12333/services/api/FlexWorker';
+import {
+ EnumPagedListOrder,
+ GetPersonalHireTaskInfosQueryStatus,
+ GetPersonalHireTaskInfosQueryStatusText,
+ GetPersonalHireTaskInfosQueryStatusColor,
+} from '@12333/constants';
+import * as taskServices from '@12333/services/apiV2/task';
import Taro from '@tarojs/taro';
defineOptions({
@@ -44,35 +65,31 @@
});
const queryState = reactive({
- mineHireType: TaskStatus.All,
+ status: 0 as any as GetPersonalHireTaskInfosQueryStatus,
});
-
-const userStore = useUserStore();
const { infiniteLoadingProps } = useInfiniteLoading(
({ pageParam }) => {
- let params: API.GetFlexTaskListInput = {
+ let params: API.GetPersonalHireTaskInfosQuery = {
pageModel: {
rows: 20,
page: pageParam,
- orderInput: [
- queryState.mineHireType === TaskStatus.All
- ? { property: 'creationTime', order: OrderInputType.Desc }
- : { property: 'lastShelfTime', order: OrderInputType.Desc },
- ],
+ orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
},
};
-
- return flexWorkerServices.getFlexTaskByArrange(params, {
+ if (Number(queryState.status)) {
+ params.status = queryState.status;
+ }
+ return taskServices.getPersonalHireTaskInfos(params, {
showLoading: false,
});
},
{
- queryKey: ['flexWorkerServices/getFlexTaskByArrange', queryState],
+ queryKey: ['taskServices/getPersonalHireTaskInfos', queryState],
}
);
-function goTaskDetail(item: API.GetFlexTaskListOutput) {
+function goTaskDetail(item: API.GetPersonalHireTaskInfosQueryResultItem) {
Taro.navigateTo({
url: `${RouterPath.taskDetail}?id=${item.id}`,
});
--
Gitblit v1.9.1