界面改版第二次第一版上传

app.js

@@ -3,7 +3,7 @@ let wechat = require('./utils/wechat.js');
 let log = require('./utils/log.js');
 App({
   globalData: {
-    postHeadAgreement: 'https://cdgl.pjnes.com',
+    postHeadAgreement: 'http://cdgl.pjnes.com',
     helpPhoneNum: '18211188302',
     version:'2.0'
   },

pages/index/index.wxml

@@ -22,7 +22,7 @@
       <cover-view class='map_location' bindtap='click_location_control' hover-class='map_location_hover'>
         <cover-image class='circle1' src='/images/circle1.png'></cover-image>
       </cover-view>
-      <cover-view class='map_center'>
+      <cover-view wx:if='{{!(!(textData.name)&&showModal&&notice.noticeTitle)}}' class='map_center'>
         <cover-image src='/images/map_center.png'></cover-image>
       </cover-view>
     </map>
@@ -51,16 +51,21 @@
   </view>
 </view>
 <view wx:if='{{!(textData.name)&&showModal&&notice.noticeTitle}}'>
+
   <view class="modal_box">
     <view class="title">
-      <image src='/images/notice.png' />公告</view>
-    <view class='content_title'>{{notice.noticeTitle}}:</view>
-    <view class='content'>
-      <view class='modalMsg'>
-        <rich-text nodes='{{notice.noticeContent}}'></rich-text>
+      <image src='/images/notice.png' />
+    </view>
+    <view class="content_msg">
+      <view class='content_title'>{{notice.noticeTitle}}</view>
+      <view class='content'>
+        <view class='modalMsg'>
+          <rich-text nodes='{{notice.noticeContent}}'></rich-text>
+        </view>
       </view>
+      <view bindtap='Sure' class='Sure' hover-class='hover_sure'>知道了</view>
     </view>
-    <view bindtap='Sure' class='Sure' hover-class='hover_sure'>确定</view>
+
   </view>
 </view>
 <view class='footer'>

pages/index/index.wxss

@@ -110,6 +110,7 @@
   position: absolute;
   width: 57rpx;
   height: 65rpx;
+  z-index: 888;
 }
 .map_center cover-image{
   width: 57rpx;
@@ -278,48 +279,47 @@ text.price {
 
 /* 通知相关 begin */
 .modal_box {
-  width: 688rpx;
-  height: 688rpx;
+  width: 560rpx;
+  height: 604rpx;
   overflow: hidden;
   position: fixed;
   top: 50%;
   left: 0;
   z-index:9999;
-  background: #ffffff;
-  margin: -344rpx 31rpx 0 31rpx;
-  border-radius: 12rpx;
+  margin: -416rpx 95rpx 0 95rpx;
 }
  
 .title {
-  height:128rpx;
-  text-align: center;
-  background-color: #27a6bf;
-  font-size: 34rpx;
-  color: #ffffff;
-  line-height: 128rpx;
-  font-family: 'Lucida Sans',
-                 'Lucida Sans Regular',
-                 'Lucida Grande',
-                 'Lucida Sans Unicode',
-                 Geneva,
-                 Verdana,
-                 sans-serif;
+  height:224rpx;
+  width:224rpx;
+  background-color: #ffffff;
+  margin: 0 168rpx 0 168rpx;
+  border-radius: 112rpx;
 }
 .title image{
-  position: absolute;
+  /* position: absolute;
   top: 14rpx;
-  left: 14rpx;
-  width: 89rpx;
-  height: 101rpx;
+  left: 14rpx; */
+  width: 136rpx;
+  height: 120rpx;
+  margin: 32rpx 30rpx;
+}
+.content_msg{
+  background: #ffffff; 
+  border-radius: 24rpx;
+  margin-top: -112rpx;
+  width: 560rpx;
+  height: 492rpx;
 }
 .content {
-  height:300rpx;
+  height:226rpx;
   overflow-y: scroll; /*超出父盒子高度可滚动*/
+  border-bottom: 1rpx  solid #e5e5e5;
 }
 .content_title{
-  color: #27a6bf;
-  font-size: 30rpx;
-  line-height: 32rpx;
+  color: #1b1b1b;
+  font-size: 42rpx;
+  line-height: 42rpx;
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
                  'Lucida Grande',
@@ -327,20 +327,21 @@ text.price {
                  Geneva,
                  Verdana,
                  sans-serif;
-  margin: 40rpx 40rpx 28rpx 40rpx;
+  /* margin: 40rpx 40rpx 28rpx 40rpx; */
+  text-align: center;
+  padding: 88rpx 0 36rpx 0 ;
+  font-weight: bold;
 }
 .Sure {
-  width: 288rpx;
-  height:78rpx;
+  width: 560rpx;
+  height:100rpx;
   position: absolute;
   bottom: 0rpx;
-  color: #27a6bf;
-  line-height: 78rpx;
-  border: solid #27a6bf 2rpx;
-  border-radius: 12rpx;
+  border-radius: 0 0 24rpx 24rpx;
+  color: #fd7711;
+  line-height: 100rpx;
   text-align: center;
-  margin: 40rpx 200rpx;
-  font-size: 32rpx;
+  font-size: 36rpx;
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
                  'Lucida Grande',
@@ -350,16 +351,15 @@ text.price {
                  sans-serif;
 }
 .Sure.hover_sure {
-  color: #ffffff;
-  background-color:#27a6bf; 
+  background-color: #e5e5e5;
 }
 .modalMsg {
   text-align: left;
-  margin: 0rpx 40rpx;
+  margin: 0rpx 50rpx;
   display: block;
-  font-size: 26rpx;
+  font-size: 28rpx;
   line-height: 48rpx;
-  color: #27a6bf;
+  color: #7c7c7c;
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
                  'Lucida Grande',
@@ -367,7 +367,7 @@ text.price {
                  Geneva,
                  Verdana,
                  sans-serif;
-
+  /* font-weight: bold; */
 }
 rich-text{
   word-break:break-all; 

pages/order/order.json

@@ -1,6 +1,5 @@
 {
   "usingComponents": {},
-  "navigationBarTitleText": "充电详情",
-  "navigationBarBackgroundColor": "#31d197"
+  "navigationBarTitleText": "充电详情"
   
 }

pages/order/order.wxml

@@ -6,7 +6,7 @@
     </view> -->
   <view class='charging_text_title'>
     <view class='charging'>
-      <image src='/images/charging2.png'></image>
+      <image src='/images/charging2_1.png'></image>
     </view>
     <view class='charging_text_title1'>
       <text class='bold'>{{order.chargStation.chargStationName}}</text>

pages/order/order.wxss

@@ -20,7 +20,7 @@ view.inline {
   background: #fff;
   padding: 0 30rpx;
   margin: 30rpx 20rpx 50rpx 20rpx;
-  border-radius: 20rpx;
+  border-radius: 10rpx;
   box-shadow: 0rpx 4rpx 4rpx #d5d5d5;
 }
 /*
@@ -32,6 +32,7 @@ view.inline {
   height: 105rpx;
   width: 100%;
   display: flex;
+  margin-bottom: 20rpx;
 }
 
 .charging_text_title1 {
@@ -40,18 +41,16 @@ view.inline {
   white-space: nowrap;
   overflow: hidden;
 }
-
 .charging {
-  width: 45rpx;
-  height: 45rpx;
+  width: 62rpx;
+  height: 62rpx;
   margin: 30rpx 30rpx 30rpx 0;
   flex-shrink: 0;
   overflow: hidden;
 }
-
 .charging image {
-  width: 45rpx;
-  height: 45rpx;
+  width: 62rpx;
+  height: 62rpx;
 }
 
 text {
@@ -65,7 +64,7 @@ text {
                  Geneva,
                  Verdana,
                  sans-serif;
-  color: #545253;
+  color: #231400;
   text-overflow: ellipsis;
   white-space: nowrap;
   overflow: hidden;
@@ -76,31 +75,33 @@ text {
 
 text.bold {
   font-weight: bold;
-  line-height: 24rpx;
-  height: 24rpx;
-  min-height: 24rpx;
-  margin-top: 30rpx;
-  margin-bottom: 1rpx;
-  display: block;
+  line-height: 34rpx;
+  height: 34rpx;
+  min-height: 34rpx;
+  margin-top: 28rpx;
+  margin-bottom: 8rpx;
+  display: block;  
+  font-size: 30rpx;
 }
 
 text.inline {
   display: inline-block;
-  color: #959595;
+  color: #575757;
 }
 
 .h1 {
-  margin: 0rpx 0rpx 30rpx 0rpx;
-  font-size: 20rpx;
-  line-height: 20rpx;
-  height: 20rpx;
-  min-height: 20rpx;
-  color: #959595;
+  margin: 0rpx 0rpx 24rpx 0rpx;
+  font-size: 24rpx;
+  line-height: 28rpx;
+  height: 28rpx;
+  min-height: 28rpx;
+  color: #a3a3a3;
 }
 
 .pay_button {
   font-size: 32rpx;
-  margin: 50rpx 30rpx;
+  margin: 50rpx 65rpx;
+  height: 90rpx;
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
                  'Lucida Grande',
@@ -112,6 +113,9 @@ text.inline {
   text-overflow: ellipsis;
   white-space: nowrap;
   background-color: #f18e19;
+  border-radius: 45rpx;
+  box-shadow: 0rpx 16rpx 0rpx #edf5fd;
+  border: none;
 }
 
 .pay_button.button-hover {
@@ -120,7 +124,8 @@ text.inline {
 
 .pay_button1 {
   font-size: 32rpx;
-  margin: 50rpx 30rpx;
+  margin: 50rpx 65rpx;
+  height: 90rpx;
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
                  'Lucida Grande',
@@ -132,6 +137,9 @@ text.inline {
   text-overflow: ellipsis;
   white-space: nowrap;
   background-color: #c9c9c9;
+  border-radius: 45rpx;
+  box-shadow: 0rpx 16rpx 0rpx #edf5fd;
+  border: none;
 }
 
 .table {
@@ -150,6 +158,10 @@ text.inline {
 .tr.title {
   background-color: #f8f8f8;
 }
+.tr.title text {
+  color:  #a3a3a3;
+}
+
 
 .td {
   width: 40%;
@@ -164,7 +176,7 @@ text.inline {
 }
 
 .td text {
-  color: #959595;
+  color:  #a3a3a3;
 }
 
 .th {

pages/scan_result/scan_result.js

@@ -21,7 +21,7 @@ Page({
       success: function (res) {
         //console.log(res);
         //console.log(res.data);
-        var chargPile = res.data;      
+        var chargPile = res.data;
         chargPile.sharpTotalPrice = (chargPile.sharpChargPrice + chargPile.sharpServicePrice).toFixed(4);
         chargPile.peakTotalPrice = (chargPile.peakChargPrice + chargPile.peakServicePrice).toFixed(4);
         chargPile.flatTotalPrice = (chargPile.flatChargPrice + chargPile.flatServicePrice).toFixed(4);
@@ -77,25 +77,25 @@ Page({
         } else {
           wx.setStorageSync('userInfo', data);
           wx.setStorageSync('isLogin', true);
-          
+
           //开始充电
-          if (!data.repaidbalance||data.repaidbalance<=0){
+          if (!data.repaidbalance || data.repaidbalance <= 0) {
             wx.showModal({
               showCancel: false,
               content: '余额不足,请充值！',
               success: function (res) {
-                if (res.confirm){
+                if (res.confirm) {
                   let url = "/pages/chargemoney/chargemoney";
                   wx.navigateTo({
                     url
                   });
-                } 
+                }
               }
             });
             log.info('[扫码]', '[同步用户数据]', '[data.repaidbalance null||data.repaidbalance<=0余额不足跳转充值界面]', data);
-          } else if (data.repaidbalance > 0 && data.repaidbalance<=15){
+          } else if (data.repaidbalance > 0 && data.repaidbalance <= 15) {
             wx.showModal({
-              title: '余额：' + data.repaidbalance+'元',
+              title: '余额：' + data.repaidbalance + '元',
               showCancel: false,
               confirmText: "去充值",
               content: '余额过低,请尽快充值！',
@@ -104,8 +104,8 @@ Page({
                   let url = "/pages/chargemoney/chargemoney";
                   wx.navigateTo({
                     url
-                  }); 
-                } 
+                  });
+                }
               }
             });
             log.info('[扫码]', '[同步用户数据]', '[0<data.repaidbalance<=15余额过低]', data);
@@ -118,7 +118,7 @@ Page({
             //   content: '余额过低,请尽快充值！',
             //   success: function (res) {
             //     if (res.confirm) {
-                  
+
             //       that.beginCharge_satrt();
             //     } else if (res.cancel) {
             //       let url = "/pages/chargemoney/chargemoney";
@@ -128,10 +128,10 @@ Page({
             //     }
             //   }
             // });
-          } else if (data.repaidbalance > 15 ) {
+          } else if (data.repaidbalance > 15) {
             log.info('[扫码]', '[同步用户数据]', '[余额充足开始充电]', data);
             that.beginCharge_satrt();
-          } 
+          }
         }
       },
       fail(e) {
@@ -142,7 +142,7 @@ Page({
 
 
   },
-  beginCharge_satrt(){
+  beginCharge_satrt() {
     wx.showLoading({
       title: '开启充电中...',
       mask: true
@@ -188,8 +188,8 @@ Page({
           data
         } = res;
         log.info('[扫码]', '[开始充电]', '[响应]', data);
-        if (data && data.code == 200 ) {
-        //if (data && data.code == 200 && data.orderid) {
+        if (data && data.code == 200) {
+          //if (data && data.code == 200 && data.orderid) {
           //开启充电成功，跳转到正在充电界面
           let {
             orderid
@@ -213,8 +213,8 @@ Page({
             showCancel: false,
             content: data.message
           });
-          log.info('[扫码]', '[开始充电]', '[失败data.code=502' + data.message+']', data);
-        }else {
+          log.info('[扫码]', '[开始充电]', '[失败data.code=502' + data.message + ']', data);
+        } else {
           //开启充电失败，提示用户
           wx.showModal({
             showCancel: false,

pages/scan_result/scan_result.json

@@ -1,5 +1,4 @@
 {
     "usingComponents": {},
-    "navigationBarTitleText": "终端详情",
-    "navigationBarBackgroundColor": "#24e383"
+    "navigationBarTitleText": "终端详情"
 }

pages/scan_result/scan_result.wxml

@@ -6,29 +6,29 @@
     </view> -->
     <view class='charging_text_title'>
       <view class='charging'>
-        <image src='/images/charging2.png'></image>
+        <image src='/images/charging2_1.png'></image>
       </view>
       <view class='charging_text_title1'>
         <text class='bold'>{{chargPile.address}}</text>
         <text class="h1">{{chargPile.chargPileName}}</text>
       </view>
     </view>
-    <text>终端编号：{{chargPile.chargPileId}}</text>
+    <text style='margin-bottom:10rpx;'>终端编号：{{chargPile.chargPileId}}</text>
     <!-- <text class='fast' wx:if="{{chargPile.pileType=='快充'}}">快桩：2小时</text>
     <text class='slow' wx:if="{{chargPile.pileType=='慢充'}}">慢桩：2小时</text> -->
     <text class="inline">实时参考费用：</text>
     <view style='line-height:0;'>
-      <text decode='true' style='color:red;font-size:22rpx;'>电&nbsp;&nbsp;&nbsp;费：{{chargPile.chargprice}}元&nbsp;&nbsp;服务费：{{chargPile.serviceprice}}元&nbsp;&nbsp;总费用：{{chargPile.totalprice}}元</text>
+      <text decode='true' style='color:red;font-size:24rpx;margin-bottom:10rpx;'>电&nbsp;&nbsp;&nbsp;费：{{chargPile.chargprice}}元&nbsp;&nbsp;服务费：{{chargPile.serviceprice}}元&nbsp;&nbsp;总费用：{{chargPile.totalprice}}元</text>
     </view>
     <text class="inline">参考价格：</text>
     <view style='line-height:0;'>
-      <text decode='true' style='font-size:22rpx;'>服务费：尖峰{{chargPile.sharpServicePrice}}元&nbsp;&nbsp;高峰{{chargPile.peakServicePrice}}元&nbsp;&nbsp;平段{{chargPile.flatServicePrice}}元&nbsp;&nbsp;低谷{{chargPile.valleyServicePrice}}元&nbsp;&nbsp;</text>
+      <text decode='true' style='font-size:24rpx;color:#a3a3a3;margin-bottom:10rpx;'>服务费：尖峰{{chargPile.sharpServicePrice}}元&nbsp;&nbsp;高峰{{chargPile.peakServicePrice}}元&nbsp;&nbsp;平段{{chargPile.flatServicePrice}}元&nbsp;&nbsp;低谷{{chargPile.valleyServicePrice}}元&nbsp;&nbsp;</text>
     </view>
     <view style='line-height:0;'>
-      <text decode='true' style='font-size:22rpx;'>电&nbsp;&nbsp;&nbsp;费：尖峰{{chargPile.sharpChargPrice}}元&nbsp;&nbsp;高峰{{chargPile.peakChargPrice}}元&nbsp;&nbsp;平段{{chargPile.flatChargPrice}}元&nbsp;&nbsp;低谷{{chargPile.valleyChargPrice}}元&nbsp;&nbsp;</text>
+      <text decode='true' style='font-size:24rpx;color:#a3a3a3;margin-bottom:10rpx;'>电&nbsp;&nbsp;&nbsp;费：尖峰{{chargPile.sharpChargPrice}}元&nbsp;&nbsp;高峰{{chargPile.peakChargPrice}}元&nbsp;&nbsp;平段{{chargPile.flatChargPrice}}元&nbsp;&nbsp;低谷{{chargPile.valleyChargPrice}}元&nbsp;&nbsp;</text>
     </view>
     <view style='line-height:0;'>
-      <text decode='true' style='color:red;font-size:22rpx;'>总费用：尖峰{{chargPile.sharpTotalPrice}}元&nbsp;&nbsp;高峰{{chargPile.peakTotalPrice}}元&nbsp;&nbsp;平段{{chargPile.flatTotalPrice}}元&nbsp;&nbsp;低谷{{chargPile.valleyTotalPrice}}元&nbsp;&nbsp;</text>
+      <text decode='true' style='font-size:24rpx;color:#a3a3a3;margin-bottom:10rpx;'>总费用：尖峰{{chargPile.sharpTotalPrice}}元&nbsp;&nbsp;高峰{{chargPile.peakTotalPrice}}元&nbsp;&nbsp;平段{{chargPile.flatTotalPrice}}元&nbsp;&nbsp;低谷{{chargPile.valleyTotalPrice}}元&nbsp;&nbsp;</text>
     </view>
     <!-- <view style='line-height:0;'>
       <text decode='true' class='inline'>费用：&nbsp;&nbsp;</text>
@@ -43,16 +43,16 @@
     </view> -->
     <text class="inline">峰谷时段划分：</text>
     <view style='line-height:0;'>
-      <text decode='true' style='font-size:22rpx;'>高峰：10:00-15:00&nbsp;&nbsp;18:00-21:00</text>
+      <text decode='true' style='font-size:24rpx;color:#a3a3a3;margin-bottom:10rpx;'>高峰：10:00-15:00&nbsp;&nbsp;18:00-21:00</text>
     </view>
     <view style='line-height:0;'>
-      <text decode='true' style='font-size:22rpx;'>平段：07:00-10:00&nbsp;&nbsp;15:00-18:00&nbsp;&nbsp;21:00-23:00</text>
+      <text decode='true' style='font-size:24rpx;color:#a3a3a3;margin-bottom:10rpx;'>平段：07:00-10:00&nbsp;&nbsp;15:00-18:00&nbsp;&nbsp;21:00-23:00</text>
     </view>
     <view style='line-height:0;'>
-      <text decode='true' style='font-size:22rpx;'>低谷：23:00至次日07:00</text>
+      <text decode='true' style='font-size:24rpx;color:#a3a3a3;margin-bottom:10rpx;'>低谷：23:00至次日07:00</text>
     </view>
     <view style='line-height:0;'>
-      <text decode='true' style='font-size:22rpx;'>尖峰：7\8月11:00-13:00&nbsp;&nbsp;16:00-17:00</text>
+      <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}}">

pages/scan_result/scan_result.wxss

@@ -1,12 +1,9 @@
 /* pages/scan_result/scan_result.wxss */
 page {
-  background-color: #f4f4f4;
   height: 100%;
   overflow-y:hidden; 
 }
 
-
-
 view.inline {
   display: inline-block;
   vertical-align: middle;
@@ -19,18 +16,15 @@ view.inline {
   position: relative;
   height: calc(100% - 210rpx);
   background: #fff;
-  padding: 0 30rpx;
-  margin: 30rpx 20rpx 50rpx 20rpx;
-  border-radius: 20rpx;
-  box-shadow: 0rpx 4rpx 4rpx #d5d5d5;
-}
-.map_text.active{
-  background-color: #ebebeb;
+  padding: 20rpx 30rpx 0 30rpx;
+  box-shadow: 0rpx 6rpx 6rpx  #f5f5f5 inset;
+  
 }
 .charging_text_title {
   height: 105rpx;
   width: 100%;
   display: flex;
+  margin-bottom: 20rpx;
 }
 
 .charging_text_title1 {
@@ -39,24 +33,22 @@ view.inline {
   white-space: nowrap;
   overflow: hidden;
 }
-
 .charging {
-  width: 45rpx;
-  height: 45rpx;
+  width: 62rpx;
+  height: 62rpx;
   margin: 30rpx 30rpx 30rpx 0;
   flex-shrink: 0;
   overflow: hidden;
 }
-
 .charging image {
-  width: 45rpx;
-  height: 45rpx;
+  width: 62rpx;
+  height: 62rpx;
 }
 
 text {
-  margin: 0 0 20rpx 0;
+  margin: 0 0 18rpx 0;
   display: block;
-  font-size: 24rpx;
+  font-size: 26rpx;
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
                  'Lucida Grande',
@@ -64,49 +56,45 @@ text {
                  Geneva,
                  Verdana,
                  sans-serif;
-  color: #545253;
+  color: #231400;
   text-overflow: ellipsis;
   white-space: nowrap;
   overflow: hidden;
-  line-height: 24rpx;
-  height: 24rpx;
-  min-height: 24rpx;
+  line-height: 30rpx;
+  height: 30rpx;
+  min-height: 30rpx;
 }
 
 text.bold {
   font-weight: bold;
-  line-height: 24rpx;
-  height: 24rpx;
-  min-height: 24rpx;
-  margin-top: 30rpx;
-  margin-bottom: 1rpx;
-  display: block;
+  line-height: 34rpx;
+  height: 34rpx;
+  min-height: 34rpx;
+  margin-top: 28rpx;
+  margin-bottom: 8rpx;
+  display: block;  
+  font-size: 30rpx;
 }
 
 text.inline {
   display: inline-block;
-  color: #959595;
-}
-
-text.fast {
-  color: #2483c0;
-}
-
-text.slow {
-  color: #42b9b4;
+  color: #575757;
+  margin-top:18rpx;
+  margin-bottom: 0;
 }
 
 .h1 {
-  margin: 0rpx 0rpx 30rpx 0rpx;
-  font-size: 20rpx;
-  line-height: 20rpx;
-  height: 20rpx;
-  min-height: 20rpx;
-  color: #959595;
+  margin: 0rpx 0rpx 24rpx 0rpx;
+  font-size: 24rpx;
+  line-height: 28rpx;
+  height: 28rpx;
+  min-height: 28rpx;
+  color: #a3a3a3;
 }
-.charg_button{
+.charg_button {
   font-size: 32rpx;
-  margin: 50rpx 30rpx;
+  margin: 50rpx 65rpx;
+  height: 90rpx;
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
                  'Lucida Grande',
@@ -117,8 +105,14 @@ text.slow {
   color: #ffffff;
   text-overflow: ellipsis;
   white-space: nowrap;
-  background-color: #25e285;
+  background-color: #1d9bf7;
+  border-radius: 45rpx;
+  box-shadow: 0rpx 16rpx 0rpx #edf5fd;
+  border: none;
 }
-.charg_button.button-hover{
-  background-color: #1ca05e;
-}
+
+.charg_button.button-hover {
+  background-color: #1d9cf7b9;
+  color: #ffffff;
+}
+

pages/ucenter/charginglog/charginglog.json

@@ -1,5 +1,4 @@
 {
   "usingComponents": {},
-  "navigationBarTitleText": "充电记录",
-  "navigationBarBackgroundColor": "#24e383"
+  "navigationBarTitleText": "充电记录"
 }

pages/ucenter/charginglog/charginglog.wxml

@@ -1,8 +1,4 @@
 <!--pages/ucenter/charginglog/charginglog.wxml-->
-<view class='title'>
-  <!--<text>您已减排</text>
-  <text class='bold'>0KG</text>-->
-</view>
 <scroll-view class='context' scroll-y='true'>
   <view class='context_block'></view>
   
@@ -13,7 +9,7 @@
     </view> -->
     <view class='charging_text_title'>
       <view class='charging'>
-        <image src='/images/charging2.png'></image>
+        <image src='/images/charging2_1.png'></image>
       </view>
       <view class='charging_text_title1'>
         <text class='bold'>{{charginglog.chargStation.chargStationName}}</text>
@@ -21,24 +17,27 @@
       </view>
     </view>
     <text>{{charginglog.chargPile.chargPileName}}</text>
-    <text class='inline' decode='true'>充电时长：{{charginglog.totalTime}}&nbsp;&nbsp;&nbsp;&nbsp;</text>
-    <text class='inline'>充电电量：{{charginglog.chargpower}}度</text>
+    <view  class="inline-view">
+      <text class='inline' decode='true'>充电时长：{{charginglog.totalTime}}&nbsp;&nbsp;&nbsp;&nbsp;</text>
+      <text class='inline'>充电电量：{{charginglog.chargpower}}度</text>
+    </view>
+    
     <text class='gray'>{{charginglog.startTime}}-{{charginglog.endTime}}</text>
     <view style='line-height:0;'>
-      <text class='inline'>总费用：</text>
+      <text class='inline gray1'>总费用：</text>
       <text class='inline red'>{{charginglog.chargallmoney}}</text>
-      <text class='inline' decode='true'>元&nbsp;&nbsp;&nbsp;&nbsp;服务费：</text>
+      <text class='inline gray1' decode='true'>元&nbsp;&nbsp;&nbsp;&nbsp;服务费：</text>
       <text class='inline red'>{{charginglog.chargservice}}</text>
-      <text class='inline' decode='true'>元&nbsp;&nbsp;&nbsp;&nbsp;电费：</text>
+      <text class='inline gray1' decode='true'>元&nbsp;&nbsp;&nbsp;&nbsp;电费：</text>
       <text class='inline red'>{{charginglog.chargmoney}}</text>
-      <text class='inline'>元</text>
+      <text class='inline gray1'>元</text>
     </view>
-    <text wx:if="{{charginglog.paytype==1}}" decode='true'>支付方式：余额</text>
-    <text wx:if="{{charginglog.paytype==2}}" decode='true'>支付方式：信用欠款</text>
-    <text wx:if="{{charginglog.paytype==3}}" decode='true'>支付方式：支付宝</text>
-    <text wx:if="{{charginglog.paytype==4}}" decode='true'>支付方式：微信支付</text>
-    <text wx:if="{{charginglog.paytype==5}}" decode='true'>支付方式：银联卡</text>
-    <text wx:if="{{charginglog.paytype==6}}" decode='true'>支付方式：虚拟货币</text>
+    <text class='gray' wx:if="{{charginglog.paytype==1}}" decode='true'>支付方式：余额</text>
+    <text class='gray' wx:if="{{charginglog.paytype==2}}" decode='true'>支付方式：信用欠款</text>
+    <text class='gray' wx:if="{{charginglog.paytype==3}}" decode='true'>支付方式：支付宝</text>
+    <text class='gray' wx:if="{{charginglog.paytype==4}}" decode='true'>支付方式：微信支付</text>
+    <text class='gray' wx:if="{{charginglog.paytype==5}}" decode='true'>支付方式：银联卡</text>
+    <text class='gray' wx:if="{{charginglog.paytype==6}}" decode='true'>支付方式：虚拟货币</text>
   </view>
 
   

pages/ucenter/charginglog/charginglog.wxss

@@ -6,62 +6,21 @@ page {
   overflow-y: hidden;
 }
 
-.title {
-  background-color: #24e383;
-  width: 100%;
-  height: 88rpx;
-  line-height: 88rpx;
-  min-height: 88rpx;
-  border-top: 1rpx solid #37c2ab;
-  padding: 0 30rpx;
-  font-family: 'Lucida Sans',
-                 'Lucida Sans Regular',
-                 'Lucida Grande',
-                 'Lucida Sans Unicode',
-                 Geneva,
-                 Verdana,
-                 sans-serif;
-  color: #fff;
-  vertical-align: text-bottom;
-}
-
-.title text {
-  padding: 0 10rpx 0 0;
-  display: inline-block;
-  font-size: 24rpx;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  overflow: hidden;
-  line-height: 24rpx;
-  height: 24rpx;
-  min-height: 24rpx;
-}
-
-.title .bold {
-  font-family: Impact, Haettenschweiler, 'Arial Narrow Bold', sans-serif;
-  font-style: italic;
-  font-weight: bold;
-  font-size: 28rpx;
-  line-height: 28rpx;
-  height: 28rpx;
-  min-height: 28rpx;
-}
-
 .context {
-  height: calc(100% - 89rpx);
+  height: 100%;
 }
 
 .context_block {
   width: 100%;
-  height: 32rpx;
+  height: 24rpx;
 }
 
 .text_context {
   position: relative;
-  height: 325rpx;
+  height: 378rpx;
   background: #fff;
   padding: 0 30rpx;
-  margin: 0 20rpx 32rpx 20rpx;
+  margin: 0 28rpx 24rpx 28rpx;
   border-radius: 20rpx;
   box-shadow: 0rpx 4rpx 4rpx #d5d5d5;
 }
@@ -74,6 +33,7 @@ page {
   height: 105rpx;
   width: 100%;
   display: flex;
+  margin-bottom: 20rpx;
 }
 
 .charging_text_title1 {
@@ -84,22 +44,22 @@ page {
 }
 
 .charging {
-  width: 45rpx;
-  height: 45rpx;
+  width: 62rpx;
+  height: 62rpx;
   margin: 30rpx 30rpx 30rpx 0;
   flex-shrink: 0;
   overflow: hidden;
 }
 
 .charging image {
-  width: 45rpx;
-  height: 45rpx;
+  width: 62rpx;
+  height: 62rpx;
 }
 
 .text_context text {
-  margin: 0 0 20rpx 0;
+  margin: 0 0 18rpx 0;
   display: block;
-  font-size: 24rpx;
+  font-size: 26rpx;
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
                  'Lucida Grande',
@@ -107,38 +67,50 @@ page {
                  Geneva,
                  Verdana,
                  sans-serif;
-  color: #545253;
+  color: #231400;
   text-overflow: ellipsis;
   white-space: nowrap;
   overflow: hidden;
-  line-height: 24rpx;
-  height: 24rpx;
-  min-height: 24rpx;
+  line-height: 30rpx;
+  height: 30rpx;
+  min-height: 30rpx;
 }
 
 .text_context .bold {
   font-weight: bold;
-  line-height: 24rpx;
-  height: 24rpx;
-  min-height: 24rpx;
+  line-height: 34rpx;
+  height: 34rpx;
+  min-height: 34rpx;
   margin-top: 28rpx;
-  margin-bottom: 5rpx;
+  margin-bottom: 8rpx;
   display: block;  
+  font-size: 30rpx;
 }
 .text_context .h1 {
-  margin: 0rpx 0rpx 28rpx 0rpx;
-  font-size: 20rpx;
-  line-height: 20rpx;
-  height: 20rpx;
-  min-height: 20rpx;
-  color: #959595;
+  margin: 0rpx 0rpx 24rpx 0rpx;
+  font-size: 24rpx;
+  line-height: 28rpx;
+  height: 28rpx;
+  min-height: 28rpx;
+  color: #a3a3a3;
 }
-
-
-.text_context .h1, text.gray {
-  color: #959595;
+.inline-view{
+  height: 42rpx;
+}
+text.gray {
+  color: #a3a3a3;
+  font-size: 24rpx;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+  line-height: 28rpx;
+  height: 28rpx;
+  min-height: 28rpx;
+  margin-bottom: 24rpx;
+}
+text.gray1 {
+  color: #575757;
 }
-
 text.inline {
   display: inline-block;
 }

pages/ucenter/index/index.js

@@ -58,7 +58,7 @@ Page({
   onShow: function() {
     let userInfo = wx.getStorageSync('userInfo');
     let isLogin = wx.getStorageSync('isLogin');
-
+    //console.log(userInfo);
     // 页面显示
     if (userInfo && isLogin) {
       //userInfo.flag = true;

pages/ucenter/purse/purse.json

@@ -1,5 +1,4 @@
 {
   "usingComponents": {},
-  "navigationBarBackgroundColor": "#42b9b4",
   "navigationBarTitleText": "我的钱包"
 }

pages/ucenter/purse/purse.wxml

@@ -1,39 +1,20 @@
 <!--pages/ucenter/purse/purse.wxml-->
 <view class='top'>
-  <!--<view class='top_left' hover-class='active' bindtap='gotochargemoneycard'>
-    <image class='chargemoneycard' src='/images/chargemoneycard.png'></image>
-    <text>充值卡</text>
-    <text class='text1'>0张</text>
-  </view>-->
   <view class='top_center'>
-    <image class='balance' src='/images/balance.png'></image>
-    <text>余额</text>
-    <text class='text1'>￥{{userInfo.repaidbalance}}</text>
+    <image class='balance' src='/images/mypurse.png'></image>
   </view>
-  <!-- <view class='top_right' hover-class='active' bindtap='gotocashcoupon'> -->
-  <view class='top_right' hover-class='active'>
-    <image class='cashcoupon' src='/images/cashcoupon.png'></image>
-    <text>代金券</text>
-    <text class='text1'>0张</text>
+  <view class='top_center1'>
+    <text class='text1'>余额</text>
+    <text class='text2'>¥：{{userInfo.repaidbalance}}</text>
   </view>
-  <!-- <text class='text2' decode='true'>电费&nbsp;&nbsp;&nbsp;&nbsp;￥80.2&nbsp;&nbsp;&nbsp;&nbsp;服务费&nbsp;&nbsp;&nbsp;&nbsp;￥20</text> -->
 </view>
-
-<view class="context">
-  <view class='context_view' bindtap='chargemony' hover-class='active'>
-    <image class='chargemoney' src='/images/chargemoney.png'></image>
+<view class='title2'>
+  <view class='chargemoney' hover-class="active" bindtap='chargemony'>
+    <image src='/images/chargemoney_a.png'></image>
     <text>充值</text>
   </view>
-  <!--<view class='context_view' hover-class='active'>
-    <image class='relevance' src='/images/relevance.png'></image>
-    <text>关联充值卡</text>
-  </view>-->
-  <view class='context_view' bindtap='withdrawDeposit' hover-class='active'>
-    <image class='out' src='/images/out.png'></image>
-    <text>余额转出</text>
-  </view>
-  <view class='context_view' hover-class='active'>
-    <image class='exchange' src='/images/exchange.png'></image>
-    <text>兑换代金券</text>
+  <view class="out" hover-class="active" bindtap='withdrawDeposit'>
+    <image src='/images/out_a.png'></image>
+    <text>提现</text>
   </view>
 </view>

pages/ucenter/purse/purse.wxss

@@ -1,15 +1,15 @@
 /* pages/ucenter/purse/purse.wxss */
+
 page {
   height: 100%;
   overflow-y: hidden;
 }
 
 .top {
-  background-color: #42b9b4;
   width: 100%;
-  height: 260rpx;
-  text-align: center;
-  min-height: 260rpx;
+  /* height: 260rpx; */
+  text-align: left;
+  /* min-height: 260rpx; */
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
                  'Lucida Grande',
@@ -18,70 +18,59 @@ page {
                  Verdana,
                  sans-serif;
   color: #fff;
+  box-shadow: 0rpx 6rpx 6rpx #f5f5f5 inset;
+  padding-top: 30rpx;
+  margin-bottom: 42rpx;
 }
 
-.top_left,.top_right {
-  width: 33%;
-  height: 170rpx;
-  display: inline-block;
-}
-.top_center{
-  width: 34%;
-  height: 170rpx;
-  display: inline-block;
+.top_center1 {
+  width: 100%;
+  height: 311rpx;
+  position: absolute;
+  top: 30rpx;
 }
 
-/*
-.top .active{
-  background-color: #60e7e1;
+.top_center {
+  width: 100%;
+  height: 311rpx;
 }
-*/
 
-image.chargemoneycard {
-  margin-top: 10rpx;
-  width: 52rpx;
-  height: 43rpx;
-  flex-shrink: 0;
-  overflow: hidden;
-}
 image.balance {
-  margin-top: 13rpx;
-  width: 50rpx;
-  height: 50rpx;
-  flex-shrink: 0;
-  overflow: hidden;
-}
-image.cashcoupon {
-  margin-top: 14rpx;
-  width: 54rpx;
-  height: 39rpx;
-  flex-shrink: 0;
+  margin-left: 12rpx;
+  width: 725rpx;
+  height: 311rpx;
   overflow: hidden;
 }
 
-.top text {
+.top .text1 {
+  padding: 82rpx 0 0 96rpx;
   display: block;
   font-size: 24rpx;
   text-overflow: ellipsis;
   white-space: nowrap;
   overflow: hidden;
-  line-height: 32rpx;
-  height: 32rpx;
-  min-height: 32rpx;
-}
-.top .text1 ,.top .text2  {
- color: #b0deda;
-}
-.top .text2 {
-  font-size: 20rpx;
+  line-height: 46rpx;
+  height: 46rpx;
+  min-height: 46rpx;
+  font-family: 'Lucida Sans',
+                 'Lucida Sans Regular',
+                 'Lucida Grande',
+                 'Lucida Sans Unicode',
+                 Geneva,
+                 Verdana,
+                 sans-serif;
 }
 
-.context{
-  margin-top: 60rpx;
-  height: 178rpx;
-  width: 100%;
-  text-align: center;
-  min-height: 178rpx;
+.top .text2 {
+  padding: 0 0 0 96rpx;
+  display: block;
+  font-size: 42rpx;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+  line-height: 60rpx;
+  height: 60rpx;
+  min-height: 60rpx;
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
                  'Lucida Grande',
@@ -89,57 +78,54 @@ image.cashcoupon {
                  Geneva,
                  Verdana,
                  sans-serif;
-  font-size: 24rpx;
-  color: #545253;
-
+  font-weight: bold;
 }
-.context_view {
-  /*width: 25%;*/
-  width: 30%;
-  height: 178rpx;
-  display: inline-block;
-}
-.context_view.active{
-  background-color: #fafafa;
+
+.title2 {
+  padding:0 28rpx;
 }
 
-image.chargemoney {
-  margin: 30rpx 0 20rpx 0;
-  width: 52rpx;
-  height: 52rpx;
-  flex-shrink: 0;
-  overflow: hidden;
+.title2 view {
+  height: 100rpx;
+  margin-bottom: 20rpx;
+  /* background-color: red; */
+  border-radius: 12rpx;
+  box-shadow: 2rpx 10rpx 6rpx #f5f5f5;
 }
-image.relevance {
-  margin: 33rpx 0 20rpx 0;
-  width: 49rpx;
-  height: 49rpx;
-  flex-shrink: 0;
-  overflow: hidden;
+.title2 view.active {
+  background-color: #f5f5f5;
+  box-shadow: none;
 }
-image.out {
-  margin: 30rpx 0 20rpx 0;
-  width: 52rpx;
-  height: 52rpx;
-  flex-shrink: 0;
-  overflow: hidden;
+
+
+.chargemoney image {
+  width: 40rpx;
+  height: 40rpx;
+  margin: 30rpx 28rpx 30rpx 20rpx;
 }
-image.exchange {
-  margin: 40rpx 0 20rpx 0;
-  width: 56rpx;
-  height: 42rpx;
-  flex-shrink: 0;
-  overflow: hidden;
+
+.out image {
+  width: 34rpx;
+  height: 35rpx;
+  margin: 33rpx 28rpx 33rpx 26rpx;
 }
 
-.context text {
-  display: block;
-  font-size: 24rpx;
+.chargemoney text, .out text {
+  display: inline-block;
+  line-height: 100rpx;
+  height: 100rpx;
+  min-height: 100rpx;
+  font-size: 32rpx;
+  font-family: 'Lucida Sans',
+                 'Lucida Sans Regular',
+                 'Lucida Grande',
+                 'Lucida Sans Unicode',
+                 Geneva,
+                 Verdana,
+                 sans-serif;
+  color: #434343;
   text-overflow: ellipsis;
   white-space: nowrap;
   overflow: hidden;
-  line-height: 32rpx;
-  height: 23rpx;
-  min-height: 32rpx;
+  font-weight: bold;
 }
-

project.config.json

@@ -101,6 +101,33 @@
 					"pathName": "pages/ucenter/help/help",
 					"query": "",
 					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "我的钱包",
+					"pathName": "pages/ucenter/purse/purse",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "充电记录",
+					"pathName": "pages/ucenter/charginglog/charginglog",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "终端详情",
+					"pathName": "pages/scan_result/scan_result",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "去支付",
+					"pathName": "pages/order/order",
+					"scene": null
 				}
 			]
 		}