From d2eb0e474a38dd044e48b5b1eef30292466c3b27 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Fri, 6 May 2022 16:16:07 +0800 Subject: [PATCH 1/5] change statistics stadium ls api --- src/js/api.js | 4 +++- src/pages/collection/info/info.vue | 19 ++++++++----------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/js/api.js b/src/js/api.js index cf94c0c..095333b 100644 --- a/src/js/api.js +++ b/src/js/api.js @@ -23,7 +23,9 @@ export const API = { // 20220422 收款记录 consumeCountLs: `${ORIGIN}/admin/stadium/consumeCount/list`, // 收款记录 consumeCountDetailLs: `${ORIGIN}/admin/stadium/consumeCountDetail/list`, // 收款明细列表 - consumeCountGetScene: `${ORIGIN}/consumeRecordScene/list`, // 收款明细列表 + consumeCountGetScene: `${ORIGIN}/consumeRecordScene/list`, // 场景列表 + consumeCountStadiumList: `${ORIGIN}/admin/assistant/consume/stadium/list`, // 店铺列表 + // reservationOrder: `${ORIGIN}/admin/stadium/order/list`, // 预约订单 diff --git a/src/pages/collection/info/info.vue b/src/pages/collection/info/info.vue index 646bc5f..75c2d44 100644 --- a/src/pages/collection/info/info.vue +++ b/src/pages/collection/info/info.vue @@ -99,7 +99,7 @@ export default { let { curStadium, optionsQuery, curScene, curDate, curType, page } = this; let _query = { brand_id: optionsQuery.brand_id, - stadium_id: optionsQuery.stadium_id == 0 ? -1 : curStadium.id, + stadium_id: curStadium.val || '', time_str: curDate, scene: curScene.scene, type: curType == 1 ? '退款' : '全部', @@ -119,8 +119,7 @@ export default { this.$nextTick(_=>this.refreshList()); }, async initPage(options){ - let _stadiumLs = []; - if(!!options.stadium_id)_stadiumLs = await this.getStoreList(options.stadium_id); + let _stadiumLs = await this.getStoreList(options.stadium_id); let _sceneLs = await this.getSceneList(); this.curDate = util.formatDate({}); this.$nextTick(_=>this.refreshList()); @@ -132,7 +131,7 @@ export default { let _query = { brand_id: optionsQuery.brand_id, - stadium_id: optionsQuery.stadium_id == 0 ? -1 : curStadium.id, + stadium_id: curStadium.val || '', time_str: curDate, scene: curScene.scene, type: curType == 1 ? '退款' : '全部' @@ -196,7 +195,7 @@ export default { getStoreList(stadium_id = ''){ let { optionsQuery } = this; return servers.get({ - url: API.stadiumList, + url: API.consumeCountStadiumList, data: { brand_id: optionsQuery.brand_id, }, @@ -204,18 +203,16 @@ export default { }) .then(res=>{ - let _list = res.list || []; - let _all = { name: '全部', id: -2, } - _list.unshift(_all); + let _list = res || []; let _cur = null; if(!!stadium_id){ - let _fiLs = _list.filter(e=>e.id == stadium_id); + let _fiLs = _list.filter(e=> +e.val == stadium_id); if(_fiLs.length)_cur = _fiLs[0]; } - if(_cur&&_cur.id){ + if(_cur&&_cur.val){ this.curStadium = _cur; }else{ - this.curStadium = _all; + this.curStadium = _list[0] || {}; } return this.stadiumList = _list; }) From c129056d368e51f1748a5ad573f6f3a7112343c8 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Fri, 6 May 2022 17:21:43 +0800 Subject: [PATCH 2/5] fix statistics --- src/pages/collection/info/info.vue | 4 ++-- src/pages/collection/list/list.vue | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/collection/info/info.vue b/src/pages/collection/info/info.vue index 75c2d44..2857a77 100644 --- a/src/pages/collection/info/info.vue +++ b/src/pages/collection/info/info.vue @@ -170,7 +170,7 @@ export default { url: API.consumeCountDetailLs, data: { brand_id, - stadium_id: stadium_id == 0 ? -1 : stadium_id == -2 ? '' : stadium_id, + stadium_id: stadium_id, time_str, page, page_size, @@ -224,7 +224,7 @@ export default { url: API.consumeCountGetScene, data: { brand_id: optionsQuery.brand_id, - stadium_id: optionsQuery.stadium_id == 0 ? -1 : curStadium.id, + stadium_id: curStadium.val || '', }, failMsg: '加载场景列表失败！', diff --git a/src/pages/collection/list/list.vue b/src/pages/collection/list/list.vue index f46ebfc..00704cf 100644 --- a/src/pages/collection/list/list.vue +++ b/src/pages/collection/list/list.vue @@ -20,7 +20,7 @@ - ￥{{ e.count_type_actual_income_amount || 0 }}.00 + ￥{{ e.count_type_actual_income_amount || 0 }} 日总收入 From d0ba20db3319bd718580681b829fddac59357c35 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Fri, 6 May 2022 18:01:41 +0800 Subject: [PATCH 3/5] fix statistics --- src/pages/collection/info/info.vue | 4 ++++ src/subpackage/device/pages/switch_manage/switch_manage.vue | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pages/collection/info/info.vue b/src/pages/collection/info/info.vue index 2857a77..a5d0fd1 100644 --- a/src/pages/collection/info/info.vue +++ b/src/pages/collection/info/info.vue @@ -209,8 +209,12 @@ export default { let _fiLs = _list.filter(e=> +e.val == stadium_id); if(_fiLs.length)_cur = _fiLs[0]; } + if(_cur&&_cur.val){ this.curStadium = _cur; + }else if(optionsQuery.stadium_id == 0){ + let _fLs = _list.filter(e=> +e.val == -1); + if(_fLs.length)this.curStadium = _fLs[0] || {}; }else{ this.curStadium = _list[0] || {}; } diff --git a/src/subpackage/device/pages/switch_manage/switch_manage.vue b/src/subpackage/device/pages/switch_manage/switch_manage.vue index 151d8ce..08b0af9 100644 --- a/src/subpackage/device/pages/switch_manage/switch_manage.vue +++ b/src/subpackage/device/pages/switch_manage/switch_manage.vue @@ -224,7 +224,7 @@ export default { if(switchInfo.hardware_type=="Light"&&status==2)_data.data.name = "set-rpio-lock" //针对门禁没有关按钮发两条命令->开&关 20201224 后端： 直接发两条 关的那条这里填5 然后你那边不用管返回 - if(switchInfo.hardware_type === 'AccessControl'&&status == 0)_data['delay'] = '5'; + if(switchInfo.hardware_type === 'AccessControl'&&status == 0)_data['delay'] = '3'; return _data; }, From 5f20fb54eaeb9add69a7c04cb7d29bf3d0dd8f47 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Sat, 7 May 2022 10:40:48 +0800 Subject: [PATCH 4/5] add collection stadium_id_filter --- src/pages/collection/info/info.vue | 25 +++++++++++++------------ src/pages/collection/list/list.vue | 3 ++- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/pages/collection/info/info.vue b/src/pages/collection/info/info.vue index a5d0fd1..a13d424 100644 --- a/src/pages/collection/info/info.vue +++ b/src/pages/collection/info/info.vue @@ -82,7 +82,10 @@ export default { }, data(){ return { - optionsQuery: {}, + optionsQuery: { + // stadium_id_filter + // brand_id + }, stadiumList: [], curStadium: {}, sceneList: [], @@ -98,7 +101,7 @@ export default { onReachBottom(){ let { curStadium, optionsQuery, curScene, curDate, curType, page } = this; let _query = { - brand_id: optionsQuery.brand_id, + brand_id: optionsQuery.brand_id || '', stadium_id: curStadium.val || '', time_str: curDate, scene: curScene.scene, @@ -119,7 +122,7 @@ export default { this.$nextTick(_=>this.refreshList()); }, async initPage(options){ - let _stadiumLs = await this.getStoreList(options.stadium_id); + let _stadiumLs = await this.getStoreList(options.stadium_id_filter); let _sceneLs = await this.getSceneList(); this.curDate = util.formatDate({}); this.$nextTick(_=>this.refreshList()); @@ -130,7 +133,7 @@ export default { this.recordLs = []; let _query = { - brand_id: optionsQuery.brand_id, + brand_id: optionsQuery.brand_id || '', stadium_id: curStadium.val || '', time_str: curDate, scene: curScene.scene, @@ -192,12 +195,12 @@ export default { }) }, // 店铺列表 - getStoreList(stadium_id = ''){ + getStoreList(stadium_id_filter = ''){ let { optionsQuery } = this; return servers.get({ url: API.consumeCountStadiumList, data: { - brand_id: optionsQuery.brand_id, + brand_id: optionsQuery.brand_id || '', }, failMsg: '加载店铺列表失败！', @@ -205,16 +208,14 @@ export default { .then(res=>{ let _list = res || []; let _cur = null; - if(!!stadium_id){ - let _fiLs = _list.filter(e=> +e.val == stadium_id); + // 页面传参 undefined => 'undefined' + if(stadium_id_filter != undefined&&stadium_id_filter != 'undefined'){ + let _fiLs = _list.filter(e=> e.val == stadium_id_filter); if(_fiLs.length)_cur = _fiLs[0]; } if(_cur&&_cur.val){ this.curStadium = _cur; - }else if(optionsQuery.stadium_id == 0){ - let _fLs = _list.filter(e=> +e.val == -1); - if(_fLs.length)this.curStadium = _fLs[0] || {}; }else{ this.curStadium = _list[0] || {}; } @@ -227,7 +228,7 @@ export default { return servers.get({ url: API.consumeCountGetScene, data: { - brand_id: optionsQuery.brand_id, + brand_id: optionsQuery.brand_id || '', stadium_id: curStadium.val || '', }, failMsg: '加载场景列表失败！', diff --git a/src/pages/collection/list/list.vue b/src/pages/collection/list/list.vue index 00704cf..6b105be 100644 --- a/src/pages/collection/list/list.vue +++ b/src/pages/collection/list/list.vue @@ -65,7 +65,8 @@ export default { }, methods: { toInfo(e){ - util.routeTo(`/pages/collection/info/info?stadium_id=${e.stadium_id}&brand_id=${e.brand_id}`, 'nT') + let _qyStr = `stadium_id_filter=${e.stadium_id_filter}&brand_id=${e.brand_id}` + util.routeTo(`/pages/collection/info/info?${_qyStr}`, 'nT') }, showModal(e){ util.showModal({ From 96a89c587d040a63007c05c048d3a8b0a0f2fad6 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Sat, 7 May 2022 17:41:09 +0800 Subject: [PATCH 5/5] fix statistics --- src/pages/turnover/turnover.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/turnover/turnover.vue b/src/pages/turnover/turnover.vue index 5c8429a..4008dfa 100644 --- a/src/pages/turnover/turnover.vue +++ b/src/pages/turnover/turnover.vue @@ -79,7 +79,7 @@ 收款{{ botData.offline_income_num || '0' }}笔 - （ ￥{{botData.offline_income_amount || '0.00'}} ） + （ ￥{{botData.offline_income_amount || '0'}} ） 退款{{ botData.offline_refund_num || '0' }}笔