From 90d6f4da9f2077994751580b81d9bed74a43fa66 Mon Sep 17 00:00:00 2001
From: jason <2667446@qq.com>
Date: Sun, 15 Oct 2023 17:47:36 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E9=92=B1=E5=8C=85-=20=E9=92=B1=E5=8C=85?=
=?UTF-8?q?=E4=BD=99=E9=A2=9D=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/pay/wallet/{ => balance}/index.ts | 5 +
.../member/user/detail/UserAccountInfo.vue | 2 +-
src/views/pay/wallet/balance/WalletForm.vue | 99 ++++++++++
src/views/pay/wallet/balance/index.vue | 174 ++++++++++++++++++
.../pay/wallet/rechargePackage/index.vue | 1 -
5 files changed, 279 insertions(+), 2 deletions(-)
rename src/api/pay/wallet/{ => balance}/index.ts (77%)
create mode 100644 src/views/pay/wallet/balance/WalletForm.vue
create mode 100644 src/views/pay/wallet/balance/index.vue
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/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..a633a1be
--- /dev/null
+++ b/src/views/pay/wallet/balance/WalletForm.vue
@@ -0,0 +1,99 @@
+<template>
+ <Dialog :title="dialogTitle" v-model="dialogVisible">
+ <el-form
+ ref="formRef"
+ :model="formData"
+ :rules="formRules"
+ label-width="100px"
+ v-loading="formLoading"
+ >
+ <el-form-item label="用户编号" prop="userId">
+ <el-input v-model="formData.userId" placeholder="请输入用户编号" />
+ </el-form-item>
+ <el-form-item label="用户类型" prop="userType">
+ <el-select v-model="formData.userType" placeholder="请选择用户类型">
+ <el-option label="请选择字典生成" value="" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="余额，单位分" prop="balance">
+ <el-input v-model="formData.balance" placeholder="请输入余额，单位分" />
+ </el-form-item>
+ <el-form-item label="累计支出，单位分" prop="totalExpense">
+ <el-input v-model="formData.totalExpense" placeholder="请输入累计支出，单位分" />
+ </el-form-item>
+ <el-form-item label="累计充值，单位分" prop="totalRecharge">
+ <el-input v-model="formData.totalRecharge" placeholder="请输入累计充值，单位分" />
+ </el-form-item>
+ <el-form-item label="冻结金额，单位分" prop="freezePrice">
+ <el-input v-model="formData.freezePrice" placeholder="请输入冻结金额，单位分" />
+ </el-form-item>
+ </el-form>
+ <template #footer>
+ <el-button @click="dialogVisible = false">取 消</el-button>
+ </template>
+ </Dialog>
+</template>
+<script setup lang="ts">
+import * as WalletApi from '@/api/pay/wallet/balance'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+ id: undefined,
+ userId: undefined,
+ userType: undefined,
+ balance: undefined,
+ totalExpense: undefined,
+ totalRecharge: undefined,
+ freezePrice: undefined
+})
+const formRules = reactive({
+ userId: [{ required: true, message: '用户编号不能为空', trigger: 'blur' }],
+ userType: [{ required: true, message: '用户类型不能为空', trigger: 'change' }],
+ balance: [{ required: true, message: '余额，单位分不能为空', trigger: 'blur' }],
+ totalExpense: [{ required: true, message: '累计支出，单位分不能为空', trigger: 'blur' }],
+ totalRecharge: [{ required: true, message: '累计充值，单位分不能为空', trigger: 'blur' }],
+ freezePrice: [{ required: true, message: '冻结金额，单位分不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+ dialogVisible.value = true
+ dialogTitle.value = t('action.' + type)
+ formType.value = type
+ resetForm()
+ // 修改时，设置数据
+ if (id) {
+ formLoading.value = true
+ try {
+ formData.value = await WalletApi.getWallet(id)
+ } finally {
+ formLoading.value = false
+ }
+ }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+
+/** 重置表单 */
+const resetForm = () => {
+ formData.value = {
+ id: undefined,
+ userId: undefined,
+ userType: undefined,
+ balance: undefined,
+ totalExpense: undefined,
+ totalRecharge: undefined,
+ freezePrice: undefined
+ }
+ formRef.value?.resetFields()
+}
+</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..58754fea
--- /dev/null
+++ b/src/views/pay/wallet/balance/index.vue
@@ -0,0 +1,174 @@
+<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-button type="primary" @click="openForm('create')" v-hasPermi="['pay:wallet:create']">
+ <Icon icon="ep:plus" 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('update', scope.row.id)"
+ v-hasPermi="['pay:wallet:update']"
+ >
+ 编辑
+ </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" @success="getList" />
+</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 = (type: string, id?: number) => {
+ formRef.value.open(type, 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 () => {
From 66ec61080171302caa77f06145d835bb6c2ba7fe Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 16 Oct 2023 21:55:11 +0800
Subject: [PATCH 2/4] =?UTF-8?q?code=20review=EF=BC=9A=E6=96=87=E7=AB=A0?=
=?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mall/promotion/article/ArticleForm.vue | 12 +++--
src/views/mall/promotion/article/index.vue | 48 ++++++-------------
2 files changed, 21 insertions(+), 39 deletions(-)
diff --git a/src/views/mall/promotion/article/ArticleForm.vue b/src/views/mall/promotion/article/ArticleForm.vue
index 36fc1340..92976931 100644
--- a/src/views/mall/promotion/article/ArticleForm.vue
+++ b/src/views/mall/promotion/article/ArticleForm.vue
@@ -8,6 +8,11 @@
label-width="110px"
>
<el-row>
+ <el-col :span="12">
+ <el-form-item label="文章标题" prop="title">
+ <el-input v-model="formData.title" placeholder="请输入文章标题" />
+ </el-form-item>
+ </el-col>
<el-col :span="12">
<el-form-item label="文章分类" prop="categoryId">
<el-select v-model="formData.categoryId" placeholder="请选择">
@@ -20,11 +25,6 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item label="文章标题" prop="title">
- <el-input v-model="formData.title" placeholder="请输入文章标题" />
- </el-form-item>
- </el-col>
<el-col :span="12">
<el-form-item label="文章作者" prop="author">
<el-input v-model="formData.author" placeholder="请输入文章作者" />
@@ -40,6 +40,7 @@
<UploadImg v-model="formData.picUrl" height="80px" />
</el-form-item>
</el-col>
+ <!-- TODO @puhui999：浏览次数，不能修改 -->
<el-col :span="12">
<el-form-item label="浏览次数" prop="browseCount">
<el-input-number
@@ -68,6 +69,7 @@
</el-radio-group>
</el-form-item>
</el-col>
+ <!-- TODO @puhui999：可以使用 SpuTableSelect -->
<el-col :span="12">
<el-form-item label="商品关联" prop="spuId">
<el-select v-model="formData.spuId" placeholder="请选择">
diff --git a/src/views/mall/promotion/article/index.vue b/src/views/mall/promotion/article/index.vue
index a5bbd73c..fb5c48d8 100644
--- a/src/views/mall/promotion/article/index.vue
+++ b/src/views/mall/promotion/article/index.vue
@@ -78,51 +78,31 @@
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
- <el-table-column align="center" label="文章分类" prop="categoryId">
- <template #default="scope">
- {{ categoryList.find((item) => item.id === scope.row.categoryId)?.name }}
- </template>
- </el-table-column>
- <el-table-column align="center" label="关联商品" prop="spuId" width="300">
- <template #default="scope">
- <el-image
- :preview-src-list="[spuList.find((item) => item.id === scope.row.spuId)?.picUrl]"
- :src="spuList.find((item) => item.id === scope.row.spuId)?.picUrl"
- class="mr-[10px] h-40px w-40px v-middle"
- preview-teleported
- />
- {{ spuList.find((item) => item.id === scope.row.spuId)?.name }}
- </template>
- </el-table-column>
- <el-table-column align="center" label="文章标题" prop="title" />
- <el-table-column align="center" label="文章作者" prop="author" />
- <el-table-column align="center" label="文章封面" prop="picUrl">
+ <el-table-column align="center" label="编号" prop="id" min-width="60" />
+ <el-table-column align="center" label="封面" prop="picUrl" min-width="80">
<template #default="{ row }">
<el-image :src="row.picUrl" class="h-30px w-30px" @click="imagePreview(row.picUrl)" />
</template>
</el-table-column>
- <el-table-column align="center" label="文章简介" prop="introduction" />
- <el-table-column align="center" label="浏览次数" prop="browseCount" />
- <el-table-column align="center" label="排序" prop="sort" />
- <el-table-column align="center" label="状态" prop="status">
+ <el-table-column align="center" label="标题" prop="title" min-width="180" />
+ <el-table-column align="center" label="分类" prop="categoryId" min-width="180">
+ <template #default="scope">
+ {{ categoryList.find((item) => item.id === scope.row.categoryId)?.name }}
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="浏览量" prop="browseCount" min-width="180" />
+ <el-table-column align="center" label="作者" prop="author" min-width="180" />
+ <el-table-column align="center" label="文章简介" prop="introduction" min-width="250" />
+ <el-table-column align="center" label="排序" prop="sort" min-width="60" />
+ <el-table-column align="center" label="状态" prop="status" min-width="60">
<template #default="scope">
<dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
- <el-table-column align="center" label="热门" prop="recommendHot">
- <template #default="scope">
- <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.recommendHot" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="轮播图" prop="recommendBanner">
- <template #default="scope">
- <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.recommendBanner" />
- </template>
- </el-table-column>
<el-table-column
:formatter="dateFormatter"
align="center"
- label="创建时间"
+ label="发布时间"
prop="createTime"
width="180px"
/>
From 8626bccc4c7258a3676ef6174de3262a8f88397a Mon Sep 17 00:00:00 2001
From: jason <2667446@qq.com>
Date: Mon, 16 Oct 2023 22:32:10 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E9=92=B1=E5=8C=85=20-=20=E9=92=B1=E5=8C=85?=
=?UTF-8?q?=E4=BD=99=E9=A2=9D=E6=B5=81=E6=B0=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/pay/wallet/transaction/index.ts | 14 +++
src/views/pay/wallet/balance/WalletForm.vue | 91 ++-----------------
src/views/pay/wallet/balance/index.vue | 20 +---
.../transaction/WalletTransactionList.vue | 68 ++++++++++++++
4 files changed, 94 insertions(+), 99 deletions(-)
create mode 100644 src/api/pay/wallet/transaction/index.ts
create mode 100644 src/views/pay/wallet/transaction/WalletTransactionList.vue
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/pay/wallet/balance/WalletForm.vue b/src/views/pay/wallet/balance/WalletForm.vue
index a633a1be..8173e123 100644
--- a/src/views/pay/wallet/balance/WalletForm.vue
+++ b/src/views/pay/wallet/balance/WalletForm.vue
@@ -1,99 +1,22 @@
<template>
- <Dialog :title="dialogTitle" v-model="dialogVisible">
- <el-form
- ref="formRef"
- :model="formData"
- :rules="formRules"
- label-width="100px"
- v-loading="formLoading"
- >
- <el-form-item label="用户编号" prop="userId">
- <el-input v-model="formData.userId" placeholder="请输入用户编号" />
- </el-form-item>
- <el-form-item label="用户类型" prop="userType">
- <el-select v-model="formData.userType" placeholder="请选择用户类型">
- <el-option label="请选择字典生成" value="" />
- </el-select>
- </el-form-item>
- <el-form-item label="余额，单位分" prop="balance">
- <el-input v-model="formData.balance" placeholder="请输入余额，单位分" />
- </el-form-item>
- <el-form-item label="累计支出，单位分" prop="totalExpense">
- <el-input v-model="formData.totalExpense" placeholder="请输入累计支出，单位分" />
- </el-form-item>
- <el-form-item label="累计充值，单位分" prop="totalRecharge">
- <el-input v-model="formData.totalRecharge" placeholder="请输入累计充值，单位分" />
- </el-form-item>
- <el-form-item label="冻结金额，单位分" prop="freezePrice">
- <el-input v-model="formData.freezePrice" placeholder="请输入冻结金额，单位分" />
- </el-form-item>
- </el-form>
+ <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 * as WalletApi from '@/api/pay/wallet/balance'
-
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
-
+import WalletTransactionList from '../transaction/WalletTransactionList.vue'
const dialogVisible = ref(false) // 弹窗的是否展示
const dialogTitle = ref('') // 弹窗的标题
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const formData = ref({
- id: undefined,
- userId: undefined,
- userType: undefined,
- balance: undefined,
- totalExpense: undefined,
- totalRecharge: undefined,
- freezePrice: undefined
-})
-const formRules = reactive({
- userId: [{ required: true, message: '用户编号不能为空', trigger: 'blur' }],
- userType: [{ required: true, message: '用户类型不能为空', trigger: 'change' }],
- balance: [{ required: true, message: '余额，单位分不能为空', trigger: 'blur' }],
- totalExpense: [{ required: true, message: '累计支出，单位分不能为空', trigger: 'blur' }],
- totalRecharge: [{ required: true, message: '累计充值，单位分不能为空', trigger: 'blur' }],
- freezePrice: [{ required: true, message: '冻结金额，单位分不能为空', trigger: 'blur' }]
-})
-const formRef = ref() // 表单 Ref
-
+const walletId = ref(0)
/** 打开弹窗 */
-const open = async (type: string, id?: number) => {
+const open = async (theWalletId: number) => {
dialogVisible.value = true
- dialogTitle.value = t('action.' + type)
- formType.value = type
- resetForm()
- // 修改时，设置数据
- if (id) {
- formLoading.value = true
- try {
- formData.value = await WalletApi.getWallet(id)
- } finally {
- formLoading.value = false
- }
- }
+ dialogTitle.value = '钱包余额明细'
+ walletId.value = theWalletId
}
defineExpose({ open }) // 提供 open 方法，用于打开弹窗
-
-/** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-
-/** 重置表单 */
-const resetForm = () => {
- formData.value = {
- id: undefined,
- userId: undefined,
- userType: undefined,
- balance: undefined,
- totalExpense: undefined,
- totalRecharge: undefined,
- freezePrice: undefined
- }
- formRef.value?.resetFields()
-}
</script>
diff --git a/src/views/pay/wallet/balance/index.vue b/src/views/pay/wallet/balance/index.vue
index 58754fea..e4c19c6e 100644
--- a/src/views/pay/wallet/balance/index.vue
+++ b/src/views/pay/wallet/balance/index.vue
@@ -46,9 +46,6 @@
<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-button type="primary" @click="openForm('create')" v-hasPermi="['pay:wallet:create']">
- <Icon icon="ep:plus" class="mr-5px" /> 新增
- </el-button>
</el-form-item>
</el-form>
</ContentWrap>
@@ -84,14 +81,7 @@
/>
<el-table-column label="操作" align="center">
<template #default="scope">
- <el-button
- link
- type="primary"
- @click="openForm('update', scope.row.id)"
- v-hasPermi="['pay:wallet:update']"
- >
- 编辑
- </el-button>
+ <el-button link type="primary" @click="openForm(scope.row.id)">详情</el-button>
</template>
</el-table-column>
</el-table>
@@ -104,8 +94,8 @@
/>
</ContentWrap>
- <!-- 表单弹窗：添加/修改 -->
- <WalletForm ref="formRef" @success="getList" />
+ <!-- 弹窗 -->
+ <WalletForm ref="formRef" />
</template>
<script setup lang="ts">
@@ -163,8 +153,8 @@ const resetQuery = () => {
/** 添加/修改操作 */
const formRef = ref()
-const openForm = (type: string, id?: number) => {
- formRef.value.open(type, id)
+const openForm = (id?: number) => {
+ formRef.value.open(id)
}
/** 初始化 **/
diff --git a/src/views/pay/wallet/transaction/WalletTransactionList.vue b/src/views/pay/wallet/transaction/WalletTransactionList.vue
new file mode 100644
index 00000000..fa354bfb
--- /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>
From c3f06f5fbe343b954f4f25ef2010a6c694f3dcf3 Mon Sep 17 00:00:00 2001
From: jason <2667446@qq.com>
Date: Mon, 16 Oct 2023 22:45:32 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E9=92=B1=E5=8C=85=20-=20=E9=92=B1=E5=8C=85?=
=?UTF-8?q?=E4=BD=99=E9=A2=9D=E6=B5=81=E6=B0=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/pay/wallet/transaction/WalletTransactionList.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/pay/wallet/transaction/WalletTransactionList.vue b/src/views/pay/wallet/transaction/WalletTransactionList.vue
index fa354bfb..c440778b 100644
--- a/src/views/pay/wallet/transaction/WalletTransactionList.vue
+++ b/src/views/pay/wallet/transaction/WalletTransactionList.vue
@@ -11,7 +11,7 @@
<template #default="{ row }"> {{ fenToYuan(row.balance) }} 元</template>
</el-table-column>
<el-table-column
- label="创建时间"
+ label="交易时间"
align="center"
prop="createTime"
:formatter="dateFormatter"