Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
phsl
/
admin
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
bb594595
authored
Oct 21, 2023
by
jason
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
钱包 - 优化
支付应用 - 证书模式增加应用私钥
parent
e187c554
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
27 deletions
+21
-27
src/api/pay/wallet/balance/index.ts
+0
-1
src/views/member/user/detail/UserAccountInfo.vue
+1
-1
src/views/pay/app/components/channel/AlipayChannelForm.vue
+10
-0
src/views/pay/wallet/balance/index.vue
+10
-25
No files found.
src/api/pay/wallet/balance/index.ts
View file @
bb594595
...
...
@@ -3,7 +3,6 @@ import request from '@/config/axios'
/** 用户钱包查询参数 */
export
interface
PayWalletUserReqVO
{
userId
:
number
userType
:
number
}
/** 钱包 VO */
export
interface
WalletVO
{
...
...
src/views/member/user/detail/UserAccountInfo.vue
View file @
bb594595
...
...
@@ -65,7 +65,7 @@ const getUserWallet = async () => {
wallet
.
value
=
WALLET_INIT_DATA
return
}
const
params
=
{
userId
:
props
.
user
.
id
,
userType
:
UserTypeEnum
.
MEMBER
}
const
params
=
{
userId
:
props
.
user
.
id
}
wallet
.
value
=
(
await
WalletApi
.
getWallet
(
params
))
||
WALLET_INIT_DATA
}
...
...
src/views/pay/app/components/channel/AlipayChannelForm.vue
View file @
bb594595
...
...
@@ -69,6 +69,16 @@
</el-form-item>
</div>
<div
v-if=
"formData.config.mode === 2"
>
<el-form-item
label-width=
"180px"
label=
"应用私钥"
prop=
"config.privateKey"
>
<el-input
type=
"textarea"
:autosize=
"{ minRows: 8, maxRows: 8 }"
v-model=
"formData.config.privateKey"
placeholder=
"请输入应用私钥"
clearable
:style=
"{ width: '100%' }"
/>
</el-form-item>
<el-form-item
label-width=
"180px"
label=
"商户公钥应用证书"
prop=
"config.appCertContent"
>
<el-input
v-model=
"formData.config.appCertContent"
...
...
src/views/pay/wallet/balance/index.vue
View file @
bb594595
...
...
@@ -8,30 +8,15 @@
:inline=
"true"
label-width=
"68px"
>
<el-form-item
label=
"用户
编号"
prop=
"userId
"
>
<el-form-item
label=
"用户
昵称"
prop=
"nickname
"
>
<el-input
v-model=
"queryParams.
userId
"
placeholder=
"请输入用户
编号
"
v-model=
"queryParams.
nickname
"
placeholder=
"请输入用户
昵称
"
clearable
@
keyup
.
enter=
"handleQuery"
class=
"!w-240px"
/>
</el-form-item>
<el-form-item
label=
"用户类型"
prop=
"userType"
>
<el-select
v-model=
"queryParams.userType"
placeholder=
"请选择用户类型"
clearable
class=
"!w-240px"
>
<el-option
v-for=
"dict in getIntDictOptions(DICT_TYPE.USER_TYPE)"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
/>
</el-select>
</el-form-item>
<el-form-item
label=
"创建时间"
prop=
"createTime"
>
<el-date-picker
v-model=
"queryParams.createTime"
...
...
@@ -54,7 +39,12 @@
<ContentWrap>
<el-table
v-loading=
"loading"
:data=
"list"
:stripe=
"true"
:show-overflow-tooltip=
"true"
>
<el-table-column
label=
"编号"
align=
"center"
prop=
"id"
/>
<el-table-column
label=
"用户编号"
align=
"center"
prop=
"userId"
/>
<el-table-column
label=
"用户昵称"
align=
"center"
prop=
"nickname"
/>
<el-table-column
label=
"头像"
align=
"center"
prop=
"avatar"
width=
"80px"
>
<template
#
default=
"scope"
>
<img
:src=
"scope.row.avatar"
style=
"width: 40px"
/>
</
template
>
</el-table-column>
<el-table-column
label=
"用户类型"
align=
"center"
prop=
"userType"
>
<
template
#
default=
"scope"
>
<dict-tag
:type=
"DICT_TYPE.USER_TYPE"
:value=
"scope.row.userType"
/>
...
...
@@ -116,12 +106,7 @@ const list = ref([]) // 列表的数据
const
queryParams
=
reactive
({
pageNo
:
1
,
pageSize
:
10
,
userId
:
null
,
userType
:
null
,
balance
:
null
,
totalExpense
:
null
,
totalRecharge
:
null
,
freezePrice
:
null
,
nickname
:
null
,
createTime
:
[]
})
const
queryFormRef
=
ref
()
// 搜索的表单
...
...
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