From d7116672ea36e413309f4cd0e85eaa5fff5d5b8b Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 26 十二月 2025 16:06:48 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/housekeepingMiniApp/src/subpackages/mine/mineOrderDetail/InnerPage.vue | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 7 deletions(-)
diff --git a/apps/housekeepingMiniApp/src/subpackages/mine/mineOrderDetail/InnerPage.vue b/apps/housekeepingMiniApp/src/subpackages/mine/mineOrderDetail/InnerPage.vue
index 6c7104c..095b100 100644
--- a/apps/housekeepingMiniApp/src/subpackages/mine/mineOrderDetail/InnerPage.vue
+++ b/apps/housekeepingMiniApp/src/subpackages/mine/mineOrderDetail/InnerPage.vue
@@ -1,6 +1,13 @@
<template>
<LoadingLayout :loading="isLoading" :error="isError" :loadError="refetch">
- <ContentScrollView hasPaddingTop>
+ <InfiniteLoading
+ commonMode
+ :refetch="refetch"
+ :isLoading="isLoading"
+ :isError="isError"
+ :showMoreText="false"
+ scrollViewClassName="common-page-infinite-scroll-list"
+ >
<MineServiceDetailView
:contactName="detail?.name"
:contactPhoneNumber="detail?.contactPhoneNumber"
@@ -25,13 +32,21 @@
}}
</template>
</MineServiceDetailView>
- </ContentScrollView>
- <PageFooter class="order-settle-bar">
+ </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">绔嬪嵆涓嬪崟</PageFooterBtn>
+ <PageFooterBtn type="primary" class="business-card-btn" @click="payStandardOrder"
+ >绔嬪嵆涓嬪崟</PageFooterBtn
+ >
</PageFooter>
</LoadingLayout>
</template>
@@ -39,9 +54,14 @@
<script setup lang="ts">
import { MineServiceDetailView } from '@12333/components';
import Taro from '@tarojs/taro';
-import * as standardServiceServices from '@12333/services/apiV2/standardService';
+import * as standardOrderServices from '@12333/services/apiV2/standardOrder';
import { useStandardOrder } from '@12333/hooks';
-import { EnumGetStandardOrdersQueryPartAEnterpriseOrderStatusText } from '@12333/constants';
+import {
+ EnumGetStandardOrdersQueryPartAEnterpriseOrderStatusText,
+ EnumGetStandardOrdersQueryScene,
+ EnumGetStandardOrdersQueryPartAEnterpriseOrderStatus,
+} from '@12333/constants';
+import { Message } from '@12333/utils';
defineOptions({
name: 'InnerPage',
@@ -50,11 +70,35 @@
const route = Taro.useRouter();
const id = route.params?.id as string;
-const { detail, isLoading, isError, refetch } = useStandardOrder({ id });
+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">
--
Gitblit v1.10.0