From de7ca746f4bfbf5cbd2bcd151191f32a20bc2998 Mon Sep 17 00:00:00 2001 From: woody Date: Mon, 20 Oct 2025 16:49:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat(declarationActivity):=20=E6=8A=A5?= =?UTF-8?q?=E5=8D=95=E8=B5=A0=E9=80=81=E8=AE=B0=E5=BD=95=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../marketing/declarationActivity/record.vue | 30 +++++++++++++++++-- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/src/views/marketing/declarationActivity/record.vue b/src/views/marketing/declarationActivity/record.vue index 09df5cc..44a33e3 100644 --- a/src/views/marketing/declarationActivity/record.vue +++ b/src/views/marketing/declarationActivity/record.vue @@ -13,7 +13,22 @@ label-width="auto" > - + + + + + + + + + + Date: Mon, 20 Oct 2025 17:00:56 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat(declarationActivity):=20=E6=8A=A5?= =?UTF-8?q?=E5=8D=95=E8=B5=A0=E9=80=81=E5=88=97=E5=AE=BD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../marketing/declarationActivity/record.vue | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/views/marketing/declarationActivity/record.vue b/src/views/marketing/declarationActivity/record.vue index 44a33e3..7514993 100644 --- a/src/views/marketing/declarationActivity/record.vue +++ b/src/views/marketing/declarationActivity/record.vue @@ -14,15 +14,16 @@ > - + - + - + Date: Tue, 21 Oct 2025 09:16:33 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat(declarationActivity):=20=E6=8A=A5?= =?UTF-8?q?=E5=8D=95=E8=B5=A0=E9=80=81=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/activity.js | 9 + src/router/index.js | 6 + .../marketing/declarationActivity/index.vue | 2 +- .../marketing/declarationActivity/record.vue | 13 +- .../marketing/declarationActivity/summary.vue | 342 ++++++++++++++++++ .../marketing/declarationActivity/update.vue | 15 +- .../declarationActivity/updateInfo.vue | 2 +- 7 files changed, 364 insertions(+), 25 deletions(-) create mode 100644 src/views/marketing/declarationActivity/summary.vue diff --git a/src/api/activity.js b/src/api/activity.js index cfee73e..8094572 100644 --- a/src/api/activity.js +++ b/src/api/activity.js @@ -81,3 +81,12 @@ export function declarationActivityRecordList(params) { }) } +// 报单赠送统计列表 + +export function declarationActivitySummaryList(params) { + return request({ + url: '/activity/manage/acDeclarationRecord//list-total', + method: 'get', + params + }) +} diff --git a/src/router/index.js b/src/router/index.js index 8ccca2b..e07c1d2 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2110,6 +2110,12 @@ export const constantRoutes = [ name: 'DeclarationActivityRecordList', component: () => import('@/views/marketing/declarationActivity/record'), meta: { title: '报单赠送记录' } + }, + { + path: 'declarationActivitySummary', + name: 'DeclarationActivitySummary', + component: () => import('@/views/marketing/declarationActivity/summary'), + meta: { title: '报单赠送统计' } } ] }, diff --git a/src/views/marketing/declarationActivity/index.vue b/src/views/marketing/declarationActivity/index.vue index 3f63973..d945a1f 100644 --- a/src/views/marketing/declarationActivity/index.vue +++ b/src/views/marketing/declarationActivity/index.vue @@ -202,7 +202,7 @@ import topBar from '@/components/topBar' import * as api from '@/api/activity.js' import { activityStatus } from '@/api/giftGoods.js' export default { - name: 'Bzpz', + name: 'DeclarationActivity', components: { topBar }, diff --git a/src/views/marketing/declarationActivity/record.vue b/src/views/marketing/declarationActivity/record.vue index 7514993..b7c7d4f 100644 --- a/src/views/marketing/declarationActivity/record.vue +++ b/src/views/marketing/declarationActivity/record.vue @@ -221,7 +221,7 @@ import topBar from '@/components/topBar' import * as api from '@/api/activity.js' import { activityStatus } from '@/api/giftGoods.js' export default { - name: 'Bzpz', + name: 'DeclarationActivityRecord', components: { topBar }, @@ -308,17 +308,6 @@ export default { this.select.startCreationTime = val ? val[0] : '' this.select.endCreationTime = val ? val[1] : '' }, - // 点击修改 - redirectDetail(id, index) { - this.$router.push({ - path: 'updateInfo', - query: { - pkId: id, - controlType: index - } - }) - }, - // 获取列表 getDataList() { this.loading = true diff --git a/src/views/marketing/declarationActivity/summary.vue b/src/views/marketing/declarationActivity/summary.vue new file mode 100644 index 0000000..ce70c1b --- /dev/null +++ b/src/views/marketing/declarationActivity/summary.vue @@ -0,0 +1,342 @@ + + + + diff --git a/src/views/marketing/declarationActivity/update.vue b/src/views/marketing/declarationActivity/update.vue index 6fe61f4..fdbd66d 100644 --- a/src/views/marketing/declarationActivity/update.vue +++ b/src/views/marketing/declarationActivity/update.vue @@ -80,12 +80,12 @@ - + - + - +
@@ -297,18 +297,12 @@