diff --git a/src/api/pay/wallet/index.ts b/src/api/pay/wallet/balance/index.ts
similarity index 77%
rename from src/api/pay/wallet/index.ts
rename to src/api/pay/wallet/balance/index.ts
index b57deeb0..e5f4a1cd 100644
--- a/src/api/pay/wallet/index.ts
+++ b/src/api/pay/wallet/balance/index.ts
@@ -20,3 +20,8 @@ export interface WalletVO {
export const getWallet = async (params: PayWalletUserReqVO) => {
return await request.get<WalletVO>({ url: `/pay/wallet/get`, params })
}
+
+// 查询会员钱包列表
+export const getWalletPage = async (params) => {
+ return await request.get({ url: `/pay/wallet/page`, params })
+}
diff --git a/src/api/pay/wallet/transaction/index.ts b/src/api/pay/wallet/transaction/index.ts
new file mode 100644
index 00000000..3377ffaa
--- /dev/null
+++ b/src/api/pay/wallet/transaction/index.ts
@@ -0,0 +1,14 @@
+import request from '@/config/axios'
+
+export interface WalletTransactionVO {
+ id: number
+ walletId: number
+ title: string
+ price: number
+ balance: number
+}
+
+// 查询会员钱包流水列表
+export const getWalletTransactionPage = async (params) => {
+ return await request.get({ url: `/pay/wallet-transaction/page`, params })
+}
diff --git a/src/views/member/user/detail/UserAccountInfo.vue b/src/views/member/user/detail/UserAccountInfo.vue
index 13daff48..bb2a06b8 100644
--- a/src/views/member/user/detail/UserAccountInfo.vue
+++ b/src/views/member/user/detail/UserAccountInfo.vue
@@ -47,7 +47,7 @@
<script setup lang="ts">
import { DescriptionsItemLabel } from '@/components/Descriptions'
import * as UserApi from '@/api/member/user'
-import * as WalletApi from '@/api/pay/wallet'
+import * as WalletApi from '@/api/pay/wallet/balance'
import { UserTypeEnum } from '@/utils/constants'
import { fenToYuan } from '@/utils'
diff --git a/src/views/pay/wallet/balance/WalletForm.vue b/src/views/pay/wallet/balance/WalletForm.vue
new file mode 100644
index 00000000..8173e123
--- /dev/null
+++ b/src/views/pay/wallet/balance/WalletForm.vue
@@ -0,0 +1,22 @@
+<template>
+ <Dialog :title="dialogTitle" v-model="dialogVisible" width="800">
+ <WalletTransactionList :wallet-id="walletId" />
+ <template #footer>
+ <el-button @click="dialogVisible = false">取 消</el-button>
+ </template>
+ </Dialog>
+</template>
+<script setup lang="ts">
+import WalletTransactionList from '../transaction/WalletTransactionList.vue'
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const walletId = ref(0)
+/** 打开弹窗 */
+const open = async (theWalletId: number) => {
+ dialogVisible.value = true
+ dialogTitle.value = '钱包余额明细'
+ walletId.value = theWalletId
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+</script>
diff --git a/src/views/pay/wallet/balance/index.vue b/src/views/pay/wallet/balance/index.vue
new file mode 100644
index 00000000..e4c19c6e
--- /dev/null
+++ b/src/views/pay/wallet/balance/index.vue
@@ -0,0 +1,164 @@
+<template>
+ <ContentWrap>
+ <!-- 搜索工作栏 -->
+ <el-form
+ class="-mb-15px"
+ :model="queryParams"
+ ref="queryFormRef"
+ :inline="true"
+ label-width="68px"
+ >
+ <el-form-item label="用户编号" prop="userId">
+ <el-input
+ v-model="queryParams.userId"
+ placeholder="请输入用户编号"
+ clearable
+ @keyup.enter="handleQuery"
+ class="!w-240px"
+ />
+ </el-form-item>
+ <el-form-item label="用户类型" prop="userType">
+ <el-select
+ v-model="queryParams.userType"
+ placeholder="请选择用户类型"
+ clearable
+ class="!w-240px"
+ >
+ <el-option
+ v-for="dict in getIntDictOptions(DICT_TYPE.USER_TYPE)"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="创建时间" prop="createTime">
+ <el-date-picker
+ v-model="queryParams.createTime"
+ value-format="YYYY-MM-DD HH:mm:ss"
+ type="daterange"
+ start-placeholder="开始日期"
+ end-placeholder="结束日期"
+ :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+ class="!w-240px"
+ />
+ </el-form-item>
+ <el-form-item>
+ <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+ <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+ </el-form-item>
+ </el-form>
+ </ContentWrap>
+
+ <!-- 列表 -->
+ <ContentWrap>
+ <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+ <el-table-column label="编号" align="center" prop="id" />
+ <el-table-column label="用户编号" align="center" prop="userId" />
+ <el-table-column label="用户类型" align="center" prop="userType">
+ <template #default="scope">
+ <dict-tag :type="DICT_TYPE.USER_TYPE" :value="scope.row.userType" />
+ </template>
+ </el-table-column>
+ <el-table-column label="余额" align="center" prop="balance">
+ <template #default="{ row }"> {{ fenToYuan(row.balance) }} 元</template>
+ </el-table-column>
+ <el-table-column label="累计支出" align="center" prop="totalExpense">
+ <template #default="{ row }"> {{ fenToYuan(row.totalExpense) }} 元</template>
+ </el-table-column>
+ <el-table-column label="累计充值" align="center" prop="totalRecharge">
+ <template #default="{ row }"> {{ fenToYuan(row.totalRecharge) }} 元</template>
+ </el-table-column>
+ <el-table-column label="冻结金额" align="center" prop="freezePrice">
+ <template #default="{ row }"> {{ fenToYuan(row.freezePrice) }} 元</template>
+ </el-table-column>
+ <el-table-column
+ label="创建时间"
+ align="center"
+ prop="createTime"
+ :formatter="dateFormatter"
+ width="180px"
+ />
+ <el-table-column label="操作" align="center">
+ <template #default="scope">
+ <el-button link type="primary" @click="openForm(scope.row.id)">详情</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <!-- 分页 -->
+ <Pagination
+ :total="total"
+ v-model:page="queryParams.pageNo"
+ v-model:limit="queryParams.pageSize"
+ @pagination="getList"
+ />
+ </ContentWrap>
+
+ <!-- 弹窗 -->
+ <WalletForm ref="formRef" />
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { fenToYuan } from '@/utils'
+import * as WalletApi from '@/api/pay/wallet/balance'
+import WalletForm from './WalletForm.vue'
+
+defineOptions({ name: 'WalletBalance' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+ pageNo: 1,
+ pageSize: 10,
+ userId: null,
+ userType: null,
+ balance: null,
+ totalExpense: null,
+ totalRecharge: null,
+ freezePrice: null,
+ createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+ loading.value = true
+ try {
+ const data = await WalletApi.getWalletPage(queryParams)
+ list.value = data.list
+ total.value = data.total
+ } finally {
+ loading.value = false
+ }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+ queryParams.pageNo = 1
+ getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+ queryFormRef.value.resetFields()
+ handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (id?: number) => {
+ formRef.value.open(id)
+}
+
+/** 初始化 **/
+onMounted(() => {
+ getList()
+})
+</script>
diff --git a/src/views/pay/wallet/rechargePackage/index.vue b/src/views/pay/wallet/rechargePackage/index.vue
index 6034e447..f097577c 100644
--- a/src/views/pay/wallet/rechargePackage/index.vue
+++ b/src/views/pay/wallet/rechargePackage/index.vue
@@ -135,7 +135,6 @@ const queryParams = reactive({
createTime: []
})
const queryFormRef = ref() // 搜索的表单
-const exportLoading = ref(false) // 导出的加载中
/** 查询列表 */
const getList = async () => {
diff --git a/src/views/pay/wallet/transaction/WalletTransactionList.vue b/src/views/pay/wallet/transaction/WalletTransactionList.vue
new file mode 100644
index 00000000..c440778b
--- /dev/null
+++ b/src/views/pay/wallet/transaction/WalletTransactionList.vue
@@ -0,0 +1,68 @@
+<template>
+ <ContentWrap>
+ <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+ <el-table-column label="编号" align="center" prop="id" />
+ <el-table-column label="钱包编号" align="center" prop="walletId" />
+ <el-table-column label="关联业务标题" align="center" prop="title" />
+ <el-table-column label="交易金额" align="center" prop="price">
+ <template #default="{ row }"> {{ fenToYuan(row.price) }} 元</template>
+ </el-table-column>
+ <el-table-column label="钱包余额" align="center" prop="balance">
+ <template #default="{ row }"> {{ fenToYuan(row.balance) }} 元</template>
+ </el-table-column>
+ <el-table-column
+ label="交易时间"
+ align="center"
+ prop="createTime"
+ :formatter="dateFormatter"
+ width="180px"
+ />
+ </el-table>
+ <!-- 分页 -->
+ <Pagination
+ :total="total"
+ v-model:page="queryParams.pageNo"
+ v-model:limit="queryParams.pageSize"
+ @pagination="getList"
+ />
+ </ContentWrap>
+</template>
+
+<script lang="ts" setup>
+import { dateFormatter } from '@/utils/formatTime'
+import * as WalletTransactionApi from '@/api/pay/wallet/transaction'
+import { fenToYuan } from '@/utils'
+defineOptions({ name: 'WalletTransactionList' })
+const { walletId }: { walletId: number } = defineProps({
+ walletId: {
+ type: Number,
+ required: false
+ }
+})
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+ pageNo: 1,
+ pageSize: 10,
+ walletId: null
+})
+const list = ref([]) // 列表的数据
+/** 查询列表 */
+const getList = async () => {
+ loading.value = true
+ try {
+ queryParams.walletId = walletId
+ const data = await WalletTransactionApi.getWalletTransactionPage(queryParams)
+ list.value = data.list
+ total.value = data.total
+ } finally {
+ loading.value = false
+ }
+}
+/** 初始化 **/
+onMounted(() => {
+ getList()
+})
+</script>
+<style scoped lang="scss"></style>