From c1ae040734d922605cfa42950c8e0f70a093c6d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=BF=94=E5=AE=87-=E6=97=85=E7=AE=A1=E5=AE=B6?= <153298343@qq.com> Date: Mon, 25 Jul 2022 09:58:14 +0800 Subject: [PATCH] up --- src/api/order/activeorder.js | 8 + src/views/dashboard/components/PanelGroup.vue | 2 +- src/views/dashboard/index.vue | 4 +- src/views/order/activeorder.vue | 43 ++- src/views/order/activeordervisitor.vue | 360 ++++++++++++++++++ 5 files changed, 398 insertions(+), 19 deletions(-) create mode 100644 src/views/order/activeordervisitor.vue diff --git a/src/api/order/activeorder.js b/src/api/order/activeorder.js index 96ffb3a..8e1e692 100644 --- a/src/api/order/activeorder.js +++ b/src/api/order/activeorder.js @@ -17,3 +17,11 @@ export function get(id) { } }) } +export function listvisitor(params) { + return request({ + url: '/api/admin/activity/order-detail-index', + method: 'get', + params:params + }) +} + diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue index dc0fd8f..ca79620 100644 --- a/src/views/dashboard/components/PanelGroup.vue +++ b/src/views/dashboard/components/PanelGroup.vue @@ -90,7 +90,7 @@
今日
-
当日核销比:{{totaldata.activity_enter.per}}
+
核销比:{{totaldata.activity_enter.per}}
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index e738a60..17f3916 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -170,8 +170,8 @@ totalRpt().then(res => { res.visit_enter.per = ((res.visit_enter.today / (res.visit_total.today == 0 ? 1 : res.visit_total .today)) * 100).toFixed(2) + "%" - res.activity_enter.per = ((res.activity_enter.today / (res.activity_total.today == 0 ? 1 : res.activity_total - .today)) * 100).toFixed(2) + "%" + res.activity_enter.per = ((res.activity_enter.total / (res.activity_total.total == 0 ? 1 : res.activity_total + .total)) * 100).toFixed(2) + "%" this.totaldata = res; }) diff --git a/src/views/order/activeorder.vue b/src/views/order/activeorder.vue index de7fe36..988433f 100644 --- a/src/views/order/activeorder.vue +++ b/src/views/order/activeorder.vue @@ -23,13 +23,18 @@ +
+
+ {{scope.row["activity"].name}} +
+
{{item.value}}
-
+
{{item.value}} {{item.value}} {{item.value}} @@ -175,11 +180,10 @@ }, { value: '已取消', id: "0" - },{ + }, { value: '已过期', id: "3" - } - ] + }] }, tableHeight: 0, @@ -207,6 +211,13 @@ details_list: [] }, columns: [{ + field: "activityName", + title: "活动名称", + type: "string", + align: "center", + type: "format" + + }, { field: "leader", title: "联系人", type: "string", @@ -223,18 +234,18 @@ title: "类型", type: "type", align: "center" - }, - { - field: "total", - title: "人数", - type: "string", - align:"center" - }, - { - field: "created_at", - title: "下单时间", - type: "string", - align:"center" + }, + { + field: "total", + title: "人数", + type: "string", + align: "center" + }, + { + field: "created_at", + title: "下单时间", + type: "string", + align: "center" }, { field: "status", diff --git a/src/views/order/activeordervisitor.vue b/src/views/order/activeordervisitor.vue new file mode 100644 index 0000000..490bb4d --- /dev/null +++ b/src/views/order/activeordervisitor.vue @@ -0,0 +1,360 @@ + + + +