From 0b13d5897d739b9955f65bf5565fe8e975412419 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 26 十二月 2025 15:34:53 +0800
Subject: [PATCH] fix: 甲方小程序
---
apps/housekeepingMiniApp/src/subpackages/mine/mineOrderDetail/InnerPage.vue | 56 +++++++++++++++++++++------
apps/housekeepingMiniApp/project.private.config.json | 18 ++++----
packages/components/src/Card/MineServiceDetailView.vue | 10 ++++
packages/hooks/standardOrder.ts | 5 ++
apps/housekeepingMiniApp/src/subpackages/mine/mineReserveServiceDetail/InnerPage.vue | 6 ++
5 files changed, 70 insertions(+), 25 deletions(-)
diff --git a/apps/housekeepingMiniApp/project.private.config.json b/apps/housekeepingMiniApp/project.private.config.json
index 4a33fc6..9630c7a 100644
--- a/apps/housekeepingMiniApp/project.private.config.json
+++ b/apps/housekeepingMiniApp/project.private.config.json
@@ -23,13 +23,20 @@
"miniprogram": {
"list": [
{
- "name": "鍙栨秷鍘熷洜",
- "pathName": "subpackages/mine/mineReserveServiceCancel/mineReserveServiceCancel",
+ "name": "璁㈠崟璇︽儏",
+ "pathName": "subpackages/mine/mineOrderDetail/mineOrderDetail",
"query": "id=d16809d3-e6b9-4b5f-2e87-08de443f2678",
"scene": null,
"launchMode": "default"
},
{
+ "name": "鍙栨秷鍘熷洜",
+ "pathName": "subpackages/mine/mineReserveServiceCancel/mineReserveServiceCancel",
+ "query": "id=d16809d3-e6b9-4b5f-2e87-08de443f2678",
+ "launchMode": "default",
+ "scene": null
+ },
+ {
"name": "鎴戠殑棰勭害璇︽儏",
"pathName": "subpackages/mine/mineReserveServiceDetail/mineReserveServiceDetail",
"query": "id=d16809d3-e6b9-4b5f-2e87-08de443f2678",
@@ -93,13 +100,6 @@
"scene": null
},
{
- "name": "璁㈠崟璇︽儏",
- "pathName": "subpackages/mine/mineOrderDetail/mineOrderDetail",
- "query": "id=123",
- "launchMode": "default",
- "scene": null
- },
- {
"name": "鍦板潃绠＄悊",
"pathName": "subpackages/mine/addressManange/addressManange",
"query": "",
diff --git a/apps/housekeepingMiniApp/src/subpackages/mine/mineOrderDetail/InnerPage.vue b/apps/housekeepingMiniApp/src/subpackages/mine/mineOrderDetail/InnerPage.vue
index 854e72e..6c7104c 100644
--- a/apps/housekeepingMiniApp/src/subpackages/mine/mineOrderDetail/InnerPage.vue
+++ b/apps/housekeepingMiniApp/src/subpackages/mine/mineOrderDetail/InnerPage.vue
@@ -1,23 +1,47 @@
<template>
- <!-- <LoadingLayout :loading="isLoading" :error="isError" :loadError="refetch"> -->
- <ContentScrollView hasPaddingTop>
- <MineServiceDetailView />
- </ContentScrollView>
- <PageFooter class="order-settle-bar">
- <div class="order-settle-price-wrapper">
- <div class="order-settle-price-label">鏀粯锛�</div>
- <nut-price :price="155" size="large" />
- </div>
- <PageFooterBtn type="primary" class="business-card-btn">绔嬪嵆涓嬪崟</PageFooterBtn>
- </PageFooter>
- <!-- </LoadingLayout> -->
+ <LoadingLayout :loading="isLoading" :error="isError" :loadError="refetch">
+ <ContentScrollView hasPaddingTop>
+ <MineServiceDetailView
+ :contactName="detail?.name"
+ :contactPhoneNumber="detail?.contactPhoneNumber"
+ :addressDetail="detail?.addressDetail"
+ :serviceName="detail?.serviceName"
+ :price="detail?.specPrice"
+ :specName="detail?.specName"
+ :specNumber="detail?.specNumber"
+ :imgUrl="detail?.serviceFile"
+ statusText="璁㈠崟鐘舵��"
+ :beginTime="detail?.beginTime"
+ :endTime="detail?.endTime"
+ :supplierEnterpriseName="detail?.supplierEnterpriseName"
+ :remark="detail?.remark"
+ :serverContactPhoneNumbers="detail?.serverContactPhoneNumbers"
+ >
+ <template #status>
+ {{
+ EnumGetStandardOrdersQueryPartAEnterpriseOrderStatusText[
+ detail?.partAEnterpriseOrderStatus
+ ]
+ }}
+ </template>
+ </MineServiceDetailView>
+ </ContentScrollView>
+ <PageFooter class="order-settle-bar">
+ <div class="order-settle-price-wrapper">
+ <div class="order-settle-price-label">鏀粯锛�</div>
+ <nut-price :price="detail.payAmount" size="large" />
+ </div>
+ <PageFooterBtn type="primary" class="business-card-btn">绔嬪嵆涓嬪崟</PageFooterBtn>
+ </PageFooter>
+ </LoadingLayout>
</template>
<script setup lang="ts">
import { MineServiceDetailView } from '@12333/components';
import Taro from '@tarojs/taro';
import * as standardServiceServices from '@12333/services/apiV2/standardService';
-import { useCheckReceiveTaskUserSubmit } from '@12333/hooks';
+import { useStandardOrder } from '@12333/hooks';
+import { EnumGetStandardOrdersQueryPartAEnterpriseOrderStatusText } from '@12333/constants';
defineOptions({
name: 'InnerPage',
@@ -25,6 +49,12 @@
const route = Taro.useRouter();
const id = route.params?.id as string;
+
+const { detail, isLoading, isError, refetch } = useStandardOrder({ id });
+
+Taro.useDidShow(() => {
+ refetch();
+});
</script>
<style lang="scss">
diff --git a/apps/housekeepingMiniApp/src/subpackages/mine/mineReserveServiceDetail/InnerPage.vue b/apps/housekeepingMiniApp/src/subpackages/mine/mineReserveServiceDetail/InnerPage.vue
index 4db52ca..4ff3173 100644
--- a/apps/housekeepingMiniApp/src/subpackages/mine/mineReserveServiceDetail/InnerPage.vue
+++ b/apps/housekeepingMiniApp/src/subpackages/mine/mineReserveServiceDetail/InnerPage.vue
@@ -15,6 +15,10 @@
:endTime="detail?.endTime"
:supplierEnterpriseName="detail?.supplierEnterpriseName"
:remark="detail?.remark"
+ :serverContactPhoneNumbers="detail?.serverContactPhoneNumbers"
+ :showServerContactPhoneNumbers="
+ detail.appointmentStatus === EnumStandardOrderAppointmentStatus.WaitServe
+ "
>
<template #status>
{{ EnumStandardOrderAppointmentStatusText[detail?.appointmentStatus] }}
@@ -34,7 +38,7 @@
class="business-card-btn"
v-if="
detail.taskCheckReceiveStatus == EnumTaskCheckReceiveStatus.Completed &&
- detail.appointmentStatus === EnumStandardOrderAppointmentStatus.WaitSure
+ detail.appointmentStatus === EnumStandardOrderAppointmentStatus.WaitServe
"
@click="goConfirm"
>鏈嶅姟纭</PageFooterBtn
diff --git a/packages/components/src/Card/MineServiceDetailView.vue b/packages/components/src/Card/MineServiceDetailView.vue
index 15fc8dc..4692699 100644
--- a/packages/components/src/Card/MineServiceDetailView.vue
+++ b/packages/components/src/Card/MineServiceDetailView.vue
@@ -33,6 +33,11 @@
<div class="mine-service-detail-view-list-item">{{ supplierEnterpriseName }}</div>
</template>
</ListItem>
+ <ListItem title="鑱旂郴鐢佃瘽" :showArrow="false" v-if="showServerContactPhoneNumbers">
+ <template #extra>
+ <div class="mine-service-detail-view-list-item">{{ serverContactPhoneNumbers }}</div>
+ </template>
+ </ListItem>
<ListItem title="澶囨敞" :showArrow="false">
<template #extra>
<div class="mine-service-detail-view-list-item">{{ remark }}</div>
@@ -69,11 +74,14 @@
supplierEnterpriseName?: string;
remark?: string;
serverContactPhoneNumbers?: string;
+ showServerContactPhoneNumbers?: boolean;
statusText?: string;
};
-const props = withDefaults(defineProps<Props>(), {});
+const props = withDefaults(defineProps<Props>(), {
+ showServerContactPhoneNumbers: false,
+});
</script>
<style lang="scss">
diff --git a/packages/hooks/standardOrder.ts b/packages/hooks/standardOrder.ts
index 60895aa..f044072 100644
--- a/packages/hooks/standardOrder.ts
+++ b/packages/hooks/standardOrder.ts
@@ -6,6 +6,7 @@
import { useInfiniteLoading } from '@12333/hooks';
import {
EnumGetStandardOrdersQueryPartAEnterpriseOrderStatus,
+ EnumGetStandardOrdersQueryScene,
EnumGetStandardOrdersQuerySupplierEnterpriseOrderStatus,
EnumStandardOrderAppointmentStatus,
EnumStandardOrderPayStatus,
@@ -152,10 +153,11 @@
type UseStandardOrderOptions = {
id: MaybeRef<string>;
+ scene?: EnumGetStandardOrdersQueryScene;
onSuccess?: (data: API.GetStandardOrderQueryResult) => any;
};
-export function useStandardOrder({ id, onSuccess }: UseStandardOrderOptions) {
+export function useStandardOrder({ id, scene, onSuccess }: UseStandardOrderOptions) {
const {
isLoading,
isError,
@@ -166,6 +168,7 @@
queryFn: async () => {
const params: API.APIgetStandardOrderParams = {
id: unref(id),
+ scene: scene,
};
return await standardOrderServices.getStandardOrder(params, {
showLoading: false,
--
Gitblit v1.10.0