车牌预约

pages/charginfo/charginfo.js

@@ -246,7 +246,7 @@ Page({
   goScanResult(e){
     // scan_result
 
-console.info('xxxxxxxxxxxxxx')
+  console.info('xxxxxxxxxxxxxx')
     let {
       keywords
     } = e.currentTarget.dataset;
@@ -392,6 +392,41 @@ console.info('xxxxxxxxxxxxxx')
   },
 
   seeReservation: function(e){
+
+    let userInfo = wx.getStorageSync('userInfo');
+    let isLogin = wx.getStorageSync('isLogin');
+    let that = this;
+
+    if(isLogin && userInfo.bindingPhone==0){
+      console.info('xxxxxxxxxxxxxx1')
+      wx.showModal({
+        title: '提示',
+        content: '当前账户未绑定手机号，请您进行手机号绑定操作',
+        showCancel:false,
+        confirmText: '去绑定',
+        confirmColor:'#00AADD',
+        success: function (res1) {
+            let url = `/pages/bindPhone/bindPhone`;
+            wx.navigateTo({
+              url
+            });
+        }
+      });
+      return;
+    }
+
+    if (!isLogin) {
+      console.info('xxxxxxxxxxxxxx2')
+      log.info('[首页]', '[未登陆跳转登录界面]');
+      let url = `/pages/login/phone_login/phone_login`;
+      wx.hideLoading();
+      wx.navigateTo({
+        url
+      });
+      return;
+    }
+
+
     let idx = e.currentTarget.dataset.idx;
     console.info(idx)
     let {
@@ -401,7 +436,6 @@ console.info('xxxxxxxxxxxxxx')
       chargStationName,
       id
     } = idx;
-    let userInfo = wx.getStorageSync('userInfo');
     let userId = userInfo.userId;
     let url = `/pages/reservation/reservation?chargStationId=` + chargStationId + `&chargPileName=` + chargPileName + `&chargPileId=` + chargPileId + `&chargPileIdId=` + id + "&chargStationName=" + chargStationName + "&userId=" + userId;
     wx.navigateTo({

pages/charginfo/charginfo.wxml

@@ -92,7 +92,7 @@
   <view class="title_list">终端列表</view>
 
   <scroll-view class='context' scroll-y='true' bindscrolltolower="bindScrollTolowerEvent" >
-    <view class="charg"  hover-class='active' data-keywords="{{item}}" wx:key='{{key}}' wx:for="{{chargList}}"   bindtap="{{(!userInfo.flag && item.chargstatusname=='已插枪')?'goScanResult':''}}">
+    <view class="charg"  hover-class='active' wx:key='{{key}}' wx:for="{{chargList}}" >
       <view class="runstatus {{item.chargstatusclass}}">
         <view class="runstatus_inner ">
           {{item.chargstatusname}}
@@ -100,12 +100,11 @@
       </view>
       <view class="chargInfo_v">
       <view class="chargInfo_v_name">{{item.chargPileName}}</view>
-      <!-- GUYUTEST -->
       <view class="chargInfo_v_id">{{item.chargPileId}}  <text wx:if="{{item.openStatus}}" class="seeReservation" bindtap="seeReservation" bindtap="seeReservation"  data-idx="{{item}}">查看预约</text></view>
       </view>
       <view class="iconleft" >
         <view class="icon {{item.pileType=='慢充'?'slowBar':'fastBar'}}">{{item.pileType=='慢充'?'慢':'快'}}</view>
-        <view class="startpower" wx:if="{{!userInfo.flag && item.chargstatusname=='已插枪'}}" >启动充电 ></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>

pages/charginfo/charginfo.wxss

@@ -236,7 +236,7 @@ text.price {
   flex-direction: column;
   justify-content: center;
   display: flex;
-  width: 480rpx;
+  width:440rpx;
   color: #888888;
   font-size: 28rpx;
   height: 100%;
@@ -247,7 +247,7 @@ text.price {
 }
 
 .iconleft{
-  width: 100rpx;
+  width: 140rpx;
   display: flex;
   margin-right: 20rpx;
   flex-direction: column;
@@ -260,7 +260,7 @@ text.price {
 
 .startpower{
   font-size: 26rpx;
-  margin: 10rpx 0;
+  margin: 5rpx 0;
   color: #039BE5;
 }
 
@@ -315,5 +315,6 @@ text.price {
 
 .seeReservation{
   color:#039BE5;
-  padding-left: 40rpx;
+  padding-left: 10rpx;
+  font-size: 26rpx;
 }

pages/index/index.js

@@ -216,20 +216,20 @@ Page({
     }
     resultList.forEach(item=>{
       item["sumPrice"] = that.resetResultListSumPrice(item);
-      if(!item.elecPrice){
+      if(!item.elecPrice && item.elecPrice!=0){
         item["elecPrice"] = '暂无费用'
       }
-      if(!item.servicePrice){
+      if(!item.servicePrice && item.servicePrice!=0){
         item["servicePrice"] = '暂无费用'
       }
     })
   },
   resetResultListSumPrice(item){
  
-    if(!item.elecPrice){
+    if(!item.elecPrice && item.elecPrice!=0){
       return '暂无费用'
     }
-    if(!item.servicePrice){
+    if(!item.servicePrice && item.servicePrice!=0){
       return '暂无费用'
     }
     return parseFloat((item.elecPrice + item.servicePrice).toFixed(6))

pages/reservation/reservation.js

@@ -154,21 +154,33 @@ Page({
           series.starttime = series.reservChargeStartTime.substr(11,5);
           series.endtime = series.reservChargeEndTime.substr(11,5);
         });
+        current.sort((a,b)=>{
+          return a.reservChargeStartTime - b.reservChargeStartTime
+        })
         let second = res?.data?.result?.cursecondrent;
         second.forEach(series => {
           series.starttime = series.reservChargeStartTime.substr(11,5);
           series.endtime = series.reservChargeEndTime.substr(11,5);
         });
+        second.sort((a,b)=>{
+          return a.reservChargeStartTime - b.reservChargeStartTime
+        })
         let three = res?.data?.result?.three;
         three.forEach(series => {
           series.starttime = series.reservChargeStartTime.substr(11,5);
           series.endtime = series.reservChargeEndTime.substr(11,5);;
         });
+        three.sort((a,b)=>{
+          return a.reservChargeStartTime - b.reservChargeStartTime
+        })
         let four = res?.data?.result?.four;
         four.forEach(series => {
           series.starttime = series.reservChargeStartTime.substr(11,5);
           series.endtime = series.reservChargeEndTime.substr(11,5);
         });
+        four.sort((a,b)=>{
+          return a.reservChargeStartTime - b.reservChargeStartTime
+        })
         let now = new Date();
         let dayFlag1 = (now.getMonth() + 1) + "." + now.getDate()
         now = new Date(now.setDate(now.getDate() + 1));

pages/reservation/reservation.wxml

@@ -14,19 +14,23 @@
 <view class="select_card">
   <view class="card {{dayIndex==1?'active':''}}" data-idx="1" bindtap="switchDay">
     <view class="title">{{dayFlag1}}</view>
-    <image src="/images/yulan.png"/>
+    <image wx:if="{{dayIndex!=1}}" class="png" src="/images/yulan.png"/>
+    <image wx:if="{{dayIndex==1}}" class="png_active" src="/images/yulan_active.png"/>
   </view>
   <view class="card {{dayIndex==2?'active':''}}" data-idx="2" bindtap="switchDay">
     <view class="title">{{dayFlag2}}</view>
-    <image src="/images/yulan.png"/>
+    <image wx:if="{{dayIndex!=2}}" class="png" src="/images/yulan.png"/>
+    <image wx:if="{{dayIndex==2}}" class="png_active" src="/images/yulan_active.png"/>
   </view>
   <view class="card {{dayIndex==3?'active':''}}" data-idx="3" bindtap="switchDay">
     <view class="title">{{dayFlag3}}</view>
-    <image src="/images/yulan.png"/>
+    <image wx:if="{{dayIndex!=3}}" src="/images/yulan.png"/>
+    <image wx:if="{{dayIndex==3}}" class="png_active" src="/images/yulan_active.png"/>
   </view>
   <view class="card {{dayIndex==4?'active':''}}" data-idx="4" bindtap="switchDay">
     <view class="title">{{dayFlag4}}</view>
-    <image src="/images/yulan.png"/>
+    <image wx:if="{{dayIndex!=4}}" class="png" src="/images/yulan.png"/>
+    <image wx:if="{{dayIndex==4}}" class="png_active" src="/images/yulan_active.png"/>
   </view>
 </view>
 <view class="title2">已预约时段</view>

pages/reservation/reservation.wxss

@@ -113,6 +113,7 @@ text.inline {
   color: #FFFFFF;
 }
 
+
 .title2{
   color: #E99D42;
   margin-top: 20rpx;

pages/reservation/reservationEdit.js

@@ -29,38 +29,46 @@ Page({
   },
   bindStartparamsChange(e){
     let startparams =  this.data.startparams;
-    let endparams =  this.data.endparams;
+    let endparams =  this.data.finishparams;
     startparams.pText = e.detail
     this.setData({
       startparams:startparams
     })
-    let currTime = new Date(e.detail );
+    let currTime = new Date(e.detail);
 
     console.info(currTime)
     let curTime3 = new Date(currTime);
     let estime = new Date(curTime3.setMinutes(curTime3.getMinutes() + parseInt(this.data.minReservTime)));
     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("#start").initData()
     this.setData({
       "finishparams.startDateTime":Util.formatTimePicker(estime),
-      // "finishparams.pText":Util.formatTimePicker(estime),
       "finishparams.endDateTime":Util.formatTimePicker(eetime),
     }
     );
+
+    console.info(this.data.finishparams.startDateTime)
+    console.info(this.data.finishparams.endDateTime)
+    console.info(this.data.finishparams.pText)
   },
 
   bindFinishparamsChange(e){
+    let startparams =  this.data.startparams;
     let finishparams =  this.data.finishparams;
     finishparams.pText = e.detail
     this.setData({
@@ -91,10 +99,12 @@ Page({
       let curTime = new Date();
       let sstime = new Date(curTime.setMinutes(curTime.getMinutes() + parseInt(earliestReservTime)));
       let curTime2 = new Date();
-      let setime = new Date(curTime2.setMinutes(curTime2.getMinutes() + parseInt(advanceReservDays) * 60 * 24));
+      let setime = new Date(curTime2.setMinutes(curTime2.getMinutes() + (parseInt(advanceReservDays)) * 60 * 24));
+      setime.setHours(23, 59, 0)
+     
       let curTime3 = new Date(sstime);
       let estime = new Date(curTime3.setMinutes(curTime3.getMinutes() + parseInt(minReservTime)));
-      let curTime4 = new Date(sstime);
+      let curTime4 = new Date(setime);
       let eetime = new Date(curTime4.setMinutes(curTime4.getMinutes() + parseInt(maxReservTime)));
       this.setData({
           chargStationId,

pages/reservation/reservationEdit.wxml

@@ -14,12 +14,12 @@
 
   <view class="context">
     <text>预约开始充电时间</text>
-    <datepicker params="{{startparams}}"  bind:getDateString="bindStartparamsChange" style="width: 100%;"/>
+    <datepicker params="{{startparams}}"  bind:getDateString="bindStartparamsChange" style="width: 100%;" id="start"/>
     <!-- <input  wx:if="{{workstatusFinished}}"  class='input' type='text' value='{{workEndtimeParams.pText}}' disabled="{{workstatusFinished}}"></input> -->
   </view>
   <view class="context">
     <text>预约结束充电时间</text>
-    <datepicker params="{{finishparams}}" bind:getDateString="bindFinishparamsChange" style="width: 100%;"/>
+    <datepicker params="{{finishparams}}" bind:getDateString="bindFinishparamsChange" style="width: 100%;" id="end"/>
     <!-- <input  wx:if="{{workstatusFinished}}"  class='input' type='text' value='{{finishparams.pText}}' disabled="{{workstatusFinished}}"></input> -->
   </view>
 

pages/scan_result/scan_result.js

@@ -24,10 +24,10 @@ Page({
   },
   resetResultListSumPrice(item){
  
-    if(!item.elecPrice){
+    if(!item.elecPrice && item.elecPrice!=0){
       return '暂无费用'
     }
-    if(!item.servicePrice){
+    if(!item.servicePrice && item.servicePrice!=0){
       return '暂无费用'
     }
     return parseFloat((item.elecPrice + item.servicePrice).toFixed(6))
@@ -270,79 +270,85 @@ Page({
     // 扫描结束
   },
   beginCharge(e) {
-    
-    let userInfo = wx.getStorageSync('userInfo');
-    let isLogin = wx.getStorageSync('isLogin');
     let that = this
-    if(!that.data.carParkingRate){
-      that.beginChargeInner(that);
-      return;
-    }
-    // 读取默认车牌
-		wx.request({
-		  url: getApp().globalData.postHeadAgreement + '/restapi/wechat/carList?loginName=' + userInfo.loginName,
-		  // data: {
-			// loginName: userInfo.loginName
-		  // },
-		  method: 'POST',
-		  success: function (res) {
-        let userCarList = res.data;
-        userCarList = userCarList.filter(it=>it.defaultType==1);
-        console.info(userCarList)
-        if(userCarList.length==0 ){
-          wx.showModal({
-            title: '提示',
-            content: '当前充电站可减免停车费，是否绑定车牌信息？',
-            confirmText: '绑定车牌',
-            cancelText: '直接启动',
-            showCancel:true,
-            confirmColor:'#00AADD',
-            cancelColor:'#00AADD',
-            success: function (ress1) {
-              if(ress1.confirm){
-                let url = '/pages/ucenter/car/car'
-                wx.navigateTo({
-                  url
-                });
-              }else{
-                that.beginChargeInner(that)
-              }
-            }
-          });
-        }else{
-          let userCar = userCarList[0]
-          wx.showModal({
-            title: '提示',
-            content: '确定使用' + userCar.plateNumber + '车牌信息减免停车费？',
-            confirmText: '确定',
-            cancelText: '其他车牌',
-            showCancel:true,
-            confirmColor:'#00AADD',
-            cancelColor:'#00AADD',
-            success: function (ress1) {
-                if(ress1.confirm){
-                  that.beginChargeInner(that,userCar.plateNumber)
-                }else{
-                  let url = '/pages/ucenter/car/car'
-                  wx.navigateTo({
-                    url
-                  });
+    wx.requestSubscribeMessage({
+      tmplIds: ['3FR5XRyycT81ZWMdVi_ZQYKJcVatZr2Tm7DgcLwCD1I'],
+      success (res33333) {
+        
+        let userInfo = wx.getStorageSync('userInfo');
+        let isLogin = wx.getStorageSync('isLogin');
+
+        if(!that.data.carParkingRate){
+          that.beginChargeInner(that);
+          return;
+        }
+        // 读取默认车牌
+        wx.request({
+          url: getApp().globalData.postHeadAgreement + '/restapi/wechat/carList?loginName=' + userInfo.loginName,
+          // data: {
+          // loginName: userInfo.loginName
+          // },
+          method: 'POST',
+          success: function (res) {
+            let userCarList = res.data;
+            userCarList = userCarList.filter(it=>it.defaultType==1);
+            console.info(userCarList)
+            if(userCarList.length==0 ){
+              wx.showModal({
+                title: '提示',
+                content: '当前充电站可减免停车费，是否绑定车牌信息？',
+                confirmText: '绑定车牌',
+                cancelText: '直接启动',
+                showCancel:true,
+                confirmColor:'#00AADD',
+                cancelColor:'#00AADD',
+                success: function (ress1) {
+                  if(ress1.confirm){
+                    let url = '/pages/ucenter/car/car'
+                    wx.navigateTo({
+                      url
+                    });
+                  }else{
+                    that.beginChargeInner(that)
+                  }
                 }
-                return;
-
-            },
-            fail: function(res1){
-              console.info(res1)
+              });
+            }else{
+              let userCar = userCarList[0]
+              wx.showModal({
+                title: '提示',
+                content: '确定使用' + userCar.plateNumber + '车牌信息减免停车费？',
+                confirmText: '确定',
+                cancelText: '其他车牌',
+                showCancel:true,
+                confirmColor:'#00AADD',
+                cancelColor:'#00AADD',
+                success: function (ress1) {
+                    if(ress1.confirm){
+                      that.beginChargeInner(that,userCar.plateNumber)
+                    }else{
+                      let url = '/pages/ucenter/car/car'
+                      wx.navigateTo({
+                        url
+                      });
+                    }
+                    return;
+    
+                },
+                fail: function(res1){
+                  console.info(res1)
+                }
+              });
             }
-          });
-        }
-
-		  },
-		  fail(e) {
-			console.log("查询车辆失败");
-			log.info('[查询车辆]','[fail]', e);
-		  }
-    });
+    
+          },
+          fail(e) {
+          console.log("查询车辆失败");
+          log.info('[查询车辆]','[fail]', e);
+          }
+        });
+      }
+    })
   
   },
   beginCharge_satrt(plateNumber) {

pages/search_result/search_result.js

@@ -48,20 +48,20 @@ Page({
     }
     resultList.forEach(item=>{
       item["sumPrice"] = that.resetResultListSumPrice(item);
-      if(!item.elecPrice){
+      if(!item.elecPrice && item.elecPrice!=0){
         item["elecPrice"] = '暂无费用'
       }
-      if(!item.servicePrice){
+      if(!item.servicePrice && item.servicePrice!=0){
         item["servicePrice"] = '暂无费用'
       }
     })
   },
   resetResultListSumPrice(item){
  
-    if(!item.elecPrice){
+    if(!item.elecPrice && item.elecPrice!=0){
       return '暂无费用'
     }
-    if(!item.servicePrice){
+    if(!item.servicePrice && item.servicePrice!=0){
       return '暂无费用'
     }
     return parseFloat((item.elecPrice + item.servicePrice).toFixed(6))

pages/ucenter/car/bindCar.js

@@ -7,7 +7,8 @@ Page({
   data: {
     carNum: '',
     carId: '',
-    updateFlag: false
+    updateFlag: false,
+    isDef: false,
   },
   inputPlateNumber(e){
     console.info(e.detail.value)
@@ -62,7 +63,8 @@ Page({
         url: getApp().globalData.postHeadAgreement + '/restapi/wechat/carAlter?loginName=' + userInfo.loginName,
         data: {
           carId: that.data.carId,
-          plateNumber: carNum 
+          plateNumber: carNum,
+          defaultType: that.data.isDef?"1":"0"
         },
         method: 'POST',
         success: function (res) {
@@ -82,7 +84,7 @@ Page({
       console.info("新增车牌号:" + carNum + ",用户:" + userInfo.loginName + "")
 
       wx.request({
-        url: getApp().globalData.postHeadAgreement + '/restapi/wechat/saveCar?loginName=' + userInfo.loginName + '&plateNumber=' + carNum + '&defaultType=0',
+        url: getApp().globalData.postHeadAgreement + '/restapi/wechat/saveCar?loginName=' + userInfo.loginName + '&plateNumber=' + carNum + '&defaultType=' + (that.data.isDef?"1":"0"),
         // data: {
         //   defaultType: 1,
         //   carId: idx.carId,
@@ -96,8 +98,8 @@ Page({
           });
         },
         fail(e) {
-        console.log("新增车牌号失败");
-        log.info('[新增车牌号]','[fail]', e);
+        console.log("新增车牌号失败",e);
+        //log.info('[新增车牌号]','[fail]', e);
         }
       });
 
@@ -107,7 +109,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-    let {carId,plateNumber} = options;
+    let {carId,plateNumber,defaultType} = options;
     let updateFlag = false;
     if(carId){
       updateFlag = true;
@@ -123,10 +125,16 @@ Page({
     this.setData({
       carId,
       updateFlag,
-      carNum:plateNumber
+      carNum:plateNumber,
+      isDef:defaultType==1
+    })
+  },
+  radioChange: function(e) {
+    let that = this;
+    this.setData({
+      isDef:!that.data.isDef
     })
   },
-
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

pages/ucenter/car/bindCar.wxml

@@ -6,6 +6,15 @@
     <view class='input_view'>
       <input placeholder='请输车牌号' value="{{carNum}}" bindinput='inputPlateNumber'placeholder-class='placeholder' maxlength="10"></input>
     </view>
+    <label class="radio" bindtap="radioChange">
+        <image src="/images/gzxrkl.png"   wx:if="{{!isDef}}"/> <image src="/images/gzxrkl_active.png"  wx:if="{{isDef}}"/><text>设为默认</text>
+    </label>
+
     <button class='login_button' bindtap="saveCarNum" >保存</button>
+
+    <radio-group class="radio-group" bindchange="radioChange">
+
+
+</radio-group>
   </view>
 </view>

pages/ucenter/car/bindCar.wxss

@@ -57,7 +57,8 @@ page{
 .input_view{
   box-shadow: 0rpx 0rpx 10rpx  #dedede;
   border-radius: 10rpx;
-  margin: 40rpx 0rpx;
+  margin-top: 40rpx;
+  margin-bottom: 20rpx;
   height: 88rpx;
 }
 
@@ -107,3 +108,19 @@ page{
   background-color: #36a9a6;
 }
 
+.radio{
+  line-height: 15px;
+  height: 30rpx;
+  display: flex;
+}
+
+.radio image{
+  width: 26rpx;
+  height: 26rpx;
+  margin-right:10rpx;
+}
+
+.radio text{
+  line-height: 24rpx;
+  font-size: 24rpx;
+}

pages/ucenter/car/car.js

@@ -138,7 +138,8 @@ Page({
       });
     }else if(textArrVal=="修改车牌号"){
       console.info("修改车牌号")
-      let url = '/pages/ucenter/car/bindCar?carId=' + idx.carId + '&plateNumber=' + idx.plateNumber
+      console.info(idx)
+      let url = '/pages/ucenter/car/bindCar?carId=' + idx.carId + '&plateNumber=' + idx.plateNumber + '&defaultType=' + idx.defaultType
       wx.navigateTo({
         url
       });

pages/ucenter/yuyt/yuyt.js

@@ -149,14 +149,49 @@ Page({
           let chongdianzhuangbianhao =  false
           let chongdianshichang =  false
           let chongdiankaishijieshu =  false
+          let chongdianfeiyong =  false
           let customerServiceFlag = false;
           let cancleBtnFlag= false;
+          let height= 'h4';
+
           if(item.reservStatus==2){
             // 已履约
-            // if(){
-            //   chongdianzhuangmingcheng = true
-            //   chongdianzhuangbianhao = true
-            // }
+            if(item?.pileLog?.transstatus == 3){
+              if(item?.pileLog?.chargPileId == item?.reservPile?.chargPileId){
+                chongdianzhuangmingcheng = false
+                chongdianzhuangbianhao = false
+                chongdianshichang = true
+                chongdiankaishijieshu = true
+                chongdianfeiyong = true
+                height= 'h1';
+              }else{
+                chongdianzhuangmingcheng = true
+                chongdianzhuangbianhao = true
+                chongdianshichang = true
+                chongdiankaishijieshu = true
+                chongdianfeiyong = true
+                height= 'h2';
+              }
+
+            }else{
+              if(item?.pileLog?.chargPileId == item?.reservPile?.chargPileId){
+                chongdianzhuangmingcheng = false
+                chongdianzhuangbianhao = false
+                chongdianshichang = false
+                chongdiankaishijieshu = false
+                chongdianfeiyong = false
+                height= 'h4';
+              }else{
+                chongdianzhuangmingcheng = true
+                chongdianzhuangbianhao = true
+                chongdianshichang = false
+                chongdiankaishijieshu = false
+                chongdianfeiyong = false
+                height= 'h3';
+
+              }
+
+            }
           }
           if(item.reservStatus==3){
             customerServiceFlag = true;
@@ -168,14 +203,17 @@ Page({
           item.chongdianzhuangbianhao = chongdianzhuangbianhao;
           item.chongdianshichang = chongdianshichang;
           item.chongdiankaishijieshu = chongdiankaishijieshu;
+          item.chongdianfeiyong = chongdianfeiyong;
           item.customerServiceFlag = customerServiceFlag;
           item.cancleBtnFlag = cancleBtnFlag;
+          item.height = height;
         //console.log(item.chargPile);
       } catch (err) {
         //在这里处理错误
       }
       try {
-        let chargePile = item.chargePile;
+        let chargePile = item.pileLog;
+        console.info(chargePile)
         let startDate = Util.parseDate(chargePile.chargstarttime);
         let endDate = Util.parseDate(chargePile.chargendtime)
         let totalTime = Math.round((endDate.getTime() - startDate.getTime()) / 60000);
@@ -212,6 +250,7 @@ Page({
     })
   },
   cancleBtn(e){
+    let  that = this
     let reservId = e.currentTarget.dataset.idx;
     let userInfo = wx.getStorageSync('userInfo');
     let isLogin = wx.getStorageSync('isLogin');
@@ -232,6 +271,8 @@ Page({
             success(res) {
               console.info(res)
               // TODO 重新加载页面
+              that.resetListZero();
+              that.getPage();
             }
           });
         }

pages/ucenter/yuyt/yuyt.wxml

@@ -10,52 +10,55 @@
 <scroll-view class='context' scroll-y='true'  bindscrolltolower="bindScrollTolowerEvent" >
   <view class='context_block'></view>
   
-  <view class="text_context" wx:for="{{reservUserOrderList}}" wx:key="id" hover-class='active'>
-  <view class="upFlag" >{{item.reservStatusCN}}</view>
-  <view class="downBtn" wx:if="{{item.cancleBtnFlag}}" bindtap="cancleBtn" data-idx="{{item.id}}">取消预约</view>
-  <view class="downBtn" wx:if="{{item.customerServiceFlag}}" bindtap="customerServiceBtn">联系客服</view>
-    <!-- <view class="map-1" bindtap="getRoute">
-      <image src="/images/jt.png"></image>
-      <view>路线</view>
-    </view> -->
-    <view class='charging_text_title'>
-      <view class='charging'>
-        <image src='/images/charging2_1.png'></image>
+  <block  wx:for="{{reservUserOrderList}}" wx:key="id">
+    <view class="text_context {{item.height}}" hover-class='active'>
+    <view class="upFlag" >{{item.reservStatusCN}}</view>
+    <view class="downBtn" wx:if="{{item.cancleBtnFlag}}" bindtap="cancleBtn" data-idx="{{item.id}}">取消预约</view>
+    <view class="downBtn" wx:if="{{item.customerServiceFlag}}" bindtap="customerServiceBtn">联系客服</view>
+      <!-- <view class="map-1" bindtap="getRoute">
+        <image src="/images/jt.png"></image>
+        <view>路线</view>
+      </view> -->
+      <view class='charging_text_title'>
+        <view class='charging'>
+          <image src='/images/charging2_1.png'></image>
+        </view>
+        <view class='charging_text_title1'>
+          <text class='bold'>{{item.reservStation.chargStationName}}</text>
+          <text class="h1">{{item.reservPile.chargPileId}}</text>
+        </view>
       </view>
-      <view class='charging_text_title1'>
-        <text class='bold'>{{item.reservStation.chargStationName}}</text>
-        <text class="h1">{{item.reservPile.chargPileId}}</text>
+      <text>{{item.reservPile.chargPileName}}</text>
+      <view  class="inline-view">
+        <view class='inlineView' decode='true'><text space="nbsp">预约时段: </text> <text class="gray2"> {{item.reservChargeStartTime}} 至 {{item.reservChargeEndTime}}</text></view>
+      </view>
+      <view  class="inline-view">
+        <view class='inlineView' decode='true'><text space="nbsp">提交预约时间: </text>  <text class="gray2">{{item.createTime}}</text></view>
+      </view>
+      <view  class="inline-view" wx:if="{{item.chongdianzhuangmingcheng}}">
+        <text class='inlineView' decode='true'>启动充电桩名称: {{item.chargePile.chargPileName}}</text>
+      </view>
+      <view  class="inline-view" wx:if="{{item.chongdianzhuangbianhao}}">
+        <text class='inlineView' decode='true'>启动充电桩编号: {{item.chargePile.chargPileId}}</text>
+      </view>
+      <view  class="inline-view" wx:if="{{item.chongdianshichang}}">
+        <text class='inline' decode='true'>充电时长：{{item.pileLog.totalTime}}&nbsp;&nbsp;&nbsp;&nbsp;</text>
+        <text class='inline'>充电电量：{{item.pileLog.chargpower}}度</text>
+      </view>
+      <text class='gray'  wx:if="{{item.chongdiankaishijieshu}}">{{item.pileLog.startTime}}-{{item.pileLog.endTime}}</text>
+      <view style='line-height:0;'  wx:if="{{item.chongdianfeiyong}}">
+        <text class='inline gray1'>总费用：</text>
+        <text class='inline red'>{{item.pileLog.chargallmoney}}</text>
+        <text class='inline gray1' decode='true'>元&nbsp;&nbsp;&nbsp;&nbsp;服务费：</text>
+        <text class='inline red'>{{item.pileLog.chargservice}}</text>
+        <text class='inline gray1' decode='true'>元&nbsp;&nbsp;&nbsp;&nbsp;电费：</text>
+        <text class='inline red'>{{item.pileLog.chargmoney}}</text>
+        <text class='inline gray1'>元</text>
       </view>
     </view>
-    <text>{{item.reservPile.chargPileName}}</text>
-    <view  class="inline-view">
-      <view class='inlineView' decode='true'><text space="nbsp">预约时段: </text> <text class="gray2"> {{item.reservChargeStartTime}} 至 {{item.reservChargeEndTime}}</text></view>
-    </view>
-    <view  class="inline-view">
-      <view class='inlineView' decode='true'><text space="nbsp">提交预约时间: </text>  <text class="gray2">{{item.createTime}}</text></view>
-    </view>
-    <view  class="inline-view" wx:if="{{chongdianzhuangmingcheng}}">
-      <text class='inlineView' decode='true'>启动充电桩名称: {{item.chargePile.chargPileName}}</text>
-    </view>
-    <view  class="inline-view" wx:if="{{chongdianzhuangbianhao}}">
-      <text class='inlineView' decode='true'>启动充电桩编号: {{item.chargePile.chargPileId}}</text>
-    </view>
-    <view  class="inline-view" wx:if="{{chongdianshichang}}">
-      <text class='inline' decode='true'>充电时长：{{item.chargePile.totalTime}}&nbsp;&nbsp;&nbsp;&nbsp;</text>
-      <text class='inline'>充电电量：{{item.chargePile.chargpower}}度</text>
-    </view>
-    <text class='gray'  wx:if="{{chongdiankaishijieshu}}">{{item.chargePile.startTime}}-{{item.chargePile.endTime}}</text>
-    <view style='line-height:0;'  wx:if="{{chongdianfeiyong}}">
-      <text class='inline gray1'>总费用：</text>
-      <text class='inline red'>{{item.chargePile.chargallmoney}}</text>
-      <text class='inline gray1' decode='true'>元&nbsp;&nbsp;&nbsp;&nbsp;服务费：</text>
-      <text class='inline red'>{{item.chargePile.chargservice}}</text>
-      <text class='inline gray1' decode='true'>元&nbsp;&nbsp;&nbsp;&nbsp;电费：</text>
-      <text class='inline red'>{{item.chargePile.chargmoney}}</text>
-      <text class='inline gray1'>元</text>
-    </view>
-
-  </view>
-
-  
+  </block>
+  <view class='context_block'></view>
+  <view class='context_block'></view>
+  <view class='context_block'></view>
+  <view class='context_block'></view>
 </scroll-view>

pages/ucenter/yuyt/yuyt.wxss

@@ -35,7 +35,7 @@ page {
 
 .text_context {
   position: relative;
-  height: 378rpx;
+  height: 308rpx;
   background: #fff;
   padding: 0 30rpx;
   margin: 0 28rpx 24rpx 28rpx;
@@ -43,6 +43,19 @@ page {
   box-shadow: 0rpx 4rpx 4rpx #d5d5d5;
 }
 
+.text_context.h1 {
+  height: 396rpx;
+}
+.text_context.h2 {
+  height: 478rpx;
+}
+.text_context.h3 {
+  height: 348rpx;
+}
+.text_context.h4 {
+  height: 308rpx;
+}
+
 .text_context.active {
   background-color: #ebebeb;
 }