电费，服务费改造

pages/charginfo/charginfo.wxml

@@ -11,7 +11,7 @@
         </view>
       </view>
 
-<text class="inline" style='color:#cea568'>全天时段费用：</text>
+<text class="inline" style='color:#cea568;font-size: 28rpx;'>全天时段费用：</text>
 
 <view class="rtable">
 

pages/charginfo/charginfo.wxss

@@ -4,7 +4,6 @@ page {
   background-color: #efefef;
   height: 100%;
   overflow-y: hidden;
-  
 }
 .chargfeatureImage{
   display: inline-block;
@@ -286,7 +285,8 @@ text.price {
 }
 
 .rtable .rtr{
-  font-size: 26rpx;
+  font-size: 22rpx;
+  color: #9d9d9d;
 }
 .rtable .rtr.active{
   color:#d57a80;
@@ -295,6 +295,10 @@ text.price {
   font-style: italic;
 }
 
+.rtable .rtr .rtd{
+
+}
+
 .rtable .rtr .rtd.t1{
   width: 210rpx
 }

pages/index/index.js

@@ -203,7 +203,7 @@ Page({
     for(let i=0;i<resultList.length;i++){
       if(resultList[i].currentTime){
         data.chargprice = resultList[i].elecPrice
-        data.serviceprice = resultList[i].serviceprice
+        data.serviceprice = resultList[i].servicePrice
       }
     }
   },

pages/scan_result/scan_result.js

@@ -41,7 +41,7 @@ Page({
         //console.log(res.data);
         var chargPile = res.data;
         let resultTable = chargPile.resultList
-
+        that.resetResultList(resultTable)
         that.setData({
           resultTable
         })

pages/scan_result/scan_result.wxml

@@ -1,5 +1,6 @@
 <!--pages/scan_result/scan_result.wxml-->
   <view wx:if="{{chargPile}}"  class="map_text" hover-class='active' >
+    <scroll-view class='context' scroll-y='true' >
     <!-- <view class="map-1" bindtap="getRoute">
       <image src="/images/jt.png"></image>
       <view>路线</view>
@@ -38,7 +39,7 @@
       </view>
       </block>
     </view>
-  <view style="height:40rpx;width:100%"> </view>
+  <!-- <view style="height:40rpx;width:100%"> </view> -->
     <!--
     <text class="inline">实时参考费用：</text>
     <view style='line-height:0;'>
@@ -75,13 +76,18 @@
     <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 wx:if="{{chargPile.showinfo}}" style='margin-top:24rpx;'>
+    <view wx:if="{{chargPile.showinfo}}" style='margin-top:20rpx;'>
     <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;'>
+  <view  style='margin-top:20rpx;'>
     <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>
+  <!-- <text style='line-height:48rpx;color:red;font-size:32rpx;'>2</text>  -->
+  <view  style='margin-top:20rpx;'>
+    <rich-text style='line-height:48rpx;color:#1D9BF7;font-size:32rpx;word-break:break-all;'>充电即减免 {{repaidbalance}}小时停车费。请您确认入场车辆与启动充电时录入的车牌信息保持一致，如录入不一致将无法享受充电减免停车费优惠。</rich-text>
+  </view>
   <button wx:if="{{chargPile}}" class='charg_button' bindtap="beginCharge" >开始充电</button>
+  </scroll-view>
   </view>
 
 

pages/scan_result/scan_result.wxss

@@ -140,6 +140,10 @@ text.inline {
   font-style: italic;
 }
 
+.rtable .rtr .rtd{
+  font-size: 26rpx;
+}
+
 .rtable .rtr .rtd.t1{
   width: 210rpx
 }
@@ -147,3 +151,8 @@ text.inline {
 .rtable .rtr .rtd.t2{
   width: 180rpx
 }
+
+.context{
+  height: 1400rpx;
+  width: 100%;
+}

pages/search_result/search_result.js

@@ -36,7 +36,7 @@ Page({
     for(let i=0;i<resultList.length;i++){
       if(resultList[i].currentTime){
         data.chargprice = resultList[i].elecPrice
-        data.serviceprice = resultList[i].serviceprice
+        data.serviceprice = resultList[i].servicePrice
       }
     }
   },