Skip to content

Commit a3f2a01

Browse files
YunaiVgitee-org
authored andcommitted
!198 fix: 修复支付的一些小问题
Merge pull request !198 from dhb52/master
2 parents e954ae6 + c7b8fdb commit a3f2a01

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed

src/views/pay/demo/index.vue

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,8 @@ const message = useMessage() // 消息弹窗
121121
const loading = ref(true) // 列表的加载中
122122
const total = ref(0) // 列表的总页数
123123
const list = ref([]) // 列表的数据
124-
const queryParams = ref({
124+
// 查询条件
125+
const queryParams = reactive({
125126
pageNo: 1,
126127
pageSize: 10
127128
})
@@ -141,7 +142,7 @@ const getList = async () => {
141142
}
142143
143144
/** 支付按钮操作 */
144-
const handlePay = (row) => {
145+
const handlePay = (row: any) => {
145146
router.push({
146147
name: 'PayCashier',
147148
query: {
@@ -195,7 +196,7 @@ const spus = ref([
195196
196197
const dialogVisible = ref(false) // 弹窗的是否展示
197198
const formLoading = ref(false) // 表单的加载中
198-
const formData = ref({}) // 表单数据
199+
const formData = ref<any>({}) // 表单数据
199200
const formRules = {
200201
spuId: [{ required: true, message: '商品编号不能为空', trigger: 'blur' }]
201202
}

src/views/pay/notify/NotifyDetail.vue

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,41 +7,38 @@
77
<el-descriptions-item label="通知状态">
88
<dict-tag :type="DICT_TYPE.PAY_NOTIFY_STATUS" :value="detailData.status" />
99
</el-descriptions-item>
10-
</el-descriptions>
11-
<el-descriptions :column="2">
10+
1211
<el-descriptions-item label="应用编号">{{ detailData.appId }}</el-descriptions-item>
1312
<el-descriptions-item label="应用名称">{{ detailData.appName }}</el-descriptions-item>
14-
</el-descriptions>
15-
<el-descriptions :column="2">
13+
1614
<el-descriptions-item label="关联编号">{{ detailData.dataId }}</el-descriptions-item>
1715
<el-descriptions-item label="通知类型">
1816
<dict-tag :type="DICT_TYPE.PAY_NOTIFY_TYPE" :value="detailData.type" />
1917
</el-descriptions-item>
20-
</el-descriptions>
21-
<el-descriptions :column="2">
18+
2219
<el-descriptions-item label="通知次数">{{ detailData.notifyTimes }}</el-descriptions-item>
2320
<el-descriptions-item label="最大通知次数">
2421
{{ detailData.maxNotifyTimes }}
2522
</el-descriptions-item>
26-
</el-descriptions>
27-
<el-descriptions :column="2">
23+
2824
<el-descriptions-item label="最后通知时间">
2925
{{ formatDate(detailData.lastExecuteTime) }}
3026
</el-descriptions-item>
3127
<el-descriptions-item label="下次通知时间">
3228
{{ formatDate(detailData.nextNotifyTime) }}
3329
</el-descriptions-item>
34-
</el-descriptions>
35-
<el-descriptions :column="2">
30+
3631
<el-descriptions-item label="创建时间">
3732
{{ formatDate(detailData.createTime) }}
3833
</el-descriptions-item>
3934
<el-descriptions-item label="更新时间">
4035
{{ formatDate(detailData.updateTime) }}
4136
</el-descriptions-item>
4237
</el-descriptions>
38+
4339
<!-- 分割线 -->
4440
<el-divider />
41+
4542
<el-descriptions :column="1" direction="vertical" border>
4643
<el-descriptions-item label="回调日志">
4744
<el-table :data="detailData.logs">

0 commit comments

Comments
 (0)