From 354fa08d53f4cd97014bfb0008c8c5f0326bbdd3 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 11 八月 2025 09:38:35 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/bMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue | 38 ++++++++++++++++++++++++++------------
1 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue
index d149ccc..a91b416 100644
--- a/apps/bMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue
@@ -1,7 +1,12 @@
<template>
<LoadingLayout :loading="isLoading" :error="isError" :loadError="refetch">
<ContentView>
- <MyTaskCard :showMyTaskArrow="false" :showTime="false"></MyTaskCard>
+ <MyTaskCard
+ :namee="detail.name"
+ :addressName="detail.addressName"
+ :showMyTaskArrow="false"
+ :showTime="false"
+ ></MyTaskCard>
<ChunkTitle title="楠屾敹鍒楄〃" />
</ContentView>
<InfiniteLoading
@@ -10,7 +15,15 @@
:key="queryState.status"
>
<template #renderItem="{ item }">
- <TaskCheckCard @click="goHandleTaskDetail(item)" />
+ <TaskCheckCard
+ :avatarUrl="setOSSLink(item.avatarUrl)"
+ :name="item.name"
+ :genderType="item.genderType"
+ :isRealName="item.isRealName"
+ :contactPhone="item.contactPhone"
+ :checkAcceptStatus="item.checkAcceptStatus"
+ @click="goHandleTaskDetail(item)"
+ />
</template>
</InfiniteLoading>
</LoadingLayout>
@@ -19,18 +32,19 @@
<script setup lang="ts">
import Taro from '@tarojs/taro';
import { useQuery } from '@tanstack/vue-query';
-import * as orderServices from '@12333/services/api/Order';
+import * as taskServices from '@12333/services/apiV2/task';
import { useInfiniteLoading } from '@12333/hooks';
import { OrderInputType } from '@12333/constants';
import TaskCheckCard from '../components/TaskCheckCard.vue';
import { MyTaskCard } from '@12333/components';
+import { setOSSLink } from '@12333/utils';
defineOptions({
name: 'InnerPage',
});
const router = Taro.useRouter();
-const taskId = router.params?.id ?? '';
+const taskId = router.params?.taskId ?? '';
const {
isLoading,
@@ -38,16 +52,16 @@
data: detail,
refetch,
} = useQuery({
- queryKey: ['orderServices/getOrdeForDetail', taskId],
+ queryKey: ['taskServices/getTaskInfo', taskId],
queryFn: async () => {
- return await orderServices.getOrdeForDetail(
+ return await taskServices.getTaskInfo(
{ id: taskId },
{
showLoading: false,
}
);
},
- placeholderData: () => ({} as API.OrderInfoDto),
+ placeholderData: () => ({} as API.GetTaskInfoQueryResult),
});
const queryState = reactive({
@@ -56,7 +70,7 @@
const { infiniteLoadingProps } = useInfiniteLoading(
({ pageParam }) => {
- let params: API.FrontOrderListInput = {
+ let params: API.GetFlexTaskWorkerCheckListInput = {
pageModel: {
rows: 20,
page: pageParam,
@@ -64,18 +78,18 @@
},
};
- return orderServices.getFrontOrderList(params, {
+ return flexWorkerServices.getFlexTaskWorkerCheckList(params, {
showLoading: false,
});
},
{
- queryKey: ['orderServices/getFrontOrderList', queryState],
+ queryKey: ['flexWorkerServices/getFlexTaskWorkerCheckList', queryState],
}
);
-function goHandleTaskDetail(item: API.FrontOrderList) {
+function goHandleTaskDetail(item: API.GetNewestWorkerListOutput) {
Taro.navigateTo({
- url: `${RouterPath.taskHandleCheckDetail}?id=${item.id}`,
+ url: `${RouterPath.taskHandleCheckDetail}?userId=${item.userId}&taskId=${taskId}`,
});
}
</script>
--
Gitblit v1.9.1