XWookey 1 tahun lalu
induk
melakukan
fcc9e53d95

+ 8 - 0
components/datePicker/datePicker.js

@@ -75,6 +75,14 @@ Component({
       })
     },
     changeDateTime(e) { 
+      if(!e){
+        this.setData({
+          dateTimeWhole: '',
+          "params.pText":''
+        })
+        this.triggerEvent('getDateString', this.data.dateTimeWhole)
+        return;
+      }
       this.data.dateTime = e.detail.value
       const year = this.data.dateTimeArray[0][this.data.dateTime[0]].replace(/年/, '')
       const month = this.data.dateTimeArray[1][this.data.dateTime[1]].replace(/月/, '')

+ 2 - 1
pages/charginfo/charginfo.wxss

@@ -255,12 +255,13 @@ text.price {
 
 .iconleft .icon{
   margin-top: 20rpx;
+  margin-bottom: 20rpx;
   /*margin-left: 60rpx;*/
 }
 
 .startpower{
   font-size: 26rpx;
-  margin: 5rpx 0;
+  /* margin: 8rpx 0; */
   color: #039BE5;
 }
 

+ 7 - 6
pages/reservation/reservation.js

@@ -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
         })
       }
     });

+ 6 - 16
pages/reservation/reservationEdit.js

@@ -42,29 +42,19 @@ Page({
     let curTime4 = new Date(currTime);
     let eetime = new Date(curTime4.setMinutes(curTime4.getMinutes() + parseInt(this.data.maxReservTime)));
 
-    console.info(Util.formatTimePicker(estime))
-    console.info(Util.formatTimePicker(eetime))
-    console.info(endparams?.pText)
     if(endparams?.pText){
       let currEndTime = new Date(endparams.pText);
       if(currEndTime<=currTime){
-        console.info("111111111111111111111111111111111111111111111111111")
-        this.setData({
-          "finishparams.pText":'',
-        });
+        this.selectComponent("#end").changeDateTime('')
+        // this.selectComponent("#end").initData()
       }
     }
 
-    this.selectComponent("#start").initData()
-    this.setData({
-      "finishparams.startDateTime":Util.formatTimePicker(estime),
-      "finishparams.endDateTime":Util.formatTimePicker(eetime),
-    }
-    );
+    this.selectComponent("#end").data.startDateTime = Util.formatTimePicker(estime);
+    this.selectComponent("#end").data.endDateTime = Util.formatTimePicker(eetime),
+    this.selectComponent("#end").initData()
 
-    console.info(this.data.finishparams.startDateTime)
-    console.info(this.data.finishparams.endDateTime)
-    console.info(this.data.finishparams.pText)
+  
   },
 
   bindFinishparamsChange(e){