From d58080b976dcbfb45f379667e65c63a638560cc3 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Fri, 6 Aug 2021 17:31:16 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=9C=BA=E5=9C=B0=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=A1=A5=E5=85=857=E5=A4=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/js/api.js | 4 ++-- src/manifest.json | 2 +- src/pages/site/manage/manage.vue | 11 ++++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/js/api.js b/src/js/api.js index 2e6037b..89e10e2 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 API = { wechatMiniAppLoginAndSync: `${ORIGIN}/assistant/WechatMiniAppGetToken`, // 小程序授权获取token，为空就登录 diff --git a/src/manifest.json b/src/manifest.json index 25d192e..32b6894 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -54,7 +54,7 @@ }, "mp-weixin": { /* 微信小程序特有相关 */ - "appid": "wxf1294b279ad1b845", + "appid": "wx7106e84614cf0060", "setting": { "urlCheck": false }, diff --git a/src/pages/site/manage/manage.vue b/src/pages/site/manage/manage.vue index b063911..8affec2 100644 --- a/src/pages/site/manage/manage.vue +++ b/src/pages/site/manage/manage.vue @@ -232,11 +232,12 @@ export default { let _todayTimestamp = new Date(new Date().toLocaleDateString().replace(/\-/g, '/')).getTime(); // 当天0点 let _oneDateTimestamp = 24*60*60*1000; // if(_selectedDateTimestamp<_todayTimestamp)return util.showNone(`请选择${new Date().toLocaleDateString().replace(/\-/g, '/')}之后日期`); - let _startTimestamp = _type == 'start' ? _selectedDateTimestamp : new Date(dateList[0].dateStr.replace(/\-/g, '/')).getTime(); - let _endTimestamp = _type == 'end' ? _selectedDateTimestamp: new Date(dateList[dateList.length-1].dateStr.replace(/\-/g, '/')).getTime(); - if(_endTimestamp<_startTimestamp)return util.showNone('请选择正常范围！'); - let _dateLength = +(((_endTimestamp - _startTimestamp) /_oneDateTimestamp + 1).toFixed()); - if(_dateLength>7)return util.showNone('不能超过7天范围！'); + let _startTimestamp = _type == 'start' ? _selectedDateTimestamp :_type == 'end' ? _selectedDateTimestamp - (7*_oneDateTimestamp) :_todayTimestamp; + // let _endTimestamp = _type == 'end' ? _selectedDateTimestamp : new Date(dateList[dateList.length-1].dateStr.replace(/\-/g, '/')).getTime(); + // if(_endTimestamp<_startTimestamp)return util.showNone('请选择正常范围！'); + // let _dateLength = +(((_endTimestamp - _startTimestamp) /_oneDateTimestamp + 1).toFixed()); + let _dateLength = 8; + // if(_dateLength>7)return util.showNone('不能超过7天范围！'); let _dateArr = this.getDateList({ startTimestamp: _startTimestamp, length: _dateLength From a9d42c61fd8a313d5a6f5b19fd23e1261f28e64e Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Fri, 6 Aug 2021 18:07:19 +0800 Subject: [PATCH 2/4] fix manage --- src/pages/site/manage/manage.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/site/manage/manage.vue b/src/pages/site/manage/manage.vue index 8affec2..4acf3e1 100644 --- a/src/pages/site/manage/manage.vue +++ b/src/pages/site/manage/manage.vue @@ -232,7 +232,7 @@ export default { let _todayTimestamp = new Date(new Date().toLocaleDateString().replace(/\-/g, '/')).getTime(); // 当天0点 let _oneDateTimestamp = 24*60*60*1000; // if(_selectedDateTimestamp<_todayTimestamp)return util.showNone(`请选择${new Date().toLocaleDateString().replace(/\-/g, '/')}之后日期`); - let _startTimestamp = _type == 'start' ? _selectedDateTimestamp :_type == 'end' ? _selectedDateTimestamp - (7*_oneDateTimestamp) :_todayTimestamp; + let _startTimestamp = _type == 'start' ? _selectedDateTimestamp :_type == 'end' ? _selectedDateTimestamp - (7*_oneDateTimestamp) : _todayTimestamp; // let _endTimestamp = _type == 'end' ? _selectedDateTimestamp : new Date(dateList[dateList.length-1].dateStr.replace(/\-/g, '/')).getTime(); // if(_endTimestamp<_startTimestamp)return util.showNone('请选择正常范围！'); // let _dateLength = +(((_endTimestamp - _startTimestamp) /_oneDateTimestamp + 1).toFixed()); From e0331b5d6657a7623a2c44181e4d59436cc08821 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Mon, 9 Aug 2021 15:24:20 +0800 Subject: [PATCH 3/4] fix all && vtest 1.1.5 --- src/components/site/order_modal/order_modal.vue | 9 ++++++--- src/subpackage/device/pages/switch_manage/switch_manage.vue | 6 +++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/components/site/order_modal/order_modal.vue b/src/components/site/order_modal/order_modal.vue index e2fb1b4..b1f53b8 100644 --- a/src/components/site/order_modal/order_modal.vue +++ b/src/components/site/order_modal/order_modal.vue @@ -89,8 +89,10 @@ 实付款 ￥{{ orderInfo.amount || '0' }} - 分享给朋友 - 取消占用 + + 分享给朋友 + 取消占用 + @@ -227,7 +229,8 @@ export default { return '已失效' case 8: return '使用中' - default: return '-' + default: + return '-' } }, getTitle(type){ diff --git a/src/subpackage/device/pages/switch_manage/switch_manage.vue b/src/subpackage/device/pages/switch_manage/switch_manage.vue index 3f691e4..24b75ce 100644 --- a/src/subpackage/device/pages/switch_manage/switch_manage.vue +++ b/src/subpackage/device/pages/switch_manage/switch_manage.vue @@ -63,7 +63,7 @@ const showArr = { id: 1, name: '照明管理', isOpen: true, isClose: true, isLongOpen:true, isTiming:true, openIcon: '/subpackage/device/static/images/open.png',closeIcon: '/subpackage/device/static/images/close.png', longOpenIcon: '/subpackage/device/static/images/longOpen.png',timingIcon: '/subpackage/device/static/images/timing.png', - openName: '开', closeName: '关', longOpenName: '长按', timingName: '定时', hardware_type: 'Light',iconNum:4 + openName: '开', closeName: '关', longOpenName: '长开', timingName: '定时', hardware_type: 'Light',iconNum:4 }, 's2': { id: 2, name: '空调管理', isOpen: true, isClose: true, @@ -76,7 +76,7 @@ const showArr = { openIcon: '/subpackage/device/static/images/open.png', closeIcon: '/subpackage/device/static/images/close.png', longOpenIcon: '/subpackage/device/static/images/longOpen.png',timingIcon: '/subpackage/device/static/images/timing.png', - openName: '开', closeName: '关', hardware_type: 'Fan',longOpenName: '长按', timingName: '定时',iconNum:4, + openName: '开', closeName: '关', hardware_type: 'Fan',longOpenName: '长开', timingName: '定时',iconNum:4, }, 's4': { id: 4, name: '门禁管理', isOpen: true, isClose: false, @@ -101,7 +101,7 @@ const showArr = { openIcon: '/subpackage/device/static/images/open.png', closeIcon: '/subpackage/device/static/images/close.png', longOpenIcon: '/subpackage/device/static/images/longOpen.png',timingIcon: '/subpackage/device/static/images/timing.png', - openName: '开', closeName: '关', hardware_type: 'WaterValve',longOpenName: '长按', timingName: '定时',iconNum:4, + openName: '开', closeName: '关', hardware_type: 'WaterValve',longOpenName: '长开', timingName: '定时',iconNum:4, }, 's12': { id: 12, name: '互动设备管理', isOpen: true, isClose: true, From 2f21e93d23e00f14612a29790c1d2dc04a550740 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Mon, 9 Aug 2021 15:31:45 +0800 Subject: [PATCH 4/4] 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 89e10e2..2e6037b 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 API = { wechatMiniAppLoginAndSync: `${ORIGIN}/assistant/WechatMiniAppGetToken`, // 小程序授权获取token，为空就登录 diff --git a/src/manifest.json b/src/manifest.json index 32b6894..25d192e 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -54,7 +54,7 @@ }, "mp-weixin": { /* 微信小程序特有相关 */ - "appid": "wx7106e84614cf0060", + "appid": "wxf1294b279ad1b845", "setting": { "urlCheck": false },