From 12f08c16ee7c7176368b5961fe104ed698227a8d Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期四, 11 九月 2025 17:41:50 +0800
Subject: [PATCH] Merge branch 'master' into dev-v1.1
---
apps/cMiniApp/src/subpackages/wallet/incomeDetailInfo/InnerPage.vue | 62 ++++++++++++++++++++++--------
1 files changed, 45 insertions(+), 17 deletions(-)
diff --git a/apps/cMiniApp/src/subpackages/wallet/incomeDetailInfo/InnerPage.vue b/apps/cMiniApp/src/subpackages/wallet/incomeDetailInfo/InnerPage.vue
index 3b14523..5cce9d9 100644
--- a/apps/cMiniApp/src/subpackages/wallet/incomeDetailInfo/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/wallet/incomeDetailInfo/InnerPage.vue
@@ -1,49 +1,77 @@
<template>
- <div class="income-detail-info-money">
- <div class="income-detail-info-money-value">
- <div class="income-detail-info-money-value-unit">锟�</div>
- <div class="income-detail-info-money-value-num">{{ '33.33' }}</div>
- </div>
- <div class="income-detail-info-money-type">{{ '鏀跺叆' }}</div>
- </div>
+ <WithdrawMoneyCard
+ :money="detail?.amount"
+ :title="EnumUserWalletTransactionTypeText[detail.type]"
+ ></WithdrawMoneyCard>
<List>
<ListItem title="娴佹按鍙�" :show-arrow="false">
<template #extra>
- <div class="income-detail-info-value">{{ '5893485943859843095843' }}</div>
+ <div class="income-detail-info-value">{{ detail?.code }}</div>
</template>
</ListItem>
<ListItem title="浼佷笟鍚嶇О" :show-arrow="false">
<template #extra>
- <div class="income-detail-info-value">{{ '瀹佹尝浜哄姏鏃犲咖' }}</div>
+ <div class="income-detail-info-value">{{ detail?.enterpriseName }}</div>
</template>
</ListItem>
<ListItem title="缁撶畻鏃ユ湡" :show-arrow="false">
<template #extra>
- <div class="income-detail-info-value">{{ '2024.11.13' }}</div>
+ <div class="income-detail-info-value">
+ {{ dayjs(detail?.settlementTime).format('YYYY-MM-DD') }}
+ </div>
</template>
</ListItem>
- <ListItem title="缁撶畻鍗曞唴瀹�" :show-arrow="false">
+ <ListItem title="缁撶畻閲戦" :show-arrow="false">
<template #extra>
- <div class="income-detail-info-value">{{ '33.33鍏�' }}</div>
+ <div class="income-detail-info-value">
+ {{ `${toThousand(detail?.settlementAmount)}鍏僠 }}
+ </div>
</template>
</ListItem>
- <ListItem title="缁撶畻鍗曞唴瀹�" :show-arrow="false">
+ <ListItem title="瀹炲彂閲戦" :show-arrow="false">
<template #extra>
- <div class="income-detail-info-value">{{ '33.33鍏�' }}</div>
+ <div class="income-detail-info-value">{{ `${toThousand(detail?.amount)}鍏僠 }}</div>
</template>
</ListItem>
</List>
</template>
<script setup lang="ts">
-import { List, ListItem } from '@12333/components';
-import { useUserStore } from '@/stores/modules/user';
+import { List, ListItem, WithdrawMoneyCard } from '@12333/components';
+import { EnumUserWalletTransactionType, EnumUserWalletTransactionTypeText } from '@12333/constants';
+import Taro from '@tarojs/taro';
+import * as userServices from '@12333/services/apiV2/user';
+import { useQuery } from '@tanstack/vue-query';
+import dayjs from 'dayjs';
+import { toThousand } from '@12333/utils';
defineOptions({
name: 'InnerPage',
});
-const userStore = useUserStore();
+const router = Taro.useRouter();
+const id = router.params?.id;
+
+const {
+ isLoading,
+ isError,
+ data: detail,
+ refetch,
+} = useQuery({
+ queryKey: ['userServices/getPersonalUserTransaction', id],
+ queryFn: async () => {
+ return await userServices.getPersonalUserTransaction(
+ { id: id },
+ {
+ showLoading: false,
+ }
+ );
+ },
+ placeholderData: () => ({} as API.GetPersonalUserTransactionQueryResult),
+ onSuccess(data) {
+ // if (data.isExistTradeChatRecord) setTrue();
+ },
+});
</script>
<style lang="scss">
--
Gitblit v1.9.1