From 36dcd802cce02440389109146f4ac4dcab9241bb Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Tue, 14 May 2024 18:44:55 +0800
Subject: [PATCH] add
---
api/balance.js | 21 +++++++++---
config/app.js | 2 +-
pageQuota/Balance/bindAccout.vue | 7 ++--
pageQuota/Balance/detail.vue | 58 ++++++++++++++++++++------------
pageQuota/Balance/index.vue | 53 +++++++++++++++++++++--------
store/user.js | 4 +--
6 files changed, 97 insertions(+), 48 deletions(-)
diff --git a/api/balance.js b/api/balance.js
index 05da9e1..8190c17 100644
--- a/api/balance.js
+++ b/api/balance.js
@@ -2,16 +2,27 @@ import request from '@/utils/request';
//报价单列表
export const bindCradApi = (data) => {
- return request.post('/merchant/merchant/add_bank', data);
+ return request.post('/user/userbank/add_bank', data);
}
//报价单提交
export const bankListApi = (data) => {
return request.get('/bank/bank/lists', data);
}
+export const amountAccountApi = (data) => {
+ return request.get('/user/UserWithdraw/amount_account', data);
+}
-// //报价单提交
-// export const aboutUsApi = (data) => {
-// return request.post('/operation/OpurchaseGoodsOffer/offer', data);
-// }
\ No newline at end of file
+export const UserWithdrawApi = (data) => {
+ return request.post('/user/UserWithdraw/withdraw', data);
+}
+
+
+export const UserWithdrawIndexApi = (data) => {
+ return request.get('/user/UserWithdraw/index', data);
+}
+
+export const UserWithdrawListsApi = (data) => {
+ return request.get('/user/UserWithdraw/lists', data);
+}
\ No newline at end of file
diff --git a/config/app.js b/config/app.js
index 98b40db..a15eb5e 100644
--- a/config/app.js
+++ b/config/app.js
@@ -14,7 +14,7 @@ switch (env) {
BASE_URL = 'https://ceshi-erp.lihaink.cn';
break;
default:
- BASE_URL = 'http://192.168.1.16:8546';
+ BASE_URL = 'http://192.168.1.21:8546';
}
let HTTP_REQUEST_URL
diff --git a/pageQuota/Balance/bindAccout.vue b/pageQuota/Balance/bindAccout.vue
index 29fd38e..6550ee6 100644
--- a/pageQuota/Balance/bindAccout.vue
+++ b/pageQuota/Balance/bindAccout.vue
@@ -110,9 +110,9 @@
const form = reactive({
"name": "赵明军",
"bank_id": 1,
- "bank_name": '中国邮政',
- "bank_code": "62179967580064578451",
- "bank_branch": "迎晖路支行",
+ "bank_name": '中国见识过和',
+ "bank_code": "6213362109985515778",
+ "bank_branch": "支行",
"financial_img": "",
"is_own": 0,
phone: '19130550023',
@@ -122,7 +122,6 @@
user_type: userStore?.userInfo?.merchant?.mer_id ? '1' : '2'
})
- console.log(userStore?.userInfo)
const submit = () => {
bindCradApi({
diff --git a/pageQuota/Balance/detail.vue b/pageQuota/Balance/detail.vue
index 3910d02..96bb868 100644
--- a/pageQuota/Balance/detail.vue
+++ b/pageQuota/Balance/detail.vue
@@ -4,13 +4,13 @@
已提现金额
-
+
已提现次数
-
+
@@ -19,36 +19,25 @@
2024-4-7-2024-4-7
-
+
余额提现至
-
- ({item})
- {{"对公"}}
+ {{item.merchant_bank_info.bank_code}}
+ {{ item.merchant_bank_info.is_own?"对公" :"个人"}}
-
- {`${item}`}
+ {{item.merchant_bank_info.bank_info.name }}
-
- +{ite}
+ +{{item.amount}}
- {item.create_time}
- 待审核
-
+ {{item.create_time}}
+ {{item.is_check==1?'审核通过':item.is_check==2?"审核不通过":"待审核" }}
-
+
@@ -68,6 +57,31 @@
ref,
reactive
} from "vue"
+ import {
+ UserWithdrawListsApi,
+ UserWithdrawIndexApi
+ } from "@/api/balance.js"
+
+
+ const count = ref(0)
+ const total = ref(0)
+ const getInfo = async () => {
+ let res = await UserWithdrawIndexApi()
+ count.value = res.data.count
+ total.value = res.data.total
+ }
+ getInfo()
+
+ const lists = ref([])
+ const getList = async () => {
+ let res = await UserWithdrawListsApi({
+ create_time: '2024-05 '
+ })
+ lists.value = res.data.lists
+ console.log(res)
+
+ }
+ getList()
const nowDate = new Date()
// cconst
diff --git a/pageQuota/Balance/index.vue b/pageQuota/Balance/index.vue
index c8e63ef..7ec7fae 100644
--- a/pageQuota/Balance/index.vue
+++ b/pageQuota/Balance/index.vue
@@ -5,7 +5,7 @@
账户总余额(元)
- ￥1860.00
+ ￥{{balance}}
@@ -13,32 +13,31 @@
提现至
- 请选择提现账户
+ {{target_bank.is_own?'对公账户':"个人账户"}}
- 绑定账户
+ 更换账户
-
+
-
+
-
+
-
+
-
+
-
说明:用户下单后该订单金额存放在暂存金额中，用户确认收货后次日18:00才可提现该笔订单金额
提货付款订单在完成后次日18:00才可提现
@@ -53,7 +52,7 @@
明细
-
+
@@ -61,6 +60,8 @@