From d1c52453d0c46900de9d1d077865409ba7a6e3ab Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Tue, 4 Jan 2022 09:43:08 +0800 Subject: [PATCH 1/5] vtest 1.1.14 --- src/js/api.js | 4 ++-- src/manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/js/api.js b/src/js/api.js index eea9f31..9e91b77 100644 --- a/src/js/api.js +++ b/src/js/api.js @@ -1,5 +1,5 @@ -// export const ORIGIN = `https://testmanager.ouxuanzhineng.cn`; // 测试 -export const ORIGIN = `https://minimanage.ouxuanzhineng.cn`; // 正式 +export const ORIGIN = `https://testmanager.ouxuanzhineng.cn`; // 测试 +// export const ORIGIN = `https://minimanage.ouxuanzhineng.cn`; // 正式 // export const ORIGIN = `http://192.168.1.135:9090`; // 20210927 测试 diff --git a/src/manifest.json b/src/manifest.json index a5b378a..98b6d1a 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -55,7 +55,7 @@ /* 快应用特有相关 */ "mp-weixin" : { /* 微信小程序特有相关 */ - "appid" : "wxf1294b279ad1b845", + "appid" : "wx7106e84614cf0060", "setting" : { "urlCheck" : false }, From 0cec1764df5322bd153a09509d06889c862c9054 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Tue, 4 Jan 2022 10:37:53 +0800 Subject: [PATCH 2/5] del refund btn --- .../order/reservation_site_detail/reservation_site_detail.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/subpackage/device/components/order/reservation_site_detail/reservation_site_detail.vue b/src/subpackage/device/components/order/reservation_site_detail/reservation_site_detail.vue index 31e3e37..b5ba273 100644 --- a/src/subpackage/device/components/order/reservation_site_detail/reservation_site_detail.vue +++ b/src/subpackage/device/components/order/reservation_site_detail/reservation_site_detail.vue @@ -119,7 +119,8 @@ - 退款 + + From 3ce2b0ec28240ededba6f9a367ee44e425e1ee5a Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Tue, 4 Jan 2022 17:08:41 +0800 Subject: [PATCH 3/5] fix checkLinkageVenue --- src/pages/site/manage/manage.vue | 44 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 40 insertions(+), 4 deletions(-) diff --git a/src/pages/site/manage/manage.vue b/src/pages/site/manage/manage.vue index 35738e8..a19af18 100644 --- a/src/pages/site/manage/manage.vue +++ b/src/pages/site/manage/manage.vue @@ -398,19 +398,52 @@ export default { }, // 检查&设置联动禁选场地 + // checkLinkageVenue({ + // group = 0, // 所点击场地列表 + // venueList = [], // 所有场地 + // selectedKey = 'selectedKey', // 选中key + // linkageKey = 'linkageKey', // 联动禁用key + // linkageIDArrKey = 'link_venue_ids', + // linkageIDKey = 'venue_id', + // curTag + // }){ + // let _curGroupInfo = {...venueList[group]}; + // for(let i=0; i{ + // // 单列联动 + // if(venueList[i].link_venue_ids && venueList[i].link_venue_ids.length == 1){ + // venueList[i].items[ele._defineIndex][linkageKey] = !!_curGroupInfo.items[ele._defineIndex][selectedKey]; + // } + // // 多列联动 + // if(venueList[i].link_venue_ids && venueList[i].link_venue_ids.length > 1){ + // let _link_venueLs = venueList.filter(item=> venueList[i].link_venue_ids.includes(item[linkageIDKey])); + // // 已联动列表选中情况 ex: [ true, false ]; + // let _link_venueLs_selectedLs = _link_venueLs.map(el=> el['items'][ele._defineIndex] && el['items'][ele._defineIndex][selectedKey]); + // venueList[i].items[ele._defineIndex][linkageKey] = _link_venueLs_selectedLs.includes(true); // 多场联动，只要有一个被选中就禁止 + // } + // }); + // } + // } + // return venueList || []; + // }, + // 场地》》》检查&设置联动禁选场地 checkLinkageVenue({ group = 0, // 所点击场地列表 venueList = [], // 所有场地 selectedKey = 'selectedKey', // 选中key linkageKey = 'linkageKey', // 联动禁用key - linkageIDArrKey = 'link_venue_ids', - linkageIDKey = 'venue_id', + linkageIDArrKey = 'link_venue_ids', // 后台提供联动列表 + linkageIDKey = 'venue_id', // 对应列表 id curTag }){ let _curGroupInfo = {...venueList[group]}; for(let i=0; i_curGroupInfo[linkageIDKey] !=ele); if(_link_venue_ids.includes(venueList[i][linkageIDKey])){ _curGroupInfo.items.forEach(ele=>{ // 单列联动 @@ -419,7 +452,10 @@ export default { } // 多列联动 if(venueList[i].link_venue_ids && venueList[i].link_venue_ids.length > 1){ - let _link_venueLs = venueList.filter(item=> venueList[i].link_venue_ids.includes(item[linkageIDKey])); + // 过滤自身联动id （后端bug） + let _linkVenueIds = venueList[i].link_venue_ids.filter(e=>e !=venueList[i][linkageIDKey]); + // 查找所有联动场地列表 + let _link_venueLs = venueList.filter(item=> _linkVenueIds.includes(item[linkageIDKey])); // 已联动列表选中情况 ex: [ true, false ]; let _link_venueLs_selectedLs = _link_venueLs.map(el=> el['items'][ele._defineIndex] && el['items'][ele._defineIndex][selectedKey]); venueList[i].items[ele._defineIndex][linkageKey] = _link_venueLs_selectedLs.includes(true); // 多场联动，只要有一个被选中就禁止 From 9c87427a23b65fe7235f44deea9f8816f11e84b9 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Fri, 7 Jan 2022 17:37:46 +0800 Subject: [PATCH 4/5] vtest 1.1.16 --- src/subpackage/device/pages/switch_manage/switch_manage.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/subpackage/device/pages/switch_manage/switch_manage.vue b/src/subpackage/device/pages/switch_manage/switch_manage.vue index 4ee252e..3018526 100644 --- a/src/subpackage/device/pages/switch_manage/switch_manage.vue +++ b/src/subpackage/device/pages/switch_manage/switch_manage.vue @@ -199,6 +199,7 @@ export default { if(switchInfo.hardware_type === 'AccessControl'&&status == 1){ + //针对门禁没有关按钮发两条命令->开&关 20201224 后端： 直接发两条 关的那条这里填5 然后你那边不用管返回 this.operateReq({data: this.getOperateReqData({ switchInfo, status: 0 }), isTip: false, isLoad: false}); } @@ -272,7 +273,7 @@ export default { } let _data = this.getSwitchStatusQuery(switchInfo); - _data = DEVICE_FUN.AC_filterCloudACData(data,switchInfo); + _data = DEVICE_FUN.AC_filterCloudACData(_data,switchInfo); this.getStatusReq({ data: _data, @@ -292,10 +293,10 @@ export default { util.hideLoad(); let _data = res.data || {}; console.log(this.changeLowerCase(_data.data)) - if(_data.code == 504 || this.changeLowerCase(_data.data).indexOf('timeout')!=-1){ + if(_data.code == 504 || this.changeLowerCase(_data.data).indexOf('timeout')!=-1){ // 不在线 _deviceList[index]['defineStatusCode'] = 0; - }else if(_data.code == 0&&this.changeLowerCase(_data.data).indexOf('timeout')==-1){ + }else if(_data.code == 0&&this.changeLowerCase(_data.data).indexOf('timeout')==-1){ // 在线 _deviceList[index]['defineStatusCode'] = 1; }else{ util.showNone(_data.message || '操作失败！'); From fb5d1262c2a2bf5b05cf644ff4126d14e32e0738 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Fri, 7 Jan 2022 17:41:38 +0800 Subject: [PATCH 5/5] v1.1.16 formal --- src/js/api.js | 4 ++-- src/manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/js/api.js b/src/js/api.js index 9e91b77..eea9f31 100644 --- a/src/js/api.js +++ b/src/js/api.js @@ -1,5 +1,5 @@ -export const ORIGIN = `https://testmanager.ouxuanzhineng.cn`; // 测试 -// export const ORIGIN = `https://minimanage.ouxuanzhineng.cn`; // 正式 +// export const ORIGIN = `https://testmanager.ouxuanzhineng.cn`; // 测试 +export const ORIGIN = `https://minimanage.ouxuanzhineng.cn`; // 正式 // export const ORIGIN = `http://192.168.1.135:9090`; // 20210927 测试 diff --git a/src/manifest.json b/src/manifest.json index 98b6d1a..a5b378a 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -55,7 +55,7 @@ /* 快应用特有相关 */ "mp-weixin" : { /* 微信小程序特有相关 */ - "appid" : "wx7106e84614cf0060", + "appid" : "wxf1294b279ad1b845", "setting" : { "urlCheck" : false },