From d50e21bf3b6e44e16df9c0d416d4a71dd36f58b4 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期二, 23 九月 2025 10:38:47 +0800
Subject: [PATCH] Merge branch 'master' into dev-v1.1.1
---
apps/cMiniApp/src/subpackages/wallet/incomeDetail/InnerPage.vue | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/apps/cMiniApp/src/subpackages/wallet/incomeDetail/InnerPage.vue b/apps/cMiniApp/src/subpackages/wallet/incomeDetail/InnerPage.vue
index 102958a..68bd0c0 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,17 +11,16 @@
<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
v-model="queryState.month"
type="year-month"
:max-date="nowDate"
+ format="YYYY-MM"
/>
<IconFont name="triangle-down" class="income-detail-time-picker-icon"></IconFont>
</div>
@@ -54,7 +53,6 @@
ProTabs,
ProTabPane,
} from '@12333/components';
-import { useUserStore } from '@/stores/modules/user';
import { IconFont } from '@nutui/icons-vue-taro';
import Taro from '@tarojs/taro';
import dayjs from 'dayjs';
@@ -67,7 +65,6 @@
name: 'InnerPage',
});
-const userStore = useUserStore();
const nowDate = dayjs().toDate();
const queryState = reactive({
@@ -90,11 +87,10 @@
page: pageParam,
orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
},
- 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');
@@ -109,12 +105,16 @@
);
function goIncomeDetailInfo(row: API.GetPersonalUserTransactionsQueryResultItem) {
- Taro.navigateTo({
- url: `${RouterPath.incomeDetailInfo}&id=${row.id}`,
- });
- // Taro.navigateTo({
- // url: `${RouterPath.withdrawDetailInfo}`,
- // });
+ if (row.type === EnumUserWalletTransactionType.Income) {
+ Taro.navigateTo({
+ url: `${RouterPath.incomeDetailInfo}?id=${row.id}`,
+ });
+ }
+ if (row.type === EnumUserWalletTransactionType.Withdraw) {
+ Taro.navigateTo({
+ url: `${RouterPath.withdrawDetailInfo}?id=${row.id}`,
+ });
+ }
}
</script>
--
Gitblit v1.9.1