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/incomeDetail/InnerPage.vue | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/apps/cMiniApp/src/subpackages/wallet/incomeDetail/InnerPage.vue b/apps/cMiniApp/src/subpackages/wallet/incomeDetail/InnerPage.vue
index 3e82674..8693177 100644
--- a/apps/cMiniApp/src/subpackages/wallet/incomeDetail/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/wallet/incomeDetail/InnerPage.vue
@@ -1,5 +1,5 @@
<template>
- <ProTabs
+ <!-- <ProTabs
v-model="queryState.type"
name="home-tab"
:showPaneContent="false"
@@ -11,11 +11,9 @@
<ProTabPane :title="`鍏ㄩ儴`" :pane-key="0"></ProTabPane>
<ProTabPane :title="`鏀跺叆`" :pane-key="EnumUserWalletTransactionType.Income"></ProTabPane>
<ProTabPane :title="`鎻愮幇`" :pane-key="EnumUserWalletTransactionType.Withdraw"></ProTabPane>
- </ProTabs>
+ </ProTabs> -->
<List>
- <IncomeDetailListItem
- :item="`鏀跺叆锛氾骏${toThousand(sumIncome)} 鎻愮幇锛氾骏${toThousand(sumWithdraw)}`"
- >
+ <IncomeDetailListItem :item="`鏀跺叆锛氾骏${toThousand(sumIncome)} `">
<template #title>
<div class="income-detail-time-picker">
<ChooseInputWithDatePicker
@@ -89,11 +87,11 @@
page: pageParam,
orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
},
- // type: EnumUserWalletTransactionType.Income,
+ type: EnumUserWalletTransactionType.Income,
};
- if (Number(queryState.type)) {
- params.type = queryState.type;
- }
+ // if (Number(queryState.type)) {
+ // params.type = queryState.type;
+ // }
if (queryState.month) {
params.createdTimeStart = dayjs(queryState.month).startOf('month').format('YYYY-MM-DD');
params.createdTimeEnd = dayjs(queryState.month).endOf('month').format('YYYY-MM-DD');
--
Gitblit v1.9.1