微调

pages/charginfo/charginfo.wxml

@@ -94,18 +94,16 @@
   <scroll-view class='context' scroll-y='true' bindscrolltolower="bindScrollTolowerEvent" >
     <view class="charg"  hover-class='active' wx:key='{{key}}' wx:for="{{chargList}}" >
       <view class="runstatus {{item.chargstatusclass}}">
-        <view class="runstatus_inner ">
-          {{item.chargstatusname}}
-        </view>
+      <view class="runstatus_inner ">{{item.chargstatusname}}</view>
       </view>
       <view class="chargInfo_v">
       <view class="chargInfo_v_name">{{item.chargPileName}}</view>
-      <view class="chargInfo_v_id">{{item.chargPileId}}  <text wx:if="{{item.openStatus}}" class="seeReservation" bindtap="seeReservation" bindtap="seeReservation"  data-idx="{{item}}">查看预约</text></view>
+      <view class="chargInfo_v_id"><text style="width:300rpx">{{item.chargPileId}}</text><text wx:if="{{!item.openStatus}}" decode="{{true}}" space="nbsp">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</text><text wx:if="{{item.openStatus}}" class="seeReservation" bindtap="seeReservation" bindtap="seeReservation"  data-idx="{{item}}">查看预约</text><text class="startpower" wx:if="{{!userInfo.flag && item.chargstatusname=='已插枪'}}"  data-keywords="{{item}}"  bindtap="{{(!userInfo.flag && item.chargstatusname=='已插枪')?'goScanResult':''}}">启动充电 ></text></view>
       </view>
-      <view class="iconleft" >
+      <view class="iconCard" >
         <view class="icon {{item.pileType=='慢充'?'slowBar':'fastBar'}}">{{item.pileType=='慢充'?'慢':'快'}}</view>
-        <view class="startpower" wx:if="{{!userInfo.flag && item.chargstatusname=='已插枪'}}"  data-keywords="{{item}}"  bindtap="{{(!userInfo.flag && item.chargstatusname=='已插枪')?'goScanResult':''}}">启动充电 ></view>
       </view>
+      
     </view>
     <view class = "bottomm"></view>
   </scroll-view>

pages/charginfo/charginfo.wxss

@@ -175,6 +175,7 @@ text.price {
 }
 
 .charg{
+  position: relative;
   height: 150rpx;
   width: calc(100% - 12rpx);
   border-radius: 20rpx;
@@ -186,27 +187,30 @@ text.price {
 }
 
 .runstatus{
-  width: 50px;
-  height: 50px;
+  width: 100rpx;
+  height: 100rpx;
   background-color: #35B2AB;
-  border-radius: 50%;
+  border-radius: 100rpx;
   margin: 28rpx 20rpx; 
   color: #35B2AB;
+  position: relative;
+  padding:0;
 }
 
 
 .runstatus_inner{
-  width: 40px;
-  height: 40px;
-  border-radius: 50%;
+  width: 80rpx;
+  height: 80rpx;
+  border-radius: 80rpx;
   background-color: #ffff;
-  position: relative;
-  top: 5px;
-  left: 5px;
+  position: absolute;
+  top: 10.5rpx;
+  left: 10.5rpx;
   text-align: center;
-  line-height: 70rpx;
+  line-height: 78rpx;
   font-size: 22rpx;
-
+  padding:0;
+  margin: 0;
 }
 .runstatus.chargstatus_kxz{
   background-color: #35B2AB;
@@ -234,12 +238,13 @@ text.price {
 
 .chargInfo_v{
   flex-direction: column;
-  padding: 40rpx 0;
+  padding-top: 40rpx;
   display: flex;
-  width:440rpx;
+  width:580rpx;
   color: #888888;
   font-size: 28rpx;
   height: 100%;
+  overflow: hidden;
 }
 
 .chargInfo_v_name{
@@ -256,7 +261,7 @@ text.price {
 
 .iconleft .icon{
   margin-top: 20rpx;
-  margin-bottom: 20rpx;
+  /* margin-bottom: 10rpx; */
   /*margin-left: 60rpx;*/
 }
 
@@ -264,7 +269,9 @@ text.price {
   font-size: 26rpx;
   /* margin: 8rpx 0; */
   color: #039BE5;
-  line-height: 26rpx;
+  line-height: 30rpx;
+  display: inline;
+  padding-left: 40rpx;
 }
 
 .bottomm{
@@ -320,4 +327,10 @@ text.price {
   color:#039BE5;
   padding-left: 10rpx;
   font-size: 26rpx;
+}
+
+.iconCard{
+  position:absolute;
+  right: 28rpx;
+  top: 10rpx;
 }

pages/reservation/reservation.js

@@ -153,16 +153,24 @@ Page({
         nowZero.setSeconds(0)
         nowZero.setMinutes(0)
         nowZero.setHours(0)
+        let currentStart = new Date(nowZero)
         let currentEnd =  new Date(nowZero.setDate(nowZero.getDate() + 1 ));
+        let secondStart = new Date(currentEnd)
         let secondEnd =  new Date(nowZero.setDate(nowZero.getDate() + 1 ));
+        let threeStart = new Date(secondEnd)
         let threeEnd =  new Date(nowZero.setDate(nowZero.getDate() + 1 ));
+        let fourStart = new Date(threeEnd);
         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 reservChargeStartTime = new Date(series.reservChargeStartTime);
           let reservChargeEndTime = new Date(series.reservChargeEndTime);
+          if(currentStart > reservChargeStartTime){
+            series.starttime =  "(前日) " + series.starttime
+          }
           if(currentEnd < reservChargeEndTime){
             series.endtime =  series.endtime + " (次日)"
           }
@@ -174,7 +182,11 @@ Page({
         second.forEach(series => {
           series.starttime = series.reservChargeStartTime.substr(11,5);
           series.endtime = series.reservChargeEndTime.substr(11,5);
+          let reservChargeStartTime = new Date(series.reservChargeStartTime);
           let reservChargeEndTime = new Date(series.reservChargeEndTime);
+          if(secondStart > reservChargeStartTime){
+            series.starttime =  "(前日) " + series.starttime
+          }
           if(secondEnd < reservChargeEndTime){
             series.endtime =  series.endtime + " (次日)"
           }
@@ -186,7 +198,11 @@ Page({
         three.forEach(series => {
           series.starttime = series.reservChargeStartTime.substr(11,5);
           series.endtime = series.reservChargeEndTime.substr(11,5);
+          let reservChargeStartTime = new Date(series.reservChargeStartTime);
           let reservChargeEndTime = new Date(series.reservChargeEndTime);
+          if(threeStart > reservChargeStartTime){
+            series.starttime =  "(前日) " + series.starttime
+          }
           if(threeEnd < reservChargeEndTime){
             series.endtime =  series.endtime + " (次日)"
           }
@@ -198,7 +214,11 @@ Page({
         four.forEach(series => {
           series.starttime = series.reservChargeStartTime.substr(11,5);
           series.endtime = series.reservChargeEndTime.substr(11,5);
+          let reservChargeStartTime = new Date(series.reservChargeStartTime);
           let reservChargeEndTime = new Date(series.reservChargeEndTime);
+          if(fourStart > reservChargeStartTime){
+            series.starttime =  "(前日) " + series.starttime
+          }
           if(fourEnd < reservChargeEndTime){
             series.endtime =  series.endtime + " (次日)"
           }