From f6b2a86ff923b468731d98d1792b9bc2f3200512 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Fri, 31 Oct 2025 17:55:05 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=E5=85=B1=E5=AF=8C=E5=95=86=E5=9F=8E?= =?UTF-8?q?=E9=80=80=E6=AC=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/admin-refund-dialog/table.vue | 559 ++++++++++-------- 1 file changed, 296 insertions(+), 263 deletions(-) diff --git a/src/views/hard/hard-order/components/admin-refund-dialog/table.vue b/src/views/hard/hard-order/components/admin-refund-dialog/table.vue index a8bc8b1..a01b246 100644 --- a/src/views/hard/hard-order/components/admin-refund-dialog/table.vue +++ b/src/views/hard/hard-order/components/admin-refund-dialog/table.vue @@ -1,139 +1,167 @@ \ No newline at end of file + From c2a06b2773bdba19d0ec108d25de41b78879cc71 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Fri, 31 Oct 2025 19:50:30 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=E6=B4=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/act/cancel-item/index.vue | 182 ++++++++++++++-------------- 1 file changed, 94 insertions(+), 88 deletions(-) diff --git a/src/views/act/cancel-item/index.vue b/src/views/act/cancel-item/index.vue index b2fd3ab..956f909 100644 --- a/src/views/act/cancel-item/index.vue +++ b/src/views/act/cancel-item/index.vue @@ -1,66 +1,79 @@ \ No newline at end of file + try { + await delObjs(ids) + getDataList() + useMessage().success("删除成功") + } catch (err: any) { + useMessage().error(err.msg) + } +} + From c2b47f2541cb48ea5da8aaf50541632d819db171 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Fri, 31 Oct 2025 20:52:15 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=E6=B5=8B=E8=AF=95bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/act/act-cancel/form.vue | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/views/act/act-cancel/form.vue b/src/views/act/act-cancel/form.vue index 2517993..fe3d61c 100644 --- a/src/views/act/act-cancel/form.vue +++ b/src/views/act/act-cancel/form.vue @@ -26,7 +26,13 @@ - + + + + + + + @@ -82,6 +88,7 @@ const form = reactive({ noticeId: "", activeOrgPrice: "", activeCancelPrice: "", + startTime: "", expireTime: "", actStatus: "", actTitle: "", @@ -93,6 +100,7 @@ const dataRules = ref({ mchId: [{ required: true, message: "活动商户不能为空", trigger: "change" }], noticeId: [{ required: true, message: "活动公告不能为空", trigger: "change" }], activeCancelPrice: [{ required: true, message: "活动价不能为空", trigger: "blur" }], + startTime: [{ required: true, message: "到期时间不能为空", trigger: "change" }], expireTime: [{ required: true, message: "到期时间不能为空", trigger: "change" }], actTitle: [{ required: true, message: "活动标题不能为空", trigger: "blur" }], }) From 25d4d396a7d7fa8d2b2e5440ba262f8fc8d646ed Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Fri, 31 Oct 2025 21:40:15 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=E6=B4=BB=E5=8A=A8=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Select/SelectAct.vue | 101 ++++++++++++++++++++++++++++ src/components/index.ts | 2 + src/views/act/cancel-item/index.vue | 3 + 3 files changed, 106 insertions(+) create mode 100644 src/components/Select/SelectAct.vue diff --git a/src/components/Select/SelectAct.vue b/src/components/Select/SelectAct.vue new file mode 100644 index 0000000..6e1d4bd --- /dev/null +++ b/src/components/Select/SelectAct.vue @@ -0,0 +1,101 @@ + + + diff --git a/src/components/index.ts b/src/components/index.ts index b2bace0..3b54e43 100644 --- a/src/components/index.ts +++ b/src/components/index.ts @@ -39,6 +39,7 @@ import SelectMchCatory from "/@/components/Select/SelectMchCatory.vue" import SelectCanteenSupplier from "/@/components/Select/SelectCanteenSupplier.vue" import SelectWalletInvoice from "/@/components/Select/SelectWalletInvoice.vue" import SelectNotice from "/@/components/Select/SelectNotice.vue" +import SelectAct from "/@/components/Select/SelectAct.vue" // 地图组件 import MapSelect from "/@/components/map/map-select.vue" @@ -100,6 +101,7 @@ export default { app.component("SelectCanteenSupplier", SelectCanteenSupplier) app.component("SelectWalletInvoice", SelectWalletInvoice) app.component("SelectNotice", SelectNotice) + app.component("SelectAct", SelectAct) app.component("MapSelect", MapSelect) diff --git a/src/views/act/cancel-item/index.vue b/src/views/act/cancel-item/index.vue index 956f909..678ca58 100644 --- a/src/views/act/cancel-item/index.vue +++ b/src/views/act/cancel-item/index.vue @@ -3,6 +3,9 @@
+ + +