尖峰平谷

pages/charginfo/charginfo.js

@@ -32,20 +32,65 @@ Page({
     userInfo:{},
     chargfeatureList:[],
     isLogin: false,
+    resultTable: []
+  },
+  resetResultData(resultList,data){
+    if(!resultList){
+      return;
+    }
+    for(let i=0;i<resultList.length;i++){
+      if(resultList[i].currentTime){
+        data.chargprice = resultList[i].elecPrice
+        data.serviceprice = resultList[i].serviceprice
+      }
+    }
   },
 
-
+  resetResultList(resultList){
+    let that = this
+    if(!resultList){
+      return;
+    }
+    resultList.forEach(item=>{
+      item["sumPrice"] = that.resetResultListSumPrice(item);
+      if(!item.elecPrice){
+        item["elecPrice"] = '暂无费用'
+      }
+      if(!item.servicePrice){
+        item["servicePrice"] = '暂无费用'
+      }
+    })
+  },
+  resetResultListSumPrice(item){
+ 
+    if(!item.elecPrice){
+      return '暂无费用'
+    }
+    if(!item.servicePrice){
+      return '暂无费用'
+    }
+    return parseFloat((item.elecPrice + item.servicePrice).toFixed(6))
+  },
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function(e) {
     let that = this;
-    
+
     wx.getStorage({
       key: 'index_seeInfo_chargpile',
       success: function (res) {
         console.info(res)
         var seeInfoChargPile = res.data;
+        let resultTable = seeInfoChargPile.resultList
+        that.resetResultList(resultTable);
+        that.resetResultData(resultTable,seeInfoChargPile)
+        that.setData({
+          resultTable
+        })
+        that.setData({
+          resultTable
+        })
         let chargfeatureList;
 
         if(seeInfoChargPile.chargfeatures){
@@ -57,7 +102,7 @@ Page({
         seeInfoChargPile.sharpTotalPrice = parseFloat((seeInfoChargPile.sharpChargPrice==null || seeInfoChargPile.sharpServicePrice==null)? null:(seeInfoChargPile.sharpChargPrice + seeInfoChargPile.sharpServicePrice).toFixed(6));
         seeInfoChargPile.peakTotalPrice = parseFloat((seeInfoChargPile.peakChargPrice==null || seeInfoChargPile.peakServicePrice==null)? null:(seeInfoChargPile.peakChargPrice + seeInfoChargPile.peakServicePrice).toFixed(6));
         seeInfoChargPile.flatTotalPrice = parseFloat((seeInfoChargPile.flatChargPrice==null || seeInfoChargPile.flatServicePrice==null)? null:(seeInfoChargPile.flatChargPrice + seeInfoChargPile.flatServicePrice).toFixed(6));
-        seeInfoChargPile.valleyTotalPrice = parseFloat((seeInfoChargPile.valleyChargPrice==null || seeInfoChargPile.valleyServicePrice==null)? null:(seeInfoChargPile.valleyChargPrice + seeInfoChargPile.valleyServicePrice).toFixed(6);
+        seeInfoChargPile.valleyTotalPrice = parseFloat((seeInfoChargPile.valleyChargPrice==null || seeInfoChargPile.valleyServicePrice==null)? null:(seeInfoChargPile.valleyChargPrice + seeInfoChargPile.valleyServicePrice).toFixed(6));
         seeInfoChargPile.totalprice =  parseFloat((seeInfoChargPile.chargprice==null || seeInfoChargPile.serviceprice==null)? null:(seeInfoChargPile.chargprice + seeInfoChargPile.serviceprice).toFixed(6));
         that.setData({
           seeInfoChargPile,

pages/charginfo/charginfo.wxml

@@ -11,7 +11,31 @@
         </view>
       </view>
 
+<text class="inline" style='color:#cea568'>全天时段费用：</text>
 
+<view class="rtable">
+
+  <view class="rtr" style="font-size: 28rpx;">
+    <view class="rtd t1">时段</view>
+    <view class="rtd t2">电费</view>
+    <view class="rtd t2">服务费</view>
+    <view class="rtd t2">总费用</view>
+  </view>
+
+  <block wx:for="{{resultTable}}" wx:key="*this">
+  <view wx:if="{{item.currentTime}}" class="rtr active" >当前费用</view>
+  <view class="rtr {{item.currentTime?'active':''}}" >
+    <view class="rtd t1">{{item.startTimeStr}} - {{item.endTimeStr}}</view>
+    <view class="rtd t2">{{item.elecPrice}}{{item.elecPrice=='暂无费用'?'':'元'}}</view>
+    <view class="rtd t2">{{item.servicePrice}}{{item.servicePrice=='暂无费用'?'':'元'}}</view>
+    <view class="rtd t2">{{item.sumPrice}}{{item.sumPrice=='暂无费用'?'':'元'}}</view>
+  </view>
+  </block>
+</view>
+
+
+
+<!--
     <text class='inline yellow'>{{seeInfoChargPile.totalprice == null? '暂无费用' : ' ¥ ' + seeInfoChargPile.totalprice}}</text>
     <view style='line-height:0;margin: 5rpx 0;'>
       <rich-text space='nbsp' nodes="{{seeInfoChargPile.chargprice == null? '暂无实时电费' : '实时电费 ' + seeInfoChargPile.chargprice + ' 元/度'}}  {{seeInfoChargPile.serviceprice == null? '暂无实时服务费' : '实时服务费 ' + seeInfoChargPile.serviceprice + ' 元/度'}}" style='line-height:30rpx;font-size:20rpx;word-wrap: break-word;color:#AAAAAA' ></rich-text>
@@ -26,20 +50,9 @@
     <view style='line-height:0;margin: 5rpx 0;'>
       <rich-text space='nbsp' nodes="总费用：尖峰 {{seeInfoChargPile.sharpTotalPrice == null? '暂无费用':seeInfoChargPile.sharpTotalPrice + ' 元'}}  高峰 {{seeInfoChargPile.peakTotalPrice == null? '暂无费用':seeInfoChargPile.peakTotalPrice + ' 元'}}  平段 {{seeInfoChargPile.flatTotalPrice == null? '暂无费用':seeInfoChargPile.flatTotalPrice + ' 元'}}  低谷 {{seeInfoChargPile.valleyTotalPrice == null? '暂无费用':seeInfoChargPile.valleyTotalPrice + ' 元'}}  " style='line-height:30rpx;font-size:20rpx;color:#c13e32;word-wrap: break-word;'></rich-text>
     </view>
-    <!-- <view style='line-height:0;'>
-      <text decode='true' class='inline'>费用：&nbsp;&nbsp;</text>
-      <text decode='true' class='slow inline'>{{seeInfoChargPile.sharpChargPrice}}</text>
-      <text decode='true' class='inline'>元尖&nbsp;&nbsp;</text>
-      <text decode='true' class='slow inline'>{{seeInfoChargPile.peakChargPrice}}</text>
-      <text decode='true' class='inline'>元峰&nbsp;&nbsp;</text>
-      <text decode='true' class='slow inline'>{{seeInfoChargPile.flatChargPrice}}</text>
-      <text decode='true' class='inline'>元平&nbsp;&nbsp;</text>
-      <text decode='true' class='slow inline'>{{seeInfoChargPile.valleyChargPrice}}</text>
-      <text decode='true' class='inline'>元谷&nbsp;&nbsp;</text>
-    </view> -->
-    <!-- <text class="inline"></text> -->
+
     <view>
-    <!-- <rich-text style='line-height:30rpx;word-break:break-all;color: #575757;font-size:26rpx;'><span style="font-weight:bold;color:#000">北京地区</span>峰谷时段划分如下所示（如有峰谷差异电价，详情请咨询场站现场负责人）：</rich-text> -->
+
   </view>
   <text class='inline yellow'>尖峰平谷时段</text>
     <view style='line-height: 30rpx'>
@@ -54,7 +67,7 @@
     <view style='line-height: 30rpx'>
       <text decode='true' style='font-size:20rpx;color:#aaaaaa;'>尖峰：7\8月11:00-13:00&nbsp;&nbsp;16:00-17:00</text>
     </view>
-
+-->
     <scroll-view class='pictureScroll' scroll-x='true'>
       <view wx:for="{{chargfeatureList}}" wx:key="unique" data-index="{{index}}" bindtap="previewImage" class="chargfeatureImage">
       <image src="{{item}}" ></image>

pages/charginfo/charginfo.wxss

@@ -268,4 +268,37 @@ text.price {
 .bottomm{
   height: 60rpx;
   width: 100%;
-}
+}
+
+
+.rtable{
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+}
+
+.rtable .rtr{
+  width: 100%;
+  height: 40rpx;
+  display: flex;
+  flex-direction: row;
+}
+
+.rtable .rtr{
+  font-size: 26rpx;
+}
+.rtable .rtr.active{
+  color:#d57a80;
+  font-weight: bold;
+  font-size: 28rpx;
+  font-style: italic;
+}
+
+.rtable .rtr .rtd.t1{
+  width: 210rpx
+}
+
+.rtable .rtr .rtd.t2{
+  width: 180rpx
+}

pages/index/index.js

@@ -187,6 +187,8 @@ Page({
       }
     }
   },
+ 
+
   onLoad(e) {
 
    this.scanFlag = false;
@@ -270,7 +272,6 @@ Page({
           },
           method: 'POST',
           success(res) {
-
             //userInfo.flag = true;
             if (isLogin && userInfo.flag) {
               wx.request({
@@ -282,7 +283,7 @@ Page({
                 },
                 method: 'POST',
                 success(res1) {
-                  //console.log(res1);
+
                   var myChargeStationsIds = '';
                   res1.data.forEach((item, index) => {
                     myChargeStationsIds += item.id + ",";
@@ -401,6 +402,7 @@ Page({
                   flatServicePrice : item.flatServicePrice,
                   valleyChargPrice : item.valleyChargPrice,
                   valleyServicePrice : item.valleyServicePrice,
+                  resultList: item.resultList
                 };
                 markers[index] = marker;
 
@@ -929,6 +931,7 @@ Page({
                     flatServicePrice : item.flatServicePrice,
                     valleyChargPrice : item.valleyChargPrice,
                     valleyServicePrice : item.valleyServicePrice,
+                    resultList: item.resultList
                   };
                   markers[index] = marker;
                 });

pages/scan_result/scan_result.js

@@ -9,7 +9,24 @@ Page({
     chargPile: null,
     orderid: null,
     userId: null,
-    repaidbalance: 0
+    repaidbalance: 0,
+    resultTable: []
+  },
+  resetResultList(resultList){
+    let that = this
+    resultList.forEach(item=>{
+      item["sumPrice"] = that.resetResultListSumPrice(item)
+    })
+  },
+  resetResultListSumPrice(item){
+ 
+    if(!item.elecPrice){
+      return '暂无费用'
+    }
+    if(!item.servicePrice){
+      return '暂无费用'
+    }
+    return parseFloat((item.elecPrice + item.servicePrice).toFixed(6))
   },
 
   /**
@@ -23,6 +40,11 @@ Page({
         console.log(res);
         //console.log(res.data);
         var chargPile = res.data;
+        let resultTable = chargPile.resultList
+
+        that.setData({
+          resultTable
+        })
         chargPile.sharpTotalPrice = parseFloat((chargPile.sharpChargPrice + chargPile.sharpServicePrice).toFixed(6));
         chargPile.peakTotalPrice = parseFloat((chargPile.peakChargPrice + chargPile.peakServicePrice).toFixed(6));
         chargPile.flatTotalPrice = parseFloat((chargPile.flatChargPrice + chargPile.flatServicePrice).toFixed(6));
@@ -113,7 +135,6 @@ Page({
           that.setData({
             repaidbalance
           });
-          console.info("sssssss   " + data.repaidbalance)
           //开始充电
           if(data.bindingPhone==0){
             wx.showModal({

pages/scan_result/scan_result.wxml

@@ -17,6 +17,29 @@
     <rich-text space='nbsp' nodes="地址：{{chargPile.address}}" style='line-height:30rpx;font-size:24rpx;margin-bottom:10rpx;word-wrap: break-word;' ></rich-text>
     <!-- <text class='fast' wx:if="{{chargPile.pileType=='快充'}}">快桩：2小时</text>
     <text class='slow' wx:if="{{chargPile.pileType=='慢充'}}">慢桩：2小时</text> -->
+    <text class="inline">时段参考费用：</text>
+
+    <view class="rtable">
+
+      <view class="rtr" style="font-size: 28rpx;">
+        <view class="rtd t1">时段</view>
+        <view class="rtd t2">电费</view>
+        <view class="rtd t2">服务费</view>
+        <view class="rtd t2">总费用</view>
+      </view>
+
+      <block wx:for="{{resultTable}}" wx:key="*this">
+      <view wx:if="{{item.currentTime}}" class="rtr active" >当前费用</view>
+      <view class="rtr {{item.currentTime?'active':''}}" >
+        <view class="rtd t1">{{item.startTimeStr}} - {{item.endTimeStr}}</view>
+        <view class="rtd t2">{{item.elecPrice}}{{item.elecPrice=='暂无费用'?'':'元'}}</view>
+        <view class="rtd t2">{{item.servicePrice}}{{item.servicePrice=='暂无费用'?'':'元'}}</view>
+        <view class="rtd t2">{{item.sumPrice}}{{item.sumPrice=='暂无费用'?'':'元'}}</view>
+      </view>
+      </block>
+    </view>
+  <view style="height:40rpx;width:100%"> </view>
+    <!--
     <text class="inline">实时参考费用：</text>
     <view style='line-height:0;'>
       <rich-text space='nbsp' nodes="电   费：{{chargPile.chargprice}}元  服务费：{{chargPile.serviceprice}}元  总费用：{{chargPile.totalprice}}元" style='line-height:30rpx;font-size:24rpx;margin-bottom:10rpx;word-wrap: break-word;' ></rich-text>
@@ -31,18 +54,7 @@
     <view style='line-height:0;'>
       <rich-text space='nbsp' nodes="总费用：尖峰{{chargPile.sharpTotalPrice}}元  高峰{{chargPile.peakTotalPrice}}元  平段{{chargPile.flatTotalPrice}}元  低谷{{chargPile.valleyTotalPrice}}元  " style='line-height:30rpx;font-size:24rpx;color:red;margin-bottom:10rpx;word-wrap: break-word;'></rich-text>
     </view>
-    <!-- <view style='line-height:0;'>
-      <text decode='true' class='inline'>费用：&nbsp;&nbsp;</text>
-      <text decode='true' class='slow inline'>{{chargPile.sharpChargPrice}}</text>
-      <text decode='true' class='inline'>元尖&nbsp;&nbsp;</text>
-      <text decode='true' class='slow inline'>{{chargPile.peakChargPrice}}</text>
-      <text decode='true' class='inline'>元峰&nbsp;&nbsp;</text>
-      <text decode='true' class='slow inline'>{{chargPile.flatChargPrice}}</text>
-      <text decode='true' class='inline'>元平&nbsp;&nbsp;</text>
-      <text decode='true' class='slow inline'>{{chargPile.valleyChargPrice}}</text>
-      <text decode='true' class='inline'>元谷&nbsp;&nbsp;</text>
-    </view> -->
-    <!-- <text class="inline"></text> -->
+
     <view style="margin-bottom:10rpx;margin-top:10rpx">
     <rich-text style='line-height:30rpx;word-break:break-all;color: #575757;font-size:26rpx;'><span style="font-weight:bold;color:#000">北京地区</span>峰谷时段划分如下所示（如有峰谷差异电价，详情请咨询场站现场负责人）：</rich-text>
   </view>
@@ -58,18 +70,20 @@
     <view style='line-height:0;'>
       <text decode='true' style='font-size:24rpx;color:#a3a3a3;margin-bottom:10rpx;'>尖峰：7\8月11:00-13:00&nbsp;&nbsp;16:00-17:00</text>
     </view>
+  -->
       <!-- 
     <view wx:if="{{chargPile.showinfo}}">
       <rich-text style='line-height:48rpx;color:red;font-size:32rpx;word-break:break-all;'>信息展现：{{chargPile.showinfo}}</rich-text> 
     </view> -->
-  </view>
-  <view wx:if="{{chargPile.showinfo}}" style='margin-top:24rpx;'>
+    <view wx:if="{{chargPile.showinfo}}" style='margin-top:24rpx;'>
     <rich-text style='line-height:48rpx;color:#1D9BF7;font-size:32rpx;word-break:break-all;font-weight: bold;'>{{chargPile.showinfo}}</rich-text>
   </view>
   <view  style='margin-top:24rpx;'>
-    <rich-text style='line-height:48rpx;color:red;font-size:32rpx;word-break:break-all;'>您当前余额为：{{repaidbalance}}元。</rich-text><rich-text style='line-height:48rpx;color:black;font-size:32rpx;word-break:break-all;'>建议参考充电总费用（元/度电）与您爱车的电池容量（度），避免因费用不足导致充电量不足的情况发生。</rich-text>
+    <rich-text style='line-height:48rpx;color:red;font-size:32rpx;word-break:break-all;'>您当前余额为：{{repaidbalance}}元。建议参考充电总费用（元/度电）与您爱车的电池容量（度），避免因费用不足导致充电量不足的情况发生。</rich-text><rich-text style='line-height:48rpx;color:black;font-size:32rpx;word-break:break-all;'></rich-text>
   </view>
   <button wx:if="{{chargPile}}" class='charg_button' bindtap="beginCharge" >开始充电</button>
+  </view>
+
 
 <!-- <view style="width: 100%;margin-top:50rpx">
   <ad unit-id="adunit-8eb13875bcf592b0" ad-intervals="30"></ad>

pages/scan_result/scan_result.wxss

@@ -1,4 +1,4 @@
-map_text/* pages/scan_result/scan_result.wxss */
+/* pages/scan_result/scan_result.wxss */
 page {
   height: 100%;
   overflow-y:hidden; 
@@ -14,11 +14,11 @@ view.inline {
 
 .map_text {
   position: relative;
-  height: calc(100% - 240rpx);
+  /* height: calc(100% - 640rpx); */
   background: #fff;
   padding: 20rpx 30rpx 0 30rpx;
   box-shadow: 0rpx 6rpx 6rpx  #f5f5f5 inset;
-  
+  width: calc(100% - 60rpx);
 }
 .charging_text_title {
   height: 105rpx;
@@ -116,3 +116,34 @@ text.inline {
   color: #ffffff;
 }
 
+.rtable{
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+}
+
+.rtable .rtr{
+  width: 100%;
+  height: 40rpx;
+  display: flex;
+  flex-direction: row;
+}
+
+.rtable .rtr{
+  font-size: 26rpx;
+}
+.rtable .rtr.active{
+  color:#d57a80;
+  font-weight: bold;
+  font-size: 28rpx;
+  font-style: italic;
+}
+
+.rtable .rtr .rtd.t1{
+  width: 210rpx
+}
+
+.rtable .rtr .rtd.t2{
+  width: 180rpx
+}

pages/search_result/search_result.js

@@ -67,6 +67,7 @@ Page({
       },
       method: 'POST',
       success(res) {
+
         //userInfo.flag = true;
         if (isLogin && userInfo.flag) {
           wx.request({
@@ -78,7 +79,7 @@ Page({
             },
             method: 'POST',
             success(res1) {
-              //console.log(res1);
+
               var myChargeStationsIds = '';
               res1.data.forEach((item, index) => {
                 myChargeStationsIds += item.id + ",";
@@ -124,7 +125,8 @@ Page({
                   flatChargPrice : item.flatChargPrice,
                   flatServicePrice : item.flatServicePrice,
                   valleyChargPrice : item.valleyChargPrice,
-                  valleyServicePrice : item.valleyServicePrice
+                  valleyServicePrice : item.valleyServicePrice,
+                  resultList: item.resultList
 
 
                 };
@@ -187,7 +189,8 @@ Page({
               flatChargPrice : item.flatChargPrice,
               flatServicePrice : item.flatServicePrice,
               valleyChargPrice : item.valleyChargPrice,
-              valleyServicePrice : item.valleyServicePrice
+              valleyServicePrice : item.valleyServicePrice,
+              resultList: item.resultList
             };
             markers[index] = marker;
           });
@@ -251,6 +254,10 @@ Page({
       },
       method: 'POST',
       success(res) {
+        var chargPile = res.data;
+        let resultTable = chargPile.resultList
+        that.resetResultList(resultTable);
+        that.resetResultData(resultTable,chargPile)
         //userInfo.flag = true;
         if (isLogin && userInfo.flag) {
           wx.request({
@@ -262,7 +269,6 @@ Page({
             },
             method: 'POST',
             success(res1) {
-              //console.log(res1);
               var myChargeStationsIds = '';
               res1.data.forEach((item, index) => {
                 myChargeStationsIds += item.id + ",";
@@ -315,7 +321,8 @@ Page({
                   flatChargPrice : item.flatChargPrice,
                   flatServicePrice : item.flatServicePrice,
                   valleyChargPrice : item.valleyChargPrice,
-                  valleyServicePrice : item.valleyServicePrice
+                  valleyServicePrice : item.valleyServicePrice,
+                  resultList: item.resultList
                 };
                 if (myChargeStationsIds.indexOf(item.id + ',') != -1) {
                   marker.userFlag = true;
@@ -382,7 +389,8 @@ Page({
               flatChargPrice : item.flatChargPrice,
               flatServicePrice : item.flatServicePrice,
               valleyChargPrice : item.valleyChargPrice,
-              valleyServicePrice : item.valleyServicePrice
+              valleyServicePrice : item.valleyServicePrice,
+              resultList: item.resultList
             };
             markers[index] = marker;
           });