From db35f2d7073e761b3ae841b3f5fa9c3f5e99cf28 Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Thu, 23 May 2024 18:45:37 +0800 Subject: [PATCH] 1 --- .env.development | 8 +- src/api/merchant.js | 46 +++++ src/layout/myAside.vue | 1 + src/router/index.js | 6 + src/views/saleHome/index.vue | 2 +- src/views/saleOrder/indexCount.vue | 117 +----------- src/views/wallet/component/detail.vue | 255 ++++++++++++++++++++++++++ src/views/wallet/component/order.vue | 203 ++++++++++++++++++++ src/views/wallet/index.vue | 44 +++++ 9 files changed, 569 insertions(+), 113 deletions(-) create mode 100644 src/api/merchant.js create mode 100644 src/views/wallet/component/detail.vue create mode 100644 src/views/wallet/component/order.vue create mode 100644 src/views/wallet/index.vue diff --git a/.env.development b/.env.development index 23c6711..8a2f4db 100644 --- a/.env.development +++ b/.env.development @@ -1,7 +1,7 @@ VITE_NOW_TYPE = 'dist' -# VITE_PUSH_URL = 'ws://192.168.1.22:8787' -# VITE_BASE_URL = 'http://192.168.1.22:8546' +VITE_PUSH_URL = 'ws://192.168.1.22:8787' +VITE_BASE_URL = 'http://192.168.1.22:8546' -VITE_PUSH_URL ='wss://erp.lihaink.cn/pull' -VITE_BASE_URL = 'https://erp.lihaink.cn' \ No newline at end of file +# VITE_PUSH_URL ='wss://erp.lihaink.cn/pull' +# VITE_BASE_URL = 'https://erp.lihaink.cn' \ No newline at end of file diff --git a/src/api/merchant.js b/src/api/merchant.js new file mode 100644 index 0000000..a9fbb85 --- /dev/null +++ b/src/api/merchant.js @@ -0,0 +1,46 @@ +import request from '@/utils/axios.js' + +/** + * @description 获取余额和银行信息 + */ +export function amountAccountApi() { + return request.get(`/merchant/Merchant/amount_account`) +} + + +/** + * @description 提现列表 + */ +export function amountTakingListsApi(data) { + return request.get(`/merchant/Merchant/taking_lists`, {params: data}) +} + + +/** +* @description 提现总次数和金额 +*/ +export function amountTakingInfoApi() { + return request.get(`/merchant/Merchant/taking_info`) +} + +/** +* @description 提现操作 +*/ +export function amountWithdrawApi(data) { + return request.post(`/merchant/Merchant/withdraw`, data) +} + +/** + * @description 7日订单统计 + */ +export function financialRecordApi(data) { + return request.get(`/financial/FinancialRecord/lists`, {params: data}) +} + +/** + * @description 余额明细 + */ +export function financialRecordListsApi(data) { + return request.get(`/financial/FinancialRecord/api_lists`, {params: data}) +} + diff --git a/src/layout/myAside.vue b/src/layout/myAside.vue index 38f23ac..36eeca5 100644 --- a/src/layout/myAside.vue +++ b/src/layout/myAside.vue @@ -59,6 +59,7 @@ const list = ref([ }, { name: "purchaseOrder", title: "采购订单", ico: "Van", count: 0 }, { name: "orderCount", title: "订单统计", ico: "DocumentRemove", count: 0 }, + { name: "wallet", title: "余额提现", ico: "Wallet", count: 0 }, // { name: "test", title: "打印", ico: "Tickets", count: 0 }, ]); const aup = () => { diff --git a/src/router/index.js b/src/router/index.js index dd5af33..79a8fcd 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -41,6 +41,12 @@ const routes = [ meta: { title: '订单统计' }, component: () => import('@/views/saleOrder/indexCount.vue'), }, + { + path: '/wallet', + name: 'wallet', + meta: { title: '提现' }, + component: () => import('@/views/wallet/index.vue'), + }, { path: '/test', name: 'test', diff --git a/src/views/saleHome/index.vue b/src/views/saleHome/index.vue index e3efb65..88af3da 100644 --- a/src/views/saleHome/index.vue +++ b/src/views/saleHome/index.vue @@ -227,4 +227,4 @@ onUnmounted(() => { background-color: #999; /* 设置鼠标悬停时滑块的背景色 */ } -, onMounted, onUnmounted + diff --git a/src/views/saleOrder/indexCount.vue b/src/views/saleOrder/indexCount.vue index 4f16d1e..1713812 100644 --- a/src/views/saleOrder/indexCount.vue +++ b/src/views/saleOrder/indexCount.vue @@ -1,24 +1,9 @@