From e5f9316475049f99bc76e22f072a4cfe39a64670 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期三, 31 十二月 2025 17:52:58 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
packages/hooks/standardOrder.ts | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/packages/hooks/standardOrder.ts b/packages/hooks/standardOrder.ts
index 987b48d..a67c535 100644
--- a/packages/hooks/standardOrder.ts
+++ b/packages/hooks/standardOrder.ts
@@ -19,13 +19,13 @@
export function useStandardServiceDetail({ id, onSuccess }: UseStandardServiceDetailOptions) {
const { data, refetch, isLoading, isError } = useQuery({
- queryKey: ['standardServiceServices/getStandardService', id],
+ queryKey: ['standardServiceServices/getOpenStandardService', id],
queryFn: async () => {
let params: API.APIgetStandardServiceParams = {
id: unref(id),
};
- return await standardServiceServices.getStandardService(params, {
+ return await standardServiceServices.getOpenStandardService(params, {
showLoading: false,
});
},
@@ -36,11 +36,12 @@
});
const minPrice = computed(() => {
- if (!data.value?.specs?.length) {
- return 0;
- } else {
- return Math.min(...data.value.specs.map((x) => x.price));
- }
+ // if (!data.value?.specs?.length) {
+ // return 0;
+ // } else {
+ // return Math.min(...data.value.specs.map((x) => x.price));
+ // }
+ return data.value?.minSpecPrice ?? 0;
});
return {
@@ -105,7 +106,11 @@
};
}
-export function useGetStandardOrders() {
+type UseGetStandardOrdersOptions = {
+ scene?: EnumGetStandardOrdersQueryScene;
+};
+
+export function useGetStandardOrders({ scene }: UseGetStandardOrdersOptions) {
const queryState = reactive({
appointmentStatus: 0 as any as EnumStandardOrderAppointmentStatus,
payStatus: 0 as any as EnumStandardOrderPayStatus,
@@ -121,18 +126,19 @@
rows: 20,
page: pageParam,
},
+ scene: scene,
};
- if (queryState.appointmentStatus) {
+ if (Number(queryState.appointmentStatus)) {
params.appointmentStatus = queryState.appointmentStatus;
}
- if (queryState.payStatus) {
+ if (Number(queryState.payStatus)) {
params.payStatus = queryState.payStatus;
}
- if (queryState.partAEnterpriseOrderStatus) {
+ if (Number(queryState.partAEnterpriseOrderStatus)) {
params.partAEnterpriseOrderStatus = queryState.partAEnterpriseOrderStatus;
}
- if (queryState.supplierEnterpriseOrderStatus) {
+ if (Number(queryState.supplierEnterpriseOrderStatus)) {
params.supplierEnterpriseOrderStatus = queryState.supplierEnterpriseOrderStatus;
}
@@ -141,7 +147,7 @@
});
},
{
- queryKey: ['standardOrderServices/getStandardOrders', queryState],
+ queryKey: ['standardOrderServices/getStandardOrders', queryState, scene],
}
);
--
Gitblit v1.10.0