diff --git a/agentApp/common/api.js b/agentApp/common/api.js index ed39809..648876b 100644 --- a/agentApp/common/api.js +++ b/agentApp/common/api.js @@ -43,19 +43,12 @@ const userConfig = function() { } export const userGetMerchantInfo = (params) => http.post(baseUrl + '/api/user/getMerchantInfo', params, userConfig()) - export const userCreateOrder = (params) => http.post(baseUrl + '/api/user/createOrder', params, userConfig()) - export const userAccountInfo = () => http.post(baseUrl + '/api/user/accountInfo', {}, userConfig()) - export const userQueueRebateList = (params) => http.post(baseUrl + '/api/user/queueRebateList', params, userConfig()) - export const userOrderList = (params) => http.post(baseUrl + '/api/user/orderList', params, userConfig()) - export const userFillAlipayAccount = (params) => http.post(baseUrl + '/api/user/fillAlipayAccount', params, userConfig()) - export const userWithdraw = (params) => http.post(baseUrl + '/api/user/withdraw', params, userConfig()) - export const userWithdrawList = (params) => http.post(baseUrl + '/api/user/withdrawList', params, userConfig()) @@ -69,6 +62,10 @@ const agentConfig = function() { } export const agentSmsLogin = (params) => http.post(baseUrl + '/api/agent/smsLogin', params) +export const agentAccountInfo = (params) => http.post(baseUrl + '/api/agent/accountInfo', params, agentConfig()) +export const agentFillAlipayAccount = (params) => http.post(baseUrl + '/api/agent/fillAlipayAccount', params, agentConfig()) +export const agentWithdraw = (params) => http.post(baseUrl + '/api/agent/withdraw', params, agentConfig()) +export const agentWithdrawList = (params) => http.post(baseUrl + '/api/agent/withdrawList', params, agentConfig()) // 带上商户token @@ -81,14 +78,10 @@ const merchantConfig = function() { } export const merchantSmsLogin = (params) => http.post(baseUrl + '/api/merchant/smsLogin', params) - export const merchantAccountInfo = (params) => http.post(baseUrl + '/api/merchant/accountInfo', params, merchantConfig()) - export const merchantOrderList = (params) => http.post(baseUrl + '/api/merchant/orderList', params, merchantConfig()) - export const merchantOrderRefund = (params) => http.post(baseUrl + '/api/merchant/orderRefund', params, merchantConfig()) export const publicSysConfig = (params) => http.post(baseUrl + '/api/public/sysConfig', params) - export const publicSendSms = (params) => http.post(baseUrl + '/api/public/sendSms', params) \ No newline at end of file diff --git a/agentApp/pages/cash/cash.vue b/agentApp/pages/cash/cash.vue index 65881d9..b8e2709 100644 --- a/agentApp/pages/cash/cash.vue +++ b/agentApp/pages/cash/cash.vue @@ -10,7 +10,7 @@ ¥ - 458.00 + {{accountInfo.wallet_balance}} @@ -20,20 +20,20 @@ - 总体现:¥500.00 + 总提现:¥{{accountInfo.withdraw_total}}
- 待入账:1000元 + 待入账:{{accountInfo.waiting_amount}}元 - 提现中:458元 + 提现中:{{accountInfo.withdrawing_amount}}元
@@ -44,179 +44,408 @@ 支付宝账户 - - + + 去开通 + + + + + + + + + 扣手续费{{calcFee}}元,实际到账{{calcReceiveAmount}}元 + + + {{line}} + + + + + + \ No newline at end of file diff --git a/agentApp/pages/history/history.vue b/agentApp/pages/history/history.vue index 1de2a0c..9ccd7b0 100644 --- a/agentApp/pages/history/history.vue +++ b/agentApp/pages/history/history.vue @@ -2,82 +2,73 @@ - + 暂无数据 + - 流水号: 139812983213 + 流水号: {{item.out_biz_no}} - - 提现成功 + + 审核状态:审核中 - - 2023-11-28 15:45:39 + + 审核状态:提现成功 - - - -¥458.00 - - - - - - 流水号: 139812983213 + + 审核状态:审核不通过(原因:{{item.review_remark}}) - 提现成功 + 提现金额:¥{{item.amount}} - - 2023-11-28 15:45:39 + + 扣手续费:¥{{item.fee}} - - - -¥458.00 - - - - - - 流水号: 139812983213 + + 实际到账:¥{{item.receive_amount}} - 提现成功 + 提现账户:{{item.alipay_account}} - 2023-11-28 15:45:39 - - - - -¥458.00 - - - - - - 流水号: 139812983213 - - - 提现成功 + 申请时间:{{item.created_at}} - 2023-11-28 15:45:39 + 审核时间:{{item.reviewed_at}} - - -¥458.00 - + + \ No newline at end of file