Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp

zhengyiming

2 天以前 e108e18dfb1cb8791c2033aea2682862ce9d825d

 packages/hooks/standardOrder.ts

@@ -6,6 +6,7 @@
import { useInfiniteLoading } from '@12333/hooks';
import {
  EnumGetStandardOrdersQueryPartAEnterpriseOrderStatus,
  EnumGetStandardOrdersQueryScene,
  EnumGetStandardOrdersQuerySupplierEnterpriseOrderStatus,
  EnumStandardOrderAppointmentStatus,
  EnumStandardOrderPayStatus,
@@ -18,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,
      });
    },
@@ -35,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 {
@@ -122,16 +124,16 @@
        },
      };

      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;
      }

@@ -152,20 +154,28 @@

type UseStandardOrderOptions = {
  id: MaybeRef<string>;
  scene?: EnumGetStandardOrdersQueryScene;
  onSuccess?: (data: API.GetStandardOrderQueryResult) => any;
  refetchInterval?: MaybeRef<number | false>;
};

export function useStandardOrder({ id, onSuccess }: UseStandardOrderOptions) {
export function useStandardOrder({
  id,
  scene,
  onSuccess,
  refetchInterval = false,
}: UseStandardOrderOptions) {
  const {
    isLoading,
    isError,
    data: detail,
    refetch,
  } = useQuery({
    queryKey: ['standardOrderServices/getStandardOrder', id],
    queryKey: ['standardOrderServices/getStandardOrder', id, scene],
    queryFn: async () => {
      const params: API.APIgetStandardOrderParams = {
        id: unref(id),
        scene: scene,
      };
      return await standardOrderServices.getStandardOrder(params, {
        showLoading: false,
@@ -175,6 +185,7 @@
    onSuccess(data) {
      onSuccess?.(data);
    },
    refetchInterval: unref(refetchInterval),
  });

  return { detail, isLoading, isError, refetch };