From 021711427c13b9fce1344521e28ed71078d298f4 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 26 十二月 2025 15:21:22 +0800
Subject: [PATCH] fix: 甲方小程序
---
apps/housekeepingMiniApp/src/subpackages/mine/mineOrderManage/InnerPage.vue | 50 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 33 insertions(+), 17 deletions(-)
diff --git a/apps/housekeepingMiniApp/src/subpackages/mine/mineOrderManage/InnerPage.vue b/apps/housekeepingMiniApp/src/subpackages/mine/mineOrderManage/InnerPage.vue
index 31ab09a..5a0e126 100644
--- a/apps/housekeepingMiniApp/src/subpackages/mine/mineOrderManage/InnerPage.vue
+++ b/apps/housekeepingMiniApp/src/subpackages/mine/mineOrderManage/InnerPage.vue
@@ -1,6 +1,6 @@
<template>
<ProTabs
- v-model="queryState.status"
+ v-model="queryState.partAEnterpriseOrderStatus"
name="home-tab"
:showPaneContent="false"
class="home-tabs"
@@ -11,34 +11,39 @@
<ProTabPane :title="`鍏ㄩ儴`" :pane-key="0"></ProTabPane>
<ProTabPane
:title="`寰呮敮浠榒"
- :pane-key="GetPersonalApplyTaskInfosQueryStatus.WaitHire"
+ :pane-key="EnumGetStandardOrdersQueryPartAEnterpriseOrderStatus.Wait"
></ProTabPane>
<ProTabPane
:title="`宸叉敮浠榒"
- :pane-key="GetPersonalApplyTaskInfosQueryStatus.WaitSignContract"
+ :pane-key="EnumGetStandardOrdersQueryPartAEnterpriseOrderStatus.Pay"
></ProTabPane>
<ProTabPane
:title="`宸插畬鎴恅"
- :pane-key="GetPersonalApplyTaskInfosQueryStatus.HireRefuse"
+ :pane-key="EnumGetStandardOrdersQueryPartAEnterpriseOrderStatus.Completed"
></ProTabPane>
</ProTabs>
<InfiniteLoading
scrollViewClassName="common-infinite-scroll-list home-list"
v-bind="infiniteLoadingProps"
- :key="queryState.status"
+ :key="queryState.partAEnterpriseOrderStatus"
>
<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"
+ :supplierEnterpriseName="item.supplierEnterpriseName"
+ :payAmount="item.payAmount"
@click="goMineOrderDetail(item)"
>
+ <template #status>
+ {{
+ EnumGetStandardOrdersQueryPartAEnterpriseOrderStatusText[
+ item.partAEnterpriseOrderStatus
+ ]
+ }}
+ </template>
</ReserveServiceCard>
</template>
</InfiniteLoading>
@@ -48,8 +53,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 {
+ EnumGetStandardOrdersQueryPartAEnterpriseOrderStatus,
+ EnumGetStandardOrdersQueryScene,
+ EnumPagedListOrder,
+ EnumGetStandardOrdersQueryPartAEnterpriseOrderStatusText,
+} from '@12333/constants';
+import * as standardOrderServices from '@12333/services/apiV2/standardOrder';
import Taro from '@tarojs/taro';
defineOptions({
@@ -57,27 +67,33 @@
});
const queryState = reactive({
- status: 0 as any as GetPersonalApplyTaskInfosQueryStatus,
+ partAEnterpriseOrderStatus: 0 as any as EnumGetStandardOrdersQueryPartAEnterpriseOrderStatus,
+ scene: EnumGetStandardOrdersQueryScene.PartAEnterpriseOrder,
});
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.partAEnterpriseOrderStatus)) {
+ params.partAEnterpriseOrderStatus = queryState.partAEnterpriseOrderStatus;
+ }
+
+ return standardOrderServices.getStandardOrders(params, {
showLoading: false,
});
},
{
- queryKey: ['taskServices/getOpenTaskInfos', queryState],
+ queryKey: ['standardOrderServices/getStandardOrders', queryState],
}
);
--
Gitblit v1.10.0