From 28ac7ff126b09110a802473f0471cce98eb363a4 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 26 十二月 2025 09:19:17 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/bStandardMiniApp/src/subpackages/appointmentManage/appointmentManage/InnerPage.vue | 60 ++++++++++++++++++++----------------------------------------
1 files changed, 20 insertions(+), 40 deletions(-)
diff --git a/apps/bStandardMiniApp/src/subpackages/appointmentManage/appointmentManage/InnerPage.vue b/apps/bStandardMiniApp/src/subpackages/appointmentManage/appointmentManage/InnerPage.vue
index 75be597..38cc784 100644
--- a/apps/bStandardMiniApp/src/subpackages/appointmentManage/appointmentManage/InnerPage.vue
+++ b/apps/bStandardMiniApp/src/subpackages/appointmentManage/appointmentManage/InnerPage.vue
@@ -1,6 +1,6 @@
<template>
<ProTabs
- v-model="queryState.status"
+ v-model="queryState.appointmentStatus"
name="home-tab"
:showPaneContent="false"
class="home-tabs"
@@ -11,35 +11,40 @@
<ProTabPane :title="`鍏ㄩ儴`" :pane-key="0"></ProTabPane>
<ProTabPane
:title="`寰呯‘璁"
- :pane-key="GetPersonalApplyTaskInfosQueryStatus.WaitHire"
+ :pane-key="EnumStandardOrderAppointmentStatus.WaitSure"
></ProTabPane>
<ProTabPane
:title="`寰呮湇鍔"
- :pane-key="GetPersonalApplyTaskInfosQueryStatus.WaitSignContract"
+ :pane-key="EnumStandardOrderAppointmentStatus.WaitServe"
></ProTabPane>
<ProTabPane
:title="`宸插畬鎴恅"
- :pane-key="GetPersonalApplyTaskInfosQueryStatus.HireRefuse"
+ :pane-key="EnumStandardOrderAppointmentStatus.Completed"
></ProTabPane>
- <ProTabPane :title="`宸插彇娑坄" :pane-key="40"></ProTabPane>
+ <ProTabPane
+ :title="`宸插彇娑坄"
+ :pane-key="EnumStandardOrderAppointmentStatus.Cancelled"
+ ></ProTabPane>
</ProTabs>
<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"
+ :serviceFee="item.serviceFee"
:end-time="item.endTime"
- :billing-method="item.billingMethod"
- :benefits="item.benefits"
- :service-fee="item.serviceFee"
- :settlement-cycle="item.settlementCycle"
- :address-name="item.addressName"
+ :supplierEnterpriseName="item.supplierEnterpriseName"
+ :address-detail="item.addressDetail"
+ :appointmentStatus="item.appointmentStatus"
@click="goDetail(item)"
>
+ <template #serviceCustome>
+ {{ `鏈嶅姟浜哄憳锛�${item.serverNames}` }}
+ </template>
</ReserveServiceCard>
</template>
</InfiniteLoading>
@@ -47,40 +52,15 @@
<script setup lang="ts">
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 { useGetStandardOrders } from '@12333/hooks';
+import { EnumStandardOrderAppointmentStatus } from '@12333/constants';
import Taro from '@tarojs/taro';
defineOptions({
name: 'InnerPage',
});
-const queryState = reactive({
- status: 0 as any as GetPersonalApplyTaskInfosQueryStatus,
-});
-
-const userStore = useUserStore();
-
-const { infiniteLoadingProps } = useInfiniteLoading(
- ({ pageParam }) => {
- let params: API.GetTaskInfosQuery = {
- pageModel: {
- rows: 20,
- page: pageParam,
- orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
- },
- };
-
- return taskServices.getOpenTaskInfos(params, {
- showLoading: false,
- });
- },
- {
- queryKey: ['taskServices/getOpenTaskInfos', queryState],
- }
-);
+const { queryState, infiniteLoadingProps } = useGetStandardOrders();
function goDetail(item: any) {
Taro.navigateTo({
--
Gitblit v1.10.0