Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
op-web-service
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
bp
op-web-service
Commits
c647741d
Commit
c647741d
authored
Aug 11, 2021
by
pengyunqian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:账户列表
parent
cfbfb108
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
46 additions
and
31 deletions
+46
-31
withdrawal.js
server/controllers/withdrawal.js
+11
-0
router.js
server/router.js
+3
-1
index.vue
src/pages/Withdrawal/walletAccount/index.vue
+32
-29
withdrawal.js
src/service/Withdrawal/withdrawal.js
+0
-1
No files found.
server/controllers/withdrawal.js
View file @
c647741d
...
...
@@ -70,6 +70,17 @@ exports.getApplyDetail = async ctx => {
}
ctx
.
body
=
await
req
(
ctx
,
opts
)
}
// 提现审核迭代
// 获取钱包账户列表
exports
.
getAccountList
=
async
ctx
=>
{
const
url
=
`
${
WITHDRAWAL_URI
}
/wallet/background/account_list`
;
const
opts
=
{
url
,
method
:
"GET"
,
qs
:
ctx
.
request
.
query
}
ctx
.
body
=
await
req
(
ctx
,
opts
)
}
const
getUserPermission
=
async
(
ctx
)
=>
{
const
url
=
`
${
WITHDRAWAL_URI
}
/merchant/authority/get_role_list`
;
...
...
server/router.js
View file @
c647741d
...
...
@@ -81,11 +81,13 @@ router.get(`${API_VERSION}/order/background/order_item_list`, groupmeal.orderIte
router
.
get
(
`
${
API_VERSION
}
/order/background/order_refund_reject`
,
groupmeal
.
orderRefundReject
);
router
.
post
(
`
${
API_VERSION
}
/order/background/order_refund`
,
groupmeal
.
orderRefund
);
// 钱包提现审核
wallet/background/apply_detail
// 钱包提现审核
router
.
get
(
`
${
API_VERSION
}
/get_withdrawal_apply_list`
,
withdrawal
.
getApplyList
)
router
.
post
(
`
${
API_VERSION
}
/get_withdrawal_black_list`
,
withdrawal
.
getBlackList
)
router
.
post
(
`
${
API_VERSION
}
/get_withdraw_audit`
,
withdrawal
.
getWithdrawAudit
)
router
.
post
(
`
${
API_VERSION
}
/get_freezing_fund`
,
withdrawal
.
getFreezingFund
)
router
.
get
(
`
${
API_VERSION
}
/get_apply_detail`
,
withdrawal
.
getApplyDetail
)
// 钱包账户
router
.
get
(
`
${
API_VERSION
}
/get_account_list`
,
withdrawal
.
getAccountList
)
module
.
exports
=
router
;
src/pages/Withdrawal/walletAccount/index.vue
View file @
c647741d
...
...
@@ -49,21 +49,21 @@
<el-table-column
label=
"账户状态"
width=
"200px"
:formatter=
"type
"
prop=
"status
"
align=
"center"
>
</el-table-column>
<el-table-column
label=
"操作"
align=
"center"
>
<template
#
default=
"scope"
>
<el-button
v-show=
"scope.row.
type == 2
"
v-show=
"scope.row.
is_black == 0
"
@
click
.
stop=
"handleBlackList(scope.row)"
type=
"text"
size=
"mini"
>
黑名单
</el-button
>
<el-button
v-show=
"scope.row.
type
== 1"
v-show=
"scope.row.
is_black
== 1"
@
click
.
stop=
"handelDelete(scope.row)"
size=
"mini"
type=
"text"
...
...
@@ -83,6 +83,9 @@
</template>
<
script
>
import
page
from
"../../../components/Pagination"
;
import
{
getAccountList
}
from
"@/service/Withdrawal/withdrawal"
;
export
default
{
name
:
"walletAccount"
,
props
:[
"flowRecord"
],
...
...
@@ -124,11 +127,11 @@ export default {
currentRolePrivilege
:
[],
};
},
// moun
ted() {
// this.getGetRole_l
ist();
crea
ted
()
{
this
.
getAccountL
ist
();
// this.getPermissionsAll();
//
},
//
methods: {
},
methods
:
{
// hasStatusFormat(row) {
// let statusText = ["正常", "禁用", "删除"];
// return statusText[row.role_status - 1];
...
...
@@ -148,20 +151,20 @@ export default {
// query: { roleId: row.role_id },
// });
// },
// //获取角色
列表
// getGetRole_l
ist() {
// let {
page, page_size } = this.params;
// let paramsRole
_list = {
//
page,
//
page_size,
// type: this.searchProps.
type,
// user_id: this.searchProps.user_id,
//
};
// reqGetRole_list(paramsRole_list, this.appId
).then((res) => {
// this.accountList = res.resul
t;
// this.totalNum = res
.count;
//
});
//
},
//获取账户
列表
getAccountL
ist
()
{
let
{
user_id
,
type
,
page
,
page_size
}
=
this
.
params
;
let
params
_list
=
{
page
,
page_size
,
type
,
user_id
:
user_id
||
undefined
};
getAccountList
(
params_list
).
then
((
res
)
=>
{
this
.
accountList
=
res
.
result
.
lis
t
;
this
.
totalNum
=
res
.
result
.
count
;
});
},
// //查询
// onSearchSubmit() {
// this.getGetRole_list();
...
...
@@ -171,12 +174,12 @@ export default {
// (this.searchProps.user_id = ""), (this.searchProps.type = "");
// this.getGetRole_list();
// },
//
//列表分页
//
update(obj) {
//
Object.assign(this.params, obj);
//
let { page, page_size } = this.params;
// this.getGetRole_l
ist(page, page_size);
//
},
//列表分页
update
(
obj
)
{
Object
.
assign
(
this
.
params
,
obj
);
let
{
page
,
page_size
}
=
this
.
params
;
this
.
getAccountL
ist
(
page
,
page_size
);
},
// //弹框提示
// openBounced(type, role_id) {
// this.$confirm(`${this.dialogText}是否继续?`, "提示", {
...
...
@@ -379,7 +382,7 @@ export default {
// this.currentRolePrivilege = newData;
// this.currenPermissionsUpdate = newData;
// },
//
},
},
}
</
script
>
<
style
lang=
"less"
scoped
>
...
...
src/service/Withdrawal/withdrawal.js
View file @
c647741d
...
...
@@ -49,7 +49,6 @@ export async function getRolesForUser(user_email) {
}
// 迭代---钱包账户
// 获取账户列表
// 获取提现审核列表
export
async
function
getAccountList
(
params
)
{
const
res
=
await
axios
.
get
(
"/api/v1/get_account_list"
,
{
params
:
getParams
(
params
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment