From 258008afa298f6baf19741d363463a02bdc4ca0d Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 11 九月 2025 14:56:51 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
packages/components/src/List/IncomeDetailListItem.vue | 4 +++-
apps/cMiniApp/project.private.config.json | 7 -------
apps/cMiniApp/src/subpackages/wallet/incomeDetailInfo/InnerPage.vue | 8 +++++---
apps/cMiniApp/src/pages/mine/index.vue | 2 +-
4 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/apps/cMiniApp/project.private.config.json b/apps/cMiniApp/project.private.config.json
index 35ce4dc..61a4ebe 100644
--- a/apps/cMiniApp/project.private.config.json
+++ b/apps/cMiniApp/project.private.config.json
@@ -85,13 +85,6 @@
"query": "",
"launchMode": "default",
"scene": null
- },
- {
- "name": "",
- "pathName": "subpackages/wallet/mineWallet/mineWallet",
- "query": "",
- "launchMode": "default",
- "scene": null
}
]
}
diff --git a/apps/cMiniApp/src/pages/mine/index.vue b/apps/cMiniApp/src/pages/mine/index.vue
index 0804ffb..c578ff5 100644
--- a/apps/cMiniApp/src/pages/mine/index.vue
+++ b/apps/cMiniApp/src/pages/mine/index.vue
@@ -42,7 +42,7 @@
<ContentScrollView v-if="isLogin" class="mine-content-scroll-view">
<List class="mine-list-wrapper mine-balance">
<div class="mine-balance-title">鎴戠殑浣欓</div>
- <div class="mine-balance-money">锟{ toThousand(0) }}</div>
+ <div class="mine-balance-money">锟{ toThousand(userDetail?.balance) }}</div>
<div class="mine-balance-btn" @click="goMineWallet">
杩涘叆鎴戠殑閽卞寘
<img :src="IconArrow" class="mine-balance-btn-icon" />
diff --git a/apps/cMiniApp/src/subpackages/wallet/incomeDetailInfo/InnerPage.vue b/apps/cMiniApp/src/subpackages/wallet/incomeDetailInfo/InnerPage.vue
index ef538f4..5cce9d9 100644
--- a/apps/cMiniApp/src/subpackages/wallet/incomeDetailInfo/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/wallet/incomeDetailInfo/InnerPage.vue
@@ -1,6 +1,6 @@
<template>
<WithdrawMoneyCard
- :money="100"
+ :money="detail?.amount"
:title="EnumUserWalletTransactionTypeText[detail.type]"
></WithdrawMoneyCard>
<List>
@@ -23,12 +23,14 @@
</ListItem>
<ListItem title="缁撶畻閲戦" :show-arrow="false">
<template #extra>
- <div class="income-detail-info-value">{{ toThousand(detail?.settlementAmount) }}</div>
+ <div class="income-detail-info-value">
+ {{ `${toThousand(detail?.settlementAmount)}鍏僠 }}
+ </div>
</template>
</ListItem>
<ListItem title="瀹炲彂閲戦" :show-arrow="false">
<template #extra>
- <div class="income-detail-info-value">{{ toThousand(detail?.amount) }}</div>
+ <div class="income-detail-info-value">{{ `${toThousand(detail?.amount)}鍏僠 }}</div>
</template>
</ListItem>
</List>
diff --git a/packages/components/src/List/IncomeDetailListItem.vue b/packages/components/src/List/IncomeDetailListItem.vue
index 9a0028b..4025b52 100644
--- a/packages/components/src/List/IncomeDetailListItem.vue
+++ b/packages/components/src/List/IncomeDetailListItem.vue
@@ -4,7 +4,7 @@
<slot name="title">
<div class="income-detail-list-item-title">
<div class="income-detail-list-item-title-text">{{ title }}</div>
- <div class="income-detail-list-item-title-value">{{ funds }}</div>
+ <div class="income-detail-list-item-title-value">{{ toThousand(funds) }}</div>
</div>
</slot>
<div class="income-detail-list-item-content">
@@ -16,6 +16,8 @@
</template>
<script setup lang="ts">
+import { toThousand } from '@12333/utils';
+
defineOptions({
name: 'IncomeDetailListItem',
});
--
Gitblit v1.9.1