样式调整

pages/charginfo/charginfo.wxss

@@ -234,7 +234,7 @@ text.price {
 
 .chargInfo_v{
   flex-direction: column;
-  justify-content: center;
+  padding: 40rpx 0;
   display: flex;
   width:440rpx;
   color: #888888;
@@ -247,6 +247,7 @@ text.price {
 }
 
 .iconleft{
+  height: 100%;
   width: 140rpx;
   display: flex;
   margin-right: 20rpx;
@@ -263,6 +264,7 @@ text.price {
   font-size: 26rpx;
   /* margin: 8rpx 0; */
   color: #039BE5;
+  line-height: 26rpx;
 }
 
 .bottomm{

pages/reservation/reservation.js

@@ -148,19 +148,36 @@ Page({
         maxEarlyExerciseTime = maxEarlyExerciseTime?maxEarlyExerciseTime:0;
         let maxReservOvertime = res?.data?.result?.reservationConfig?.maxReservOvertime
         maxReservOvertime = maxReservOvertime?maxReservOvertime:0;
+        let nowZero = new Date();
+        nowZero.setMilliseconds(0)
+        nowZero.setSeconds(0)
+        nowZero.setMinutes(0)
+        nowZero.setHours(0)
+        let currentEnd =  new Date(nowZero.setDate(nowZero.getDate() + 1 ));
+        let secondEnd =  new Date(nowZero.setDate(nowZero.getDate() + 1 ));
+        let threeEnd =  new Date(nowZero.setDate(nowZero.getDate() + 1 ));
+        let fourEnd =  new Date(nowZero.setDate(nowZero.getDate() + 1 ));
 
         let current = res?.data?.result?.current;
         current.forEach(series => {
           series.starttime = series.reservChargeStartTime.substr(11,5);
           series.endtime = series.reservChargeEndTime.substr(11,5);
+          let reservChargeEndTime = new Date(series.reservChargeEndTime);
+          if(currentEnd < reservChargeEndTime){
+            series.endtime =  series.endtime + " (次日)"
+          }
         });
         current.sort((a,b)=>{
           return new Date(a.reservChargeStartTime) - new Date(b.reservChargeStartTime)
         })
-        let second = res?.data?.result?.cursecondrent;
+        let second = res?.data?.result?.second;
         second.forEach(series => {
           series.starttime = series.reservChargeStartTime.substr(11,5);
           series.endtime = series.reservChargeEndTime.substr(11,5);
+          let reservChargeEndTime = new Date(series.reservChargeEndTime);
+          if(secondEnd < reservChargeEndTime){
+            series.endtime =  series.endtime + " (次日)"
+          }
         });
         second.sort((a,b)=>{
           return new Date(a.reservChargeStartTime) - new Date(b.reservChargeStartTime)
@@ -168,7 +185,11 @@ Page({
         let three = res?.data?.result?.three;
         three.forEach(series => {
           series.starttime = series.reservChargeStartTime.substr(11,5);
-          series.endtime = series.reservChargeEndTime.substr(11,5);;
+          series.endtime = series.reservChargeEndTime.substr(11,5);
+          let reservChargeEndTime = new Date(series.reservChargeEndTime);
+          if(threeEnd < reservChargeEndTime){
+            series.endtime =  series.endtime + " (次日)"
+          }
         });
         three.sort((a,b)=>{
           return new Date(a.reservChargeStartTime) - new Date(b.reservChargeStartTime)
@@ -177,6 +198,10 @@ Page({
         four.forEach(series => {
           series.starttime = series.reservChargeStartTime.substr(11,5);
           series.endtime = series.reservChargeEndTime.substr(11,5);
+          let reservChargeEndTime = new Date(series.reservChargeEndTime);
+          if(fourEnd < reservChargeEndTime){
+            series.endtime =  series.endtime + " (次日)"
+          }
         });
         four.sort((a,b)=>{
           return new Date(a.reservChargeStartTime) - new Date(b.reservChargeStartTime)