From 9d7d85f93b9e0b752d79559f5caac31fd2f00c82 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期三, 31 十二月 2025 09:31:37 +0800
Subject: [PATCH] fix: bug
---
apps/housekeepingMiniApp/src/subpackages/mine/mineOrderDetail/InnerPage.vue | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 106 insertions(+), 8 deletions(-)
diff --git a/apps/housekeepingMiniApp/src/subpackages/mine/mineOrderDetail/InnerPage.vue b/apps/housekeepingMiniApp/src/subpackages/mine/mineOrderDetail/InnerPage.vue
index 835d389..2835bb5 100644
--- a/apps/housekeepingMiniApp/src/subpackages/mine/mineOrderDetail/InnerPage.vue
+++ b/apps/housekeepingMiniApp/src/subpackages/mine/mineOrderDetail/InnerPage.vue
@@ -1,16 +1,67 @@
<template>
- <!-- <LoadingLayout :loading="isLoading" :error="isError" :loadError="refetch"> -->
- <ContentScrollView hasPaddingTop>
- <MineServiceDetailView />
- </ContentScrollView>
- <!-- </LoadingLayout> -->
+ <LoadingLayout :loading="isLoading" :error="isError" :loadError="refetch">
+ <InfiniteLoading
+ commonMode
+ :refetch="refetch"
+ :isLoading="isLoading"
+ :isError="isError"
+ :showMoreText="false"
+ scrollViewClassName="common-page-infinite-scroll-list"
+ >
+ <MineServiceDetailView
+ :contactName="detail?.serverNames"
+ :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>
+ </InfiniteLoading>
+ <PageFooter
+ class="order-settle-bar"
+ v-if="
+ detail?.partAEnterpriseOrderStatus ===
+ EnumGetStandardOrdersQueryPartAEnterpriseOrderStatus.Wait
+ "
+ >
+ <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" @click="payStandardOrder"
+ >绔嬪嵆涓嬪崟</PageFooterBtn
+ >
+ </PageFooter>
+ </LoadingLayout>
</template>
<script setup lang="ts">
-import MineServiceDetailView from '../../components/MineServiceDetailView.vue';
+import { MineServiceDetailView } from '@12333/components';
import Taro from '@tarojs/taro';
-import * as standardServiceServices from '@12333/services/apiV2/standardService';
-import { useCheckReceiveTaskUserSubmit } from '@12333/hooks';
+import * as standardOrderServices from '@12333/services/apiV2/standardOrder';
+import { useStandardOrder } from '@12333/hooks';
+import {
+ EnumGetStandardOrdersQueryPartAEnterpriseOrderStatusText,
+ EnumGetStandardOrdersQueryScene,
+ EnumGetStandardOrdersQueryPartAEnterpriseOrderStatus,
+} from '@12333/constants';
+import { Message } from '@12333/utils';
defineOptions({
name: 'InnerPage',
@@ -18,8 +69,55 @@
const route = Taro.useRouter();
const id = route.params?.id as string;
+
+const { detail, isLoading, isError, refetch } = useStandardOrder({
+ id,
+ // scene: EnumGetStandardOrdersQueryScene.PartAEnterpriseOrder,
+ refetchInterval: 3000,
+});
+
+Taro.useDidShow(() => {
+ refetch();
+});
+
+async function payStandardOrder() {
+ try {
+ let params: API.PayStandardOrderCommand = {
+ id: id,
+ };
+ let res = await standardOrderServices.payStandardOrder(params);
+ if (res) {
+ await Taro.requestPayment({
+ timeStamp: res.timestamp,
+ nonceStr: res.nonceStr,
+ package: res.package,
+ signType: res.signType as any,
+ paySign: res.paySign,
+ });
+ Message.success('鏀粯鎴愬姛');
+ refetch();
+ }
+ } catch (error) {}
+}
</script>
<style lang="scss">
@import '@/styles/common.scss';
+
+.mineOrderDetail-page-wrapper {
+ .order-settle-bar {
+ .order-settle-price-wrapper {
+ height: 100%;
+ flex: 1;
+ min-width: 0;
+ display: flex;
+ align-items: center;
+ margin-left: 28px;
+
+ .order-settle-price-label {
+ color: boleGetCssVar('text-color', 'primary');
+ }
+ }
+ }
+}
</style>
--
Gitblit v1.10.0