From 5d364e268f1d2eec20a5bb04beb297d8ca27eb5d Mon Sep 17 00:00:00 2001 From: dhb52 <dhb52@126.com> Date: Sun, 13 Aug 2023 21:38:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=94=AF=E4=BB=98/=E5=9B=9E?= =?UTF-8?q?=E8=B0=83=20=20=E4=BF=AE=E5=A4=8DElDescriptions=E5=AF=B9?= =?UTF-8?q?=E9=BD=90=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/pay/notify/NotifyDetail.vue | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/views/pay/notify/NotifyDetail.vue b/src/views/pay/notify/NotifyDetail.vue index 82fd8060..938a3eeb 100644 --- a/src/views/pay/notify/NotifyDetail.vue +++ b/src/views/pay/notify/NotifyDetail.vue @@ -7,32 +7,27 @@ <el-descriptions-item label="通知状态"> <dict-tag :type="DICT_TYPE.PAY_NOTIFY_STATUS" :value="detailData.status" /> </el-descriptions-item> - </el-descriptions> - <el-descriptions :column="2"> + <el-descriptions-item label="应用编号">{{ detailData.appId }}</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="通知类型"> <dict-tag :type="DICT_TYPE.PAY_NOTIFY_TYPE" :value="detailData.type" /> </el-descriptions-item> - </el-descriptions> - <el-descriptions :column="2"> + <el-descriptions-item label="通知次数">{{ detailData.notifyTimes }}</el-descriptions-item> <el-descriptions-item label="最大通知次数"> {{ detailData.maxNotifyTimes }} </el-descriptions-item> - </el-descriptions> - <el-descriptions :column="2"> + <el-descriptions-item label="最后通知时间"> {{ formatDate(detailData.lastExecuteTime) }} </el-descriptions-item> <el-descriptions-item label="下次通知时间"> {{ formatDate(detailData.nextNotifyTime) }} </el-descriptions-item> - </el-descriptions> - <el-descriptions :column="2"> + <el-descriptions-item label="创建时间"> {{ formatDate(detailData.createTime) }} </el-descriptions-item> @@ -40,8 +35,10 @@ {{ formatDate(detailData.updateTime) }} </el-descriptions-item> </el-descriptions> + <!-- 分割线 --> <el-divider /> + <el-descriptions :column="1" direction="vertical" border> <el-descriptions-item label="回调日志"> <el-table :data="detailData.logs"> From c7b8fdb88483e274e3eee0536e4c0ca311479eca Mon Sep 17 00:00:00 2001 From: dhb52 <dhb52@126.com> Date: Sun, 13 Aug 2023 21:48:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E6=94=AF=E4=BB=98/=E7=A4=BA?= =?UTF-8?q?=E4=BE=8B=20queryParams=20=E4=B8=BA=20reactive?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/pay/demo/index.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/views/pay/demo/index.vue b/src/views/pay/demo/index.vue index 125ba8a0..e8340b3b 100644 --- a/src/views/pay/demo/index.vue +++ b/src/views/pay/demo/index.vue @@ -121,7 +121,8 @@ const message = useMessage() // 消息弹窗 const loading = ref(true) // 列表的加载中 const total = ref(0) // 列表的总页数 const list = ref([]) // 列表的数据 -const queryParams = ref({ +// 查询条件 +const queryParams = reactive({ pageNo: 1, pageSize: 10 }) @@ -141,7 +142,7 @@ const getList = async () => { } /** 支付按钮操作 */ -const handlePay = (row) => { +const handlePay = (row: any) => { router.push({ name: 'PayCashier', query: { @@ -195,7 +196,7 @@ const spus = ref([ const dialogVisible = ref(false) // 弹窗的是否展示 const formLoading = ref(false) // 表单的加载中 -const formData = ref({}) // 表单数据 +const formData = ref<any>({}) // 表单数据 const formRules = { spuId: [{ required: true, message: '商品编号不能为空', trigger: 'blur' }] }