From 7f034724a9a21f87e6da6dee4eb6acdfb45313f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=AE=87=E5=BA=86?= Date: Fri, 7 Jun 2024 11:05:42 +0000 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=93=8D=E4=BD=9C=E4=BA=BA=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 杨宇庆 --- src/views/system/operatelog/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/system/operatelog/index.vue b/src/views/system/operatelog/index.vue index ed4f8f59..31fbdba5 100644 --- a/src/views/system/operatelog/index.vue +++ b/src/views/system/operatelog/index.vue @@ -13,7 +13,8 @@ From 490c4bde02e177fa2477b274d0d2b0e868042b69 Mon Sep 17 00:00:00 2001 From: duxz Date: Thu, 13 Jun 2024 10:04:38 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=B2=A1=E6=9C=89=E6=98=BE=E7=A4=BA=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bpm/processInstance/detail/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/bpm/processInstance/detail/index.vue b/src/views/bpm/processInstance/detail/index.vue index f3072e56..da54769d 100644 --- a/src/views/bpm/processInstance/detail/index.vue +++ b/src/views/bpm/processInstance/detail/index.vue @@ -363,7 +363,7 @@ const loadRunningTask = (tasks) => { // 2.4 处理 approve 表单 if (task.formId && task.formConf) { const approveForm = {} - setConfAndFields2(approveForm, task.formConf, task.formFields, task.formVariable) + setConfAndFields2(approveForm, task.formConf, task.formFields, task.formVariables) approveForms.value.push(approveForm) } else { approveForms.value.push({}) // 占位，避免为空 From 8eee46d85c236f167c97dde70d5cea586e69f947 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?21=E5=85=8B=E7=9A=84=E7=88=B1=E6=83=85?= Date: Thu, 20 Jun 2024 07:13:35 +0000 Subject: [PATCH 3/4] /mp/open/ -> /admin-api/mp/open/ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 21克的爱情 --- src/views/mp/account/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/mp/account/index.vue b/src/views/mp/account/index.vue index 212035a2..65517070 100644 --- a/src/views/mp/account/index.vue +++ b/src/views/mp/account/index.vue @@ -37,7 +37,7 @@ From 1a04b7b9e7a7f022009362bc28e39e5fb6894090 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?21=E5=85=8B=E7=9A=84=E7=88=B1=E6=83=85?= Date: Thu, 20 Jun 2024 14:58:32 +0000 Subject: [PATCH 4/4] update src/api/mall/promotion/seckill/seckillConfig.ts. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 21克的爱情 --- src/api/mall/promotion/seckill/seckillConfig.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/mall/promotion/seckill/seckillConfig.ts b/src/api/mall/promotion/seckill/seckillConfig.ts index 66857df8..37d9b543 100644 --- a/src/api/mall/promotion/seckill/seckillConfig.ts +++ b/src/api/mall/promotion/seckill/seckillConfig.ts @@ -19,7 +19,7 @@ export const SeckillConfigApi = { // 查询秒杀时段列表 getSimpleSeckillConfigList: async () => { - return await request.get({ url: `/promotion/seckill-config/simple-list` }) + return await request.get({ url: `/promotion/seckill-config/list` }) }, // 查询秒杀时段详情