From c0ea4cbdde5f0f13fe401596ba7642a2906c484d Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期三, 31 十二月 2025 17:46:02 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/housekeepingMiniApp/src/subpackages/mine/mineReserveServiceDetail/InnerPage.vue | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/apps/housekeepingMiniApp/src/subpackages/mine/mineReserveServiceDetail/InnerPage.vue b/apps/housekeepingMiniApp/src/subpackages/mine/mineReserveServiceDetail/InnerPage.vue
index 4db52ca..2595ad5 100644
--- a/apps/housekeepingMiniApp/src/subpackages/mine/mineReserveServiceDetail/InnerPage.vue
+++ b/apps/housekeepingMiniApp/src/subpackages/mine/mineReserveServiceDetail/InnerPage.vue
@@ -1,6 +1,13 @@
<template>
<LoadingLayout :loading="isLoading" :error="isError" :loadError="refetch">
- <ContentScrollView hasPaddingTop>
+ <InfiniteLoading
+ commonMode
+ :refetch="refetch"
+ :isLoading="isLoading"
+ :isError="isError"
+ :showMoreText="false"
+ scrollViewClassName="common-page-infinite-scroll-list"
+ >
<MineServiceDetailView
:contactName="detail?.name"
:contactPhoneNumber="detail?.contactPhoneNumber"
@@ -15,12 +22,17 @@
:endTime="detail?.endTime"
:supplierEnterpriseName="detail?.supplierEnterpriseName"
:remark="detail?.remark"
+ :serverContactPhoneNumbers="detail?.supplierEnterpriseContactPhoneNumber"
+ :showServerContactPhoneNumbers="
+ detail.appointmentStatus === EnumStandardOrderAppointmentStatus.WaitServe ||
+ detail.appointmentStatus === EnumStandardOrderAppointmentStatus.Completed
+ "
>
<template #status>
{{ EnumStandardOrderAppointmentStatusText[detail?.appointmentStatus] }}
</template>
</MineServiceDetailView>
- </ContentScrollView>
+ </InfiniteLoading>
<PageFooter>
<PageFooterBtn
type="primary"
@@ -34,7 +46,7 @@
class="business-card-btn"
v-if="
detail.taskCheckReceiveStatus == EnumTaskCheckReceiveStatus.Completed &&
- detail.appointmentStatus === EnumStandardOrderAppointmentStatus.WaitSure
+ detail.appointmentStatus === EnumStandardOrderAppointmentStatus.WaitServe
"
@click="goConfirm"
>鏈嶅姟纭</PageFooterBtn
@@ -53,6 +65,7 @@
EnumStandardOrderAppointmentStatusText,
EnumStandardOrderAppointmentStatus,
EnumTaskCheckReceiveStatus,
+ EnumGetStandardOrdersQueryScene,
} from '@12333/constants';
defineOptions({
@@ -62,7 +75,10 @@
const route = Taro.useRouter();
const id = route.params?.id as string;
-const { detail, isLoading, isError, refetch } = useStandardOrder({ id });
+const { detail, isLoading, isError, refetch } = useStandardOrder({
+ id,
+ // scene: EnumGetStandardOrdersQueryScene.PartAEnterpriseOrder,
+});
Taro.useDidShow(() => {
refetch();
--
Gitblit v1.10.0