From 34e523d5ed7f25a0bc20532577ccde90386352aa Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 23 十月 2025 15:22:41 +0800
Subject: [PATCH] Merge branch 'dev-2.2.3' of http://120.26.58.240:8888/r/JYBIndependentFront into dev-2.2.3
---
src/views/BalanceManage/components/RewardGrantRecordView.vue | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/views/BalanceManage/components/RewardGrantRecordView.vue b/src/views/BalanceManage/components/RewardGrantRecordView.vue
index 1c09155..2b5c6e2 100644
--- a/src/views/BalanceManage/components/RewardGrantRecordView.vue
+++ b/src/views/BalanceManage/components/RewardGrantRecordView.vue
@@ -10,9 +10,9 @@
<script setup lang="ts">
import { AppContainer, useTable, ProTableV2 } from '@bole-core/components';
import { OrderInputType } from '@bole-core/core';
-// import * as parkBountyApplyServices from '@/services/api/ParkBountyApply';
+import * as parkBountyApplyServices from '@/services/api/ParkBountyApply';
import { useUser } from '@/hooks';
-// import { TransferToStatusEnumText } from '@/constants';
+import { TransferToStatusEnumText } from '@/constants';
defineOptions({
name: 'RewardGrantRecordView',
@@ -47,14 +47,12 @@
];
const route = useRoute();
-const router = useRouter();
-const id = route.params.id as string;
const BaseState = {
loading: true,
};
const state = reactive({ ...BaseState });
-// const { userDetail } = useUser();
+const { userDetail } = useUser();
const {
getDataSource: getList,
@@ -70,7 +68,7 @@
page: pageIndex,
orderInput: extraParamState.orderInput,
},
- // id: userDetail.value?.userId ?? '',
+ id: userDetail.value?.userId ?? '',
};
let res = await parkBountyApplyServices.getParkCustomerBountySettleList(params, {
showLoading: !state.loading,
@@ -83,7 +81,7 @@
orderInput: [{ property: 'settleTime', order: OrderInputType.Desc }],
},
columnsRenderProps: {
- // transferToStatus: { type: 'enum', valueEnum: TransferToStatusEnumText },
+ transferToStatus: { type: 'enum', valueEnum: TransferToStatusEnumText },
transferToTime: { type: 'date', format: 'YYYY-MM-DD' },
applyMonth: { type: 'date', format: 'YYYY骞碝M鏈�' },
transferToAmount: { type: 'money' },
--
Gitblit v1.9.1