From 97193d4c310856527534f90dfd3c828ffc3a6f36 Mon Sep 17 00:00:00 2001 From: limqhz <540344226@qq.com> Date: Tue, 16 Jan 2024 00:29:24 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AF=AE=E7=90=83=E5=85=A5=E5=9C=BA=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=E6=94=AF=E6=8C=81=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/member/enter/veneu/log.js | 7 + src/views/device/index.vue | 2 +- src/views/member/edit.vue | 95 +--------- src/views/member/enter/veneu/log/edit.vue | 203 +++++++-------------- src/views/member/enter/veneu/log/index.vue | 144 +++++++++++---- 5 files changed, 193 insertions(+), 258 deletions(-) diff --git a/src/api/member/enter/veneu/log.js b/src/api/member/enter/veneu/log.js index cdf0f93..4132f2a 100644 --- a/src/api/member/enter/veneu/log.js +++ b/src/api/member/enter/veneu/log.js @@ -7,6 +7,13 @@ export function find(id) { return http.get('/member/enter/veneu/log/' + id) } +/** + * 结算订单 + */ +export function orderAccount(params) { + return http.post('/member/enter/veneu/account', params) +} + /** * 删除篮球进场订单 */ diff --git a/src/views/device/index.vue b/src/views/device/index.vue index f2efb09..c869576 100644 --- a/src/views/device/index.vue +++ b/src/views/device/index.vue @@ -49,7 +49,7 @@ 上传日志(bug) - 打印临时卡凭证 + diff --git a/src/views/member/edit.vue b/src/views/member/edit.vue index 10fadc8..5e1a78f 100644 --- a/src/views/member/edit.vue +++ b/src/views/member/edit.vue @@ -3,86 +3,7 @@
- - -
- - - - 搜索 - 添加 -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- + @@ -124,7 +45,7 @@ - + @@ -180,7 +101,7 @@ - +
@@ -343,8 +264,13 @@ export default { }, handleClick(tab, event) { + // if (tab.index === '0') { + // this.params.payStatus = undefined + // this.$refs.pagination.pageRequest() + // } if (tab.index === '0') { this.params.payStatus = undefined + this.params.search_eq_memberId = this.$route.query.id this.$refs.pagination.pageRequest() } if (tab.index === '1') { @@ -353,11 +279,6 @@ export default { this.$refs.pagination.pageRequest() } if (tab.index === '2') { - this.params.payStatus = undefined - this.params.search_eq_memberId = this.$route.query.id - this.$refs.pagination.pageRequest() - } - if (tab.index === '3') { this.form.id = this.$route.query.id this.findByIds(this.form.id) } diff --git a/src/views/member/enter/veneu/log/edit.vue b/src/views/member/enter/veneu/log/edit.vue index 8c370b8..0994f81 100644 --- a/src/views/member/enter/veneu/log/edit.vue +++ b/src/views/member/enter/veneu/log/edit.vue @@ -1,67 +1,60 @@ @@ -76,98 +69,30 @@