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/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/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" > + + + + + @@ -20,11 +25,6 @@ - - - - - @@ -40,6 +40,7 @@ + + 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 @@ - - - - - - - - - + + - - - - + + + + + + + + + - - - - - - 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..e4c19c6e --- /dev/null +++ b/src/views/pay/wallet/balance/index.vue @@ -0,0 +1,164 @@ + + + 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 @@ + + + +