From 532cfbe94b7c47b2cd8b79117379bbbe49310e8b Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Mon, 3 Jun 2024 16:00:31 +0800 Subject: [PATCH 1/3] recover switch condition --- src/subpackage/device/pages/switch_manage/switch_manage.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/subpackage/device/pages/switch_manage/switch_manage.vue b/src/subpackage/device/pages/switch_manage/switch_manage.vue index 0bedd02..d00c0af 100644 --- a/src/subpackage/device/pages/switch_manage/switch_manage.vue +++ b/src/subpackage/device/pages/switch_manage/switch_manage.vue @@ -241,10 +241,12 @@ export default { }; //2021-12-17 群里说的那个锁的 需要全部关闭灯的按钮从 set-rpio 变成 set-rpio-lock 普通开灯保持不变 加锁开灯(长开) set-rpio-lock - // 20240530 灯控 常开和关闭需要改成set-rpio-lock + if(switchInfo.hardware_type=="Light"&&_data.data.value.status=="high")_data.data.name = "set-rpio-lock" + if(switchInfo.hardware_type=="Light"&&status==2)_data.data.name = "set-rpio-lock" + // 20240530 灯控 云中控 常开和关闭需要改成set-rpio-lock ，（单独对yzk 上面有覆盖不管） if( switchInfo?.hardware_type === "Light" - // &&this.changeLowerCase(switchInfo?.hardware_connect_method ?? '') === 'yzk' + &&this.changeLowerCase(switchInfo?.hardware_connect_method ?? '') === 'yzk' &&(status === 2 || status === 0) ){ _data.data.name = "set-rpio-lock"; From f775a537d3c701ec3080d7509401121c950d7e21 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Mon, 3 Jun 2024 18:12:00 +0800 Subject: [PATCH 2/3] vtest 1.1.55 --- src/js/api.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/js/api.js b/src/js/api.js index a62630f..1b0663b 100644 --- a/src/js/api.js +++ b/src/js/api.js @@ -170,4 +170,3 @@ API['party'] = { export default { ORIGIN, API }; - From 18dffb1f084aee64496e41be878f28505483169e Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Mon, 3 Jun 2024 18:20:28 +0800 Subject: [PATCH 3/3] v1.1.5 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 1b0663b..c295961 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 d409cc9..3fe960c 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -73,7 +73,7 @@ // } // }, /* 正式 wxf1294b279ad1b845 */ - "appid" : "wx7106e84614cf0060", + "appid" : "wxf1294b279ad1b845", "setting" : { "urlCheck" : false, "minified" : true