From d58080b976dcbfb45f379667e65c63a638560cc3 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Fri, 6 Aug 2021 17:31:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=BA=E5=9C=B0=E6=97=B6=E9=97=B4=E8=87=AA?= =?UTF-8?q?=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