From f94468cc4f52ca3a68817592e4ff92f815c835c7 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 26 十二月 2025 14:48:21 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/housekeepingMiniApp/src/subpackages/mine/mineReserveService/InnerPage.vue | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/apps/housekeepingMiniApp/src/subpackages/mine/mineReserveService/InnerPage.vue b/apps/housekeepingMiniApp/src/subpackages/mine/mineReserveService/InnerPage.vue
index 00f705e..36b49ed 100644
--- a/apps/housekeepingMiniApp/src/subpackages/mine/mineReserveService/InnerPage.vue
+++ b/apps/housekeepingMiniApp/src/subpackages/mine/mineReserveService/InnerPage.vue
@@ -1,6 +1,6 @@
<template>
<ProTabs
- v-model="queryState.status"
+ v-model="queryState.appointmentStatus"
name="home-tab"
:showPaneContent="false"
class="home-tabs"
@@ -26,18 +26,15 @@
<InfiniteLoading
scrollViewClassName="common-infinite-scroll-list home-list"
v-bind="infiniteLoadingProps"
- :key="queryState.status"
+ :key="queryState.appointmentStatus"
>
<template #renderItem="{ item }">
<ReserveServiceCard
- :name="item.name"
+ :serviceName="item.serviceName"
:begin-time="item.beginTime"
:end-time="item.endTime"
- :billing-method="item.billingMethod"
- :benefits="item.benefits"
- :service-fee="item.serviceFee"
- :settlement-cycle="item.settlementCycle"
- :address-name="item.addressName"
+ :addressDetail="item.addressDetail"
+ :appointmentStatus="item.appointmentStatus"
@click="goSerciceDetail(item)"
>
</ReserveServiceCard>
@@ -49,8 +46,13 @@
import { ProTabs, ProTabPane, ReserveServiceCard } from '@12333/components';
import { useUserStore } from '@/stores/modules/user';
import { useInfiniteLoading } from '@12333/hooks';
-import { EnumPagedListOrder, GetPersonalApplyTaskInfosQueryStatus } from '@12333/constants';
-import * as taskServices from '@12333/services/apiV2/task';
+import {
+ EnumGetStandardOrdersQueryScene,
+ EnumPagedListOrder,
+ EnumStandardOrderAppointmentStatus,
+ GetPersonalApplyTaskInfosQueryStatus,
+} from '@12333/constants';
+import * as standardOrderServices from '@12333/services/apiV2/standardOrder';
import Taro from '@tarojs/taro';
defineOptions({
@@ -58,22 +60,28 @@
});
const queryState = reactive({
- status: 0 as any as GetPersonalApplyTaskInfosQueryStatus,
+ scene: EnumGetStandardOrdersQueryScene.PartAEnterpriseOrder,
+ appointmentStatus: 0 as any as EnumStandardOrderAppointmentStatus,
});
const userStore = useUserStore();
const { infiniteLoadingProps } = useInfiniteLoading(
({ pageParam }) => {
- let params: API.GetTaskInfosQuery = {
+ let params: API.GetStandardOrdersQuery = {
pageModel: {
rows: 20,
page: pageParam,
orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
},
+ scene: queryState.scene,
};
- return taskServices.getOpenTaskInfos(params, {
+ if (!!Number(queryState.appointmentStatus)) {
+ params.appointmentStatus = queryState.appointmentStatus;
+ }
+
+ return standardOrderServices.getStandardOrders(params, {
showLoading: false,
});
},
--
Gitblit v1.10.0