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
Unverified
Commit
a3f2a01e
authored
Aug 15, 2023
by
芋道源码
Committed by
Gitee
Aug 15, 2023
Browse files
Options
Browse Files
Download
Plain Diff
!198 fix: 修复支付的一些小问题
Merge pull request !198 from dhb52/master
parents
e954ae60
c7b8fdb8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
13 deletions
+11
-13
src/views/pay/demo/index.vue
+4
-3
src/views/pay/notify/NotifyDetail.vue
+7
-10
No files found.
src/views/pay/demo/index.vue
View file @
a3f2a01e
...
@@ -121,7 +121,8 @@ const message = useMessage() // 消息弹窗
...
@@ -121,7 +121,8 @@ const message = useMessage() // 消息弹窗
const
loading
=
ref
(
true
)
// 列表的加载中
const
loading
=
ref
(
true
)
// 列表的加载中
const
total
=
ref
(
0
)
// 列表的总页数
const
total
=
ref
(
0
)
// 列表的总页数
const
list
=
ref
([])
// 列表的数据
const
list
=
ref
([])
// 列表的数据
const
queryParams
=
ref
({
// 查询条件
const
queryParams
=
reactive
({
pageNo
:
1
,
pageNo
:
1
,
pageSize
:
10
pageSize
:
10
})
})
...
@@ -141,7 +142,7 @@ const getList = async () => {
...
@@ -141,7 +142,7 @@ const getList = async () => {
}
}
/** 支付按钮操作 */
/** 支付按钮操作 */
const
handlePay
=
(
row
)
=>
{
const
handlePay
=
(
row
:
any
)
=>
{
router
.
push
({
router
.
push
({
name
:
'PayCashier'
,
name
:
'PayCashier'
,
query
:
{
query
:
{
...
@@ -195,7 +196,7 @@ const spus = ref([
...
@@ -195,7 +196,7 @@ const spus = ref([
const
dialogVisible
=
ref
(
false
)
// 弹窗的是否展示
const
dialogVisible
=
ref
(
false
)
// 弹窗的是否展示
const
formLoading
=
ref
(
false
)
// 表单的加载中
const
formLoading
=
ref
(
false
)
// 表单的加载中
const
formData
=
ref
({})
// 表单数据
const
formData
=
ref
<
any
>
({})
// 表单数据
const
formRules
=
{
const
formRules
=
{
spuId
:
[{
required
:
true
,
message
:
'商品编号不能为空'
,
trigger
:
'blur'
}]
spuId
:
[{
required
:
true
,
message
:
'商品编号不能为空'
,
trigger
:
'blur'
}]
}
}
...
...
src/views/pay/notify/NotifyDetail.vue
View file @
a3f2a01e
...
@@ -7,32 +7,27 @@
...
@@ -7,32 +7,27 @@
<el-descriptions-item
label=
"通知状态"
>
<el-descriptions-item
label=
"通知状态"
>
<dict-tag
:type=
"DICT_TYPE.PAY_NOTIFY_STATUS"
:value=
"detailData.status"
/>
<dict-tag
:type=
"DICT_TYPE.PAY_NOTIFY_STATUS"
:value=
"detailData.status"
/>
</el-descriptions-item>
</el-descriptions-item>
</el-descriptions>
<el-descriptions
:column=
"2"
>
<el-descriptions-item
label=
"应用编号"
>
{{
detailData
.
appId
}}
</el-descriptions-item>
<el-descriptions-item
label=
"应用编号"
>
{{
detailData
.
appId
}}
</el-descriptions-item>
<el-descriptions-item
label=
"应用名称"
>
{{
detailData
.
appName
}}
</el-descriptions-item>
<el-descriptions-item
label=
"应用名称"
>
{{
detailData
.
appName
}}
</el-descriptions-item>
</el-descriptions>
<el-descriptions
:column=
"2"
>
<el-descriptions-item
label=
"关联编号"
>
{{
detailData
.
dataId
}}
</el-descriptions-item>
<el-descriptions-item
label=
"关联编号"
>
{{
detailData
.
dataId
}}
</el-descriptions-item>
<el-descriptions-item
label=
"通知类型"
>
<el-descriptions-item
label=
"通知类型"
>
<dict-tag
:type=
"DICT_TYPE.PAY_NOTIFY_TYPE"
:value=
"detailData.type"
/>
<dict-tag
:type=
"DICT_TYPE.PAY_NOTIFY_TYPE"
:value=
"detailData.type"
/>
</el-descriptions-item>
</el-descriptions-item>
</el-descriptions>
<el-descriptions
:column=
"2"
>
<el-descriptions-item
label=
"通知次数"
>
{{
detailData
.
notifyTimes
}}
</el-descriptions-item>
<el-descriptions-item
label=
"通知次数"
>
{{
detailData
.
notifyTimes
}}
</el-descriptions-item>
<el-descriptions-item
label=
"最大通知次数"
>
<el-descriptions-item
label=
"最大通知次数"
>
{{
detailData
.
maxNotifyTimes
}}
{{
detailData
.
maxNotifyTimes
}}
</el-descriptions-item>
</el-descriptions-item>
</el-descriptions>
<el-descriptions
:column=
"2"
>
<el-descriptions-item
label=
"最后通知时间"
>
<el-descriptions-item
label=
"最后通知时间"
>
{{
formatDate
(
detailData
.
lastExecuteTime
)
}}
{{
formatDate
(
detailData
.
lastExecuteTime
)
}}
</el-descriptions-item>
</el-descriptions-item>
<el-descriptions-item
label=
"下次通知时间"
>
<el-descriptions-item
label=
"下次通知时间"
>
{{
formatDate
(
detailData
.
nextNotifyTime
)
}}
{{
formatDate
(
detailData
.
nextNotifyTime
)
}}
</el-descriptions-item>
</el-descriptions-item>
</el-descriptions>
<el-descriptions
:column=
"2"
>
<el-descriptions-item
label=
"创建时间"
>
<el-descriptions-item
label=
"创建时间"
>
{{
formatDate
(
detailData
.
createTime
)
}}
{{
formatDate
(
detailData
.
createTime
)
}}
</el-descriptions-item>
</el-descriptions-item>
...
@@ -40,8 +35,10 @@
...
@@ -40,8 +35,10 @@
{{
formatDate
(
detailData
.
updateTime
)
}}
{{
formatDate
(
detailData
.
updateTime
)
}}
</el-descriptions-item>
</el-descriptions-item>
</el-descriptions>
</el-descriptions>
<!-- 分割线 -->
<!-- 分割线 -->
<el-divider
/>
<el-divider
/>
<el-descriptions
:column=
"1"
direction=
"vertical"
border
>
<el-descriptions
:column=
"1"
direction=
"vertical"
border
>
<el-descriptions-item
label=
"回调日志"
>
<el-descriptions-item
label=
"回调日志"
>
<el-table
:data=
"detailData.logs"
>
<el-table
:data=
"detailData.logs"
>
...
...
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