From 21de42a7b68b7c65c388153fca47879342d44b70 Mon Sep 17 00:00:00 2001 From: limqhz <540344226@qq.com> Date: Wed, 24 Jan 2024 22:34:53 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=BB=93=E7=AE=97=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E8=B5=B0=E8=B5=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/member/enter/veneu/log.js | 4 ++-- src/views/member/enter/veneu/log/index.vue | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/api/member/enter/veneu/log.js b/src/api/member/enter/veneu/log.js index 4132f2a..eb75334 100644 --- a/src/api/member/enter/veneu/log.js +++ b/src/api/member/enter/veneu/log.js @@ -10,8 +10,8 @@ export function find(id) { /** * 结算订单 */ -export function orderAccount(params) { - return http.post('/member/enter/veneu/account', params) +export function orderAccount(enterId, payMoney) { + return http.post('/member/enter/veneu/account', { 'EnterId': enterId, 'payMoney': payMoney }) } /** diff --git a/src/views/member/enter/veneu/log/index.vue b/src/views/member/enter/veneu/log/index.vue index 3713466..8703275 100644 --- a/src/views/member/enter/veneu/log/index.vue +++ b/src/views/member/enter/veneu/log/index.vue @@ -145,7 +145,9 @@ export default { activeName: '1', dialogFormByDay: false, orderId: undefined, + // 订单金额 orderPrice: undefined, + // 订单已退款金额 orderPayMoney: undefined, params: { search_eq_mobile: '', @@ -231,7 +233,9 @@ export default { return } this.dialogFormByDay = false - orderAccount() + orderAccount(this.orderId,this.form.miniMoney).then(result => { + this.$refs.pagination.handleSearch() + }) }, getType(type) { From 8999ee41ce360fb27e37511084264a32bfd105d8 Mon Sep 17 00:00:00 2001 From: limqhz <540344226@qq.com> Date: Tue, 30 Jan 2024 20:51:38 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E7=AF=AE=E7=90=83?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=94=B6=E7=9B=8A?= 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/member/enter/veneu/log/index.vue | 25 +++++++++++++++++++--- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/src/api/member/enter/veneu/log.js b/src/api/member/enter/veneu/log.js index eb75334..980c51a 100644 --- a/src/api/member/enter/veneu/log.js +++ b/src/api/member/enter/veneu/log.js @@ -14,6 +14,13 @@ export function orderAccount(enterId, payMoney) { return http.post('/member/enter/veneu/account', { 'EnterId': enterId, 'payMoney': payMoney }) } +/** + * 汇总收益 + */ +export function orderPageSum(params) { + return http.get('/member/enter/sum/money', params) +} + /** * 删除篮球进场订单 */ diff --git a/src/views/member/enter/veneu/log/index.vue b/src/views/member/enter/veneu/log/index.vue index 8703275..0e807c6 100644 --- a/src/views/member/enter/veneu/log/index.vue +++ b/src/views/member/enter/veneu/log/index.vue @@ -23,6 +23,7 @@ 搜索 +
统计收益:{{orderSumMoney}}元
- + 管理员开门 + + 请输入开门密码： + +
+ 开门 + 关 闭 +
+ @@ -71,9 +79,14 @@ export default { }, data() { return { + dialogFormByDay: false, + deviceId: undefined, params: { search_eq_d$venueId: undefined }, + form: { + password: '' + }, venues: [], intervalid1: undefined } @@ -105,14 +118,19 @@ export default { }) }, - handleEnter(id) { - adminEnter(id).then(response => { + handleOutPassword(id) { + this.deviceId = id + this.dialogFormByDay = true + }, + + handleEnter() { + adminEnter(this.deviceId).then(response => { this.handleSearch() }) }, handleOut(id) { - adminOut(id).then(response => { + adminOut(this.deviceId, this.form.password).then(response => { this.handleSearch() }) }, diff --git a/src/views/member/enter/veneu/log/edit.vue b/src/views/member/enter/veneu/log/edit.vue index 90530e2..438885a 100644 --- a/src/views/member/enter/veneu/log/edit.vue +++ b/src/views/member/enter/veneu/log/edit.vue @@ -78,10 +78,10 @@ export default { return { activeName: '1', form: { - id: undefined + id: 0 }, params: { - id: undefined + id: 0 } } }, From 9cf0e1be1d27015c768b8d2bd0ffc5d75dbbb4b9 Mon Sep 17 00:00:00 2001 From: limqhz <540344226@qq.com> Date: Sat, 2 Mar 2024 18:08:45 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=AF=AE=E7=90=83=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=B0=83=E6=95=B4=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=9C=BA=E9=A6=86=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/member/enter/veneu/log/index.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/member/enter/veneu/log/index.vue b/src/views/member/enter/veneu/log/index.vue index 0e807c6..69efe81 100644 --- a/src/views/member/enter/veneu/log/index.vue +++ b/src/views/member/enter/veneu/log/index.vue @@ -18,6 +18,7 @@ :value="item.value"> + @@ -158,7 +159,8 @@ export default { starTime: '', endTime: '', search_like_nickname: '', - state: undefined + state: undefined, + venueName: '' }, form: { miniMoney: undefined From db3da7bd2e3d999ed266dcbf5373144d67bf64fc Mon Sep 17 00:00:00 2001 From: limqhz <540344226@qq.com> Date: Sun, 14 Apr 2024 10:24:01 +0800 Subject: [PATCH 5/5] =?UTF-8?q?202404-=E8=B0=83=E6=95=B4=E5=87=BA=E5=9C=BA?= =?UTF-8?q?=E8=AF=9D=E6=9C=AF=EF=BC=8C=E7=AF=AE=E7=90=83=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=97=A5=E6=9C=9F=E6=9D=A1=E4=BB=B6=E8=8C=83?= =?UTF-8?q?=E5=9B=B4=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/member/enter/veneu/log/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/member/enter/veneu/log/index.vue b/src/views/member/enter/veneu/log/index.vue index 69efe81..2ab6d8b 100644 --- a/src/views/member/enter/veneu/log/index.vue +++ b/src/views/member/enter/veneu/log/index.vue @@ -197,7 +197,7 @@ export default { */ handleSearch() { if (this.params.date != null) { - this.params.endTime = moment(this.params.date[1]).format('YYYY-M-D HH:mm:ss') + this.params.endTime = moment(this.params.date[1]).format('YYYY-M-D') + ' 23:59:59' this.params.starTime = moment(this.params.date[0]).format('YYYY-M-D HH:mm:ss') } else { this.params.starTime = ''