From 89ec68eec9ebe8e8e9ff67a8e8f65214b2f96cde Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 26 十二月 2025 13:44:42 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/bStandardMiniApp/src/subpackages/orderManage/orderManage/InnerPage.vue | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/apps/bStandardMiniApp/src/subpackages/orderManage/orderManage/InnerPage.vue b/apps/bStandardMiniApp/src/subpackages/orderManage/orderManage/InnerPage.vue
index 1d64964..263d9ad 100644
--- a/apps/bStandardMiniApp/src/subpackages/orderManage/orderManage/InnerPage.vue
+++ b/apps/bStandardMiniApp/src/subpackages/orderManage/orderManage/InnerPage.vue
@@ -1,6 +1,6 @@
<template>
<ProTabs
- v-model="queryState.payStatus"
+ v-model="queryState.supplierEnterpriseOrderStatus"
name="home-tab"
:showPaneContent="false"
class="home-tabs"
@@ -9,14 +9,19 @@
title-scroll
>
<ProTabPane :title="`鍏ㄩ儴`" :pane-key="0"></ProTabPane>
- <ProTabPane :title="`寰呮敮浠榒" :pane-key="EnumStandardOrderPayStatus.Completed"></ProTabPane>
- <ProTabPane :title="`宸叉敮浠榒" :pane-key="EnumStandardOrderPayStatus.Completed"></ProTabPane>
- <ProTabPane :title="`宸插畬鎴恅" :pane-key="EnumStandardOrderPayStatus.Cancelled"></ProTabPane>
+ <ProTabPane
+ :title="`寰呮敹娆綻"
+ :pane-key="EnumGetStandardOrdersQuerySupplierEnterpriseOrderStatus.Wait"
+ ></ProTabPane>
+ <ProTabPane
+ :title="`宸插畬鎴恅"
+ :pane-key="EnumGetStandardOrdersQuerySupplierEnterpriseOrderStatus.Completed"
+ ></ProTabPane>
</ProTabs>
<InfiniteLoading
scrollViewClassName="common-infinite-scroll-list home-list"
v-bind="infiniteLoadingProps"
- :key="queryState.payStatus"
+ :key="queryState.supplierEnterpriseOrderStatus"
>
<template #renderItem="{ item }">
<ReserveServiceCard
@@ -26,9 +31,15 @@
:end-time="item.endTime"
:supplierEnterpriseName="item.supplierEnterpriseName"
:address-detail="item.addressDetail"
- :appointmentStatus="item.appointmentStatus"
@click="goOrderDetail(item)"
>
+ <template #status>
+ {{
+ EnumGetStandardOrdersQuerySupplierEnterpriseOrderStatusText[
+ item.supplierEnterpriseOrderStatus
+ ]
+ }}
+ </template>
<template #serviceCustome>
{{ `鏈嶅姟浜哄憳锛�${item.serverNames}` }}
</template>
@@ -40,7 +51,10 @@
<script setup lang="ts">
import { ProTabs, ProTabPane, ReserveServiceCard } from '@12333/components';
import { useGetStandardOrders } from '@12333/hooks';
-import { EnumStandardOrderPayStatus } from '@12333/constants';
+import {
+ EnumGetStandardOrdersQuerySupplierEnterpriseOrderStatus,
+ EnumGetStandardOrdersQuerySupplierEnterpriseOrderStatusText,
+} from '@12333/constants';
import Taro from '@tarojs/taro';
defineOptions({
--
Gitblit v1.10.0