|
@@ -125,7 +125,7 @@ Page({
|
|
|
chargStationName
|
|
|
} = this.data;
|
|
|
wx.request({
|
|
|
- url: getApp().globalData.postHeadAgreement +'/restapi/wechat/ReservOrder?userId=' + userId + '&reservPileNo=' + chargPileId,
|
|
|
+ url: getApp().globalData.postHeadAgreement +'/restapi/wechat/ReservOrder?userId=' + userId + '&pileId=' + chargPileIdId + '&stationId=' + chargStationId + '&reservPileNo=' +chargPileId ,
|
|
|
data: {
|
|
|
},
|
|
|
method: 'POST',
|
|
@@ -155,7 +155,7 @@ Page({
|
|
|
series.endtime = series.reservChargeEndTime.substr(11,5);
|
|
|
});
|
|
|
current.sort((a,b)=>{
|
|
|
- return a.reservChargeStartTime - b.reservChargeStartTime
|
|
|
+ return new Date(a.reservChargeStartTime) - new Date(b.reservChargeStartTime)
|
|
|
})
|
|
|
let second = res?.data?.result?.cursecondrent;
|
|
|
second.forEach(series => {
|
|
@@ -163,7 +163,7 @@ Page({
|
|
|
series.endtime = series.reservChargeEndTime.substr(11,5);
|
|
|
});
|
|
|
second.sort((a,b)=>{
|
|
|
- return a.reservChargeStartTime - b.reservChargeStartTime
|
|
|
+ return new Date(a.reservChargeStartTime) - new Date(b.reservChargeStartTime)
|
|
|
})
|
|
|
let three = res?.data?.result?.three;
|
|
|
three.forEach(series => {
|
|
@@ -171,7 +171,7 @@ Page({
|
|
|
series.endtime = series.reservChargeEndTime.substr(11,5);;
|
|
|
});
|
|
|
three.sort((a,b)=>{
|
|
|
- return a.reservChargeStartTime - b.reservChargeStartTime
|
|
|
+ return new Date(a.reservChargeStartTime) - new Date(b.reservChargeStartTime)
|
|
|
})
|
|
|
let four = res?.data?.result?.four;
|
|
|
four.forEach(series => {
|
|
@@ -179,7 +179,7 @@ Page({
|
|
|
series.endtime = series.reservChargeEndTime.substr(11,5);
|
|
|
});
|
|
|
four.sort((a,b)=>{
|
|
|
- return a.reservChargeStartTime - b.reservChargeStartTime
|
|
|
+ return new Date(a.reservChargeStartTime) - new Date(b.reservChargeStartTime)
|
|
|
})
|
|
|
let now = new Date();
|
|
|
let dayFlag1 = (now.getMonth() + 1) + "." + now.getDate()
|
|
@@ -207,7 +207,8 @@ Page({
|
|
|
dayFlag1,
|
|
|
dayFlag2,
|
|
|
dayFlag3,
|
|
|
- dayFlag4
|
|
|
+ dayFlag4,
|
|
|
+ dayIndex:1
|
|
|
})
|
|
|
}
|
|
|
});
|