|
@@ -1,4 +1,4 @@
|
|
|
-let weekArray = new Array("日", "一", "二", "三", "四", "五", "六").map(x=>`星期${x}`);
|
|
|
+let weekArray = new Array("日", "一", "二", "三", "四", "五", "六").map(x => `星期${x}`);
|
|
|
|
|
|
//格式化日期
|
|
|
const formatDate = (date = new Date()) => {
|
|
@@ -12,6 +12,7 @@ const formatDate = (date = new Date()) => {
|
|
|
const day = date.getDate()
|
|
|
return [year, month, day].map(formatNumber).join('-')
|
|
|
}
|
|
|
+
|
|
|
function formatTime(time) {
|
|
|
if (typeof time !== 'number' || time < 0) {
|
|
|
return time
|
|
@@ -23,11 +24,12 @@ function formatTime(time) {
|
|
|
time = parseInt(time % 60, 10)
|
|
|
const second = time
|
|
|
|
|
|
- return ([hour, minute, second]).map(function (n) {
|
|
|
+ return ([hour, minute, second]).map(function(n) {
|
|
|
n = n.toString()
|
|
|
return n[1] ? n : '0' + n
|
|
|
}).join(':')
|
|
|
}
|
|
|
+
|
|
|
function formatDateTime(date, withMs = false) {
|
|
|
|
|
|
function formatLeadingZeroNumber(n, digitNum = 2) {
|
|
@@ -52,7 +54,7 @@ function formatDateTime(date, withMs = false) {
|
|
|
return ret
|
|
|
}
|
|
|
|
|
|
-function dateLaters(days, todate= new Date()) {
|
|
|
+function dateLaters(days, todate = new Date()) {
|
|
|
var dateArry = [];
|
|
|
for (var i = 0; i < days; i++) {
|
|
|
var dateObj = dateLater(todate, i);
|
|
@@ -60,7 +62,8 @@ function dateLaters(days, todate= new Date()) {
|
|
|
}
|
|
|
return dateArry;
|
|
|
}
|
|
|
-function dateLater(dates, later=0) {
|
|
|
+
|
|
|
+function dateLater(dates, later = 0) {
|
|
|
let date = new Date(dates);
|
|
|
date.setDate(date.getDate() + later);
|
|
|
let day = date.getDay();
|
|
@@ -69,7 +72,7 @@ function dateLater(dates, later=0) {
|
|
|
let dayFormate = (date.getDate() < 10 ? ("0" + date.getDate()) : date.getDate());
|
|
|
return [yearDate + '-' + month + '-' + dayFormate, weekArray[day]];
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
|
|
|
|
|
|
function formatLocation(longitude, latitude) {
|
|
@@ -86,16 +89,17 @@ function formatLocation(longitude, latitude) {
|
|
|
latitude: latitude.toString().split('.')
|
|
|
}
|
|
|
}
|
|
|
-function getDateStr(today, addDayCount){
|
|
|
+
|
|
|
+function getDateStr(today, addDayCount) {
|
|
|
var dd;
|
|
|
if (today) {
|
|
|
dd = new Date(today);
|
|
|
} else {
|
|
|
dd = new Date();
|
|
|
}
|
|
|
- dd.setDate(dd.getDate() + addDayCount);//获取AddDayCount天后的日期
|
|
|
+ dd.setDate(dd.getDate() + addDayCount); //获取AddDayCount天后的日期
|
|
|
var y = dd.getFullYear();
|
|
|
- var m = dd.getMonth() + 1;//获取当前月份的日期
|
|
|
+ var m = dd.getMonth() + 1; //获取当前月份的日期
|
|
|
var d = dd.getDate();
|
|
|
if (m < 10) {
|
|
|
m = '0' + m;
|
|
@@ -113,7 +117,7 @@ function httpRequest(url, data = {}, method = "GET") {
|
|
|
} else if (method == 'POST' || method == 'post') {
|
|
|
contentType = 'application/x-www-form-urlencoded'
|
|
|
}
|
|
|
- return new Promise(function (resolve, reject) {
|
|
|
+ return new Promise(function(resolve, reject) {
|
|
|
wx.request({
|
|
|
url: url,
|
|
|
data: data,
|
|
@@ -121,15 +125,15 @@ function httpRequest(url, data = {}, method = "GET") {
|
|
|
header: {
|
|
|
'Content-Type': contentType,
|
|
|
},
|
|
|
- success: function (res) {
|
|
|
+ success: function(res) {
|
|
|
console.log(res);
|
|
|
- if (res.data.errmsg == "success") {
|
|
|
+ if (res.data.errmsg == "success" || res.data.errmsg == '成功') {
|
|
|
resolve(res);
|
|
|
} else {
|
|
|
console.log('请求失败');
|
|
|
}
|
|
|
},
|
|
|
- fail: function (res) {
|
|
|
+ fail: function(res) {
|
|
|
console.log(res);
|
|
|
resolve(res);
|
|
|
}
|
|
@@ -146,4 +150,4 @@ module.exports = {
|
|
|
formatLocation,
|
|
|
getDateStr,
|
|
|
httpRequest
|
|
|
-}
|
|
|
+}
|