From fb4010f879763b1aa3afb00010b93dd331549246 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 13 八月 2025 17:43:27 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/bMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue
index 85e4494..a91b416 100644
--- a/apps/bMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue
@@ -2,8 +2,8 @@
<LoadingLayout :loading="isLoading" :error="isError" :loadError="refetch">
<ContentView>
<MyTaskCard
- :task-name="detail.taskName"
- :address="address"
+ :namee="detail.name"
+ :addressName="detail.addressName"
:showMyTaskArrow="false"
:showTime="false"
></MyTaskCard>
@@ -32,7 +32,7 @@
<script setup lang="ts">
import Taro from '@tarojs/taro';
import { useQuery } from '@tanstack/vue-query';
-import * as flexWorkerServices from '@12333/services/api/FlexWorker';
+import * as taskServices from '@12333/services/apiV2/task';
import { useInfiniteLoading } from '@12333/hooks';
import { OrderInputType } from '@12333/constants';
import TaskCheckCard from '../components/TaskCheckCard.vue';
@@ -52,20 +52,16 @@
data: detail,
refetch,
} = useQuery({
- queryKey: ['flexWorkerServices/getFlexTaskDto', taskId],
+ queryKey: ['taskServices/getTaskInfo', taskId],
queryFn: async () => {
- return await flexWorkerServices.getFlexTaskDto(
+ return await taskServices.getTaskInfo(
{ id: taskId },
{
showLoading: false,
}
);
},
- placeholderData: () => ({} as API.GetFlexTaskDtoOutput),
-});
-
-const address = computed(() => {
- return `${detail.value.provinceName} ${detail.value.cityName} ${detail.value.areaName} ${detail.value.address}`;
+ placeholderData: () => ({} as API.GetTaskInfoQueryResult),
});
const queryState = reactive({
@@ -93,7 +89,7 @@
function goHandleTaskDetail(item: API.GetNewestWorkerListOutput) {
Taro.navigateTo({
- url: `${RouterPath.taskHandleCheckDetail}?userId=${item.userId}`,
+ url: `${RouterPath.taskHandleCheckDetail}?userId=${item.userId}&taskId=${taskId}`,
});
}
</script>
--
Gitblit v1.9.1