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/3] =?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({ 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 @@ 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 @@ + + + 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 8626bccc4c7258a3676ef6174de3262a8f88397a Mon Sep 17 00:00:00 2001 From: jason <2667446@qq.com> Date: Mon, 16 Oct 2023 22:32:10 +0800 Subject: [PATCH 2/3] =?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 @@ 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 @@ 搜索 重置 - - 新增 - @@ -84,14 +81,7 @@ /> @@ -104,8 +94,8 @@ /> - - + + + 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 3/3] =?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 @@