界面改版第五次上传

app.js

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

pages/charging/charging.js

@@ -11,7 +11,7 @@ function initChart(canvas, width, height, dpr) {
   var options111 = {
     series: [{
       type: 'liquidFill',
-      data: [0.3],
+      data: [],
       color: ['#128cec'],//主体填充颜色
       center: ['50%', '50%'],//中心位置
       radius: '72%',//大小
@@ -31,7 +31,7 @@ function initChart(canvas, width, height, dpr) {
         baseline: 'middle',
         position: 'inside',
         formatter: function (p) {
-          console.log(p);
+          //console.log(p);
           if (isNaN(p.value)) {
             return '启动充电中';
           }
@@ -69,9 +69,9 @@ Page({
     }
   },
   drawCircle: function(step) {
-    var newoption = chart.getOption();
-    newoption.series[0].data[0]+=0.02;
-    chart.setOption(newoption,true);
+      var newoption = chart.getOption();
+      newoption.series[0].data[0] = parseFloat(step / 100.0).toFixed(2);
+      chart.setOption(newoption, true);
   },
   stopCharging(e) {
     wx.showLoading({
@@ -133,7 +133,7 @@ Page({
       }
     });
   },
-  showChargingPng() {
+  showChargingPng1() {
     var i = 0;
     let that = this;
     if (that.data.chargingOrder && that.data.chargingOrder.soc && that.data.chargingOrder.soc != 0) {
@@ -151,6 +151,14 @@ Page({
       }, 20);
     }
   },
+  showChargingPng() {
+    if (this.data.chargingOrder && this.data.chargingOrder.soc && this.data.chargingOrder.soc != 0) {
+      this.drawCircle(this.data.chargingOrder.soc);
+      this.setData({
+        chargingRate: this.data.chargingOrder.soc
+      });   
+    }
+  },
   /**
    * 生命周期函数--监听页面加载
    */
@@ -348,6 +356,7 @@ Page({
               soc: chargingRate
             } = chargingOrder;
             let orderid_r = chargingOrder.orderid;
+            //console.log(chargingOrder.chargPileStatus);
             if (chargingOrder.chargPileStatus == 1) { //启动中，继续轮训
               log.info('[充电中]', '[充电轮训]', '[chargPileStatus状态1启动中，继续轮训]', data);
               that.setData({

pages/charging/charging.wxml

@@ -9,19 +9,7 @@
   <text class="left">终端编号：{{chargPileId}}</text>
   <view class='chargeover'>
     <image src='/images/chargeover_1.png'></image>
-    <!-- <canvas class="progress_canvas" canvas-id="canvasProgress"> </canvas> -->
     <ec-canvas class="progress_canvas" id="mychart-dom-bar" canvas-id="mychart-bar" ec="{{ ec }}"></ec-canvas>
-    <view class='chargeover_text_view' wx:if="{{chargingOrder.chargPileStatus==2}}">
-      <!-- <text class="text2">{{yczds}}</text>
-      <text class="text1">已充电量(度)</text> -->
-      <!-- <text class="text2">01小时04分</text>
-      <text class="text1">剩余充满时间</text> -->
-      <!-- <text class="text2">{{chargingRate}}%</text> -->
-      <!-- <text class="text1">电池电量</text> -->
-    </view>
-    <view class='chargeover_text_view' wx:if="{{chargingOrder.chargPileStatus==1}}">
-      <text class="text4">充电桩启动中</text>
-    </view>
   </view>
 
   <view class='text_context' >
@@ -30,17 +18,17 @@
   </view>
   <view class="context">
     <view class='context_view' bindtap="goPurse" hover-class='active'>
-      <image class='chargemoney' src='/images/chargemoney.png'></image>
+      <image class='electric' src='/images/electric.png'></image>
       <text>电流</text>
       <text class='text2'>3.5kW-16A</text>
     </view>
     <view class='context_view1' bindtap="goCharginglog" hover-class='active'>
-      <image class='relevance' src='/images/relevance.png'></image>
+      <image class='voltage' src='/images/voltage.png'></image>
       <text>电压</text>
       <text class='text2'>220V</text>
     </view>
     <view class='context_view' hover-class='active'>
-      <image class='exchange' src='/images/exchange.png'></image>
+      <image class='money' src='/images/money.png'></image>
       <text>费用</text>
       <text class='text2'>{{totalMoney}}元</text>
     </view>

pages/charging/charging.wxss

@@ -9,7 +9,7 @@ page {
 
 .map_text {
   position: relative;
-  height: calc(100% - 210rpx);
+  height: calc(100% - 190rpx);
   background: #fff;
   padding: 0 30rpx;
   margin: 0;
@@ -30,20 +30,21 @@ page {
 }
 
 .chargeover {
-  width: 585rpx;
-  height: 475rpx;
-  margin: 50rpx 55rpx;
+  width: 634rpx;
+  height: 485rpx;
+  padding: 40rpx 28rpx 10rpx 28rpx;
   position: relative;
   flex-shrink: 0;
   overflow: hidden;
 }
 
 .chargeover image {
-  width: 585rpx;
-  height: 474rpx;
+  width: 634rpx;
+  height: 485rpx;
   position: absolute;
   top: 0;
   left: 0;
+  margin: 40rpx 28rpx 10rpx 28rpx;
 }
 
 .chargeover_text_view {
@@ -67,7 +68,7 @@ text {
                  Geneva,
                  Verdana,
                  sans-serif;
-  color: #434343;
+  color: #333333;
   text-overflow: ellipsis;
   white-space: nowrap;
   overflow: hidden;
@@ -106,12 +107,13 @@ text.left {
   line-height: 42rpx;
   height: 42rpx;
   min-height: 42rpx;
-  color: #9d9d9d;
+  color: #9a9a9a;
 }
 
 .charg_button {
   font-size: 32rpx;
   margin: 50rpx 65rpx;
+  height: 90rpx;
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
                  'Lucida Grande',
@@ -123,7 +125,9 @@ text.left {
   text-overflow: ellipsis;
   white-space: nowrap;
   background-color: #1d9bf7;
-  border-radius: 40rpx;
+  border-radius: 45rpx;
+  box-shadow: 0rpx 16rpx 0rpx #edf5fd;
+  border: none;
 }
 
 .charg_button.button-hover {
@@ -132,8 +136,9 @@ text.left {
 }
 
 .charg_button_disable {
+  height: 90rpx;
   font-size: 32rpx;
-  margin: 50rpx 30rpx;
+  margin: 50rpx 65rpx;
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
                  'Lucida Grande',
@@ -144,11 +149,14 @@ text.left {
   text-overflow: ellipsis;
   white-space: nowrap;
   color: #fff;
-  background-color: #c9c9c9;
+  border-radius: 45rpx;
+  background-color: #1d9bf7;
+  box-shadow: 0rpx 16rpx 0rpx #edf5fd; 
+  border: none;
 }
 
 .text1 {
-  margin: 0rpx 0rpx 30rpx 0rpx;
+  margin: 0rpx 0rpx 20rpx 0rpx;
   color: #03a9dc;
   font-size: 22rpx;
 }
@@ -159,10 +167,11 @@ text.left {
   line-height: 32rpx;
   height: 32rpx;
   min-height: 32rpx;
+  color: #696969;
 }
 
 .text3 {
-  margin: 0rpx 0rpx 10rpx 0rpx;
+  margin: 0rpx 0rpx 50rpx 0rpx;
   font-size: 30rpx;
   line-height: 48rpx;
   height: 48rpx;
@@ -198,7 +207,7 @@ text.left {
   font-size: 24rpx;
   color: #434343;
   /* margin-top:60rpx; */
-  margin: 0;
+  margin: 0 0 50rpx 0;
 }
 .context_view {
   width: 25%;
@@ -215,36 +224,13 @@ text.left {
 .context_view.active{
   background-color: #fafafa;
 }
-
-image.chargemoney {
-  margin: 30rpx 0 20rpx 0;
-  width: 52rpx;
-  height: 52rpx;
-  flex-shrink: 0;
-  overflow: hidden;
-}
-image.relevance {
-  margin: 33rpx 0 20rpx 0;
-  width: 49rpx;
-  height: 49rpx;
-  flex-shrink: 0;
-  overflow: hidden;
-}
-image.out {
-  margin: 30rpx 0 20rpx 0;
-  width: 52rpx;
-  height: 52rpx;
-  flex-shrink: 0;
-  overflow: hidden;
-}
-image.exchange {
-  margin: 40rpx 0 20rpx 0;
-  width: 56rpx;
-  height: 42rpx;
+.context_view image,.context_view1 image {
+  margin: 0;
+  width: 92rpx;
+  height: 92rpx;
   flex-shrink: 0;
   overflow: hidden;
 }
-
 .context text {
   display: block;
   font-size: 24rpx;
@@ -254,4 +240,6 @@ image.exchange {
   line-height: 32rpx;
   height: 24rpx;
   min-height: 32rpx;
+  margin: 0;
 }
+

pages/index/index.js

@@ -268,8 +268,8 @@ Page({
                     var marker = {
                       name: item.chargStationName,
                       address: item.address,
-                      width: "88rpx",
-                      height: "112rpx",
+                      width: "46rpx",
+                      height: "67rpx",
                       iconPath: iconPath,
                       id: item.id,
                       callout: {},
@@ -323,8 +323,8 @@ Page({
                 var marker = {
                   name: item.chargStationName,
                   address: item.address,
-                  width: "88rpx",
-                  height: "112rpx",
+                  width: "46rpx",
+                  height: "67rpx",
                   iconPath: iconPath,
                   id: item.id,
                   callout: {},
@@ -729,8 +729,8 @@ Page({
                   var marker = {
                     name: item.chargStationName,
                     address: item.address,
-                    width: "88rpx",
-                    height: "112rpx",
+                    width: "46rpx",
+                    height: "67rpx",
                     iconPath: iconPath,
                     id: item.id,
                     callout: {},

pages/index/index.wxml

@@ -4,7 +4,7 @@
       <image src='/images/search.png'></image>
       <text>{{keywords}}</text>
     </view>
-    <view class='city_select'>北京</view>
+    <view class='city_select'>{{city==null?'北京市':city}}</view>
     <view class='down'>
       <image src='/images/down.png'></image>
     </view>
@@ -22,6 +22,9 @@
       <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-image src='/images/map_center.png'></cover-image>
+      </cover-view>
     </map>
   </view>
   <view class="map_text" hover-class='active' wx:if="{{textData}}">
@@ -62,7 +65,7 @@
 </view>
 <view class='footer'>
   <view class='footer_1'>
-    <image src='/images/index.png'></image>
+    <image src='/images/index_selected.png'></image>
     <text class='selected'>首页</text>
   </view>
   <view class='footer_2' bindtap='click_scan_control'>

pages/index/index.wxss

@@ -102,8 +102,19 @@
 .map_location_hover{
   transform: scale(0.8, 0.8);
 }
-
-
+.map_center{
+  bottom:50%;
+  left: 50%;
+  /* margin-top:-32rpx; */
+  margin-left:-28rpx;
+  position: absolute;
+  width: 57rpx;
+  height: 65rpx;
+}
+.map_center cover-image{
+  width: 57rpx;
+  height: 65rpx;
+}
 .map_textdata_fast{
   background-color: #ffffff;
   position: absolute;
@@ -413,9 +424,11 @@ rich-text{
 }
 .footer_3 image{
   margin-top:15rpx;
-  margin-bottom:-10rpx;
-  width:32rpx;
-  height: 49rpx;
+  margin-bottom:-13rpx;
+  /* width:32rpx;
+  height: 49rpx; */
+  width:36rpx;
+  height: 52rpx;
 }
 .footer text{
   font-size: 20rpx;

pages/search_result/search_result.js

@@ -93,8 +93,8 @@ Page({
                 var marker = {
                   name: item.chargStationName,
                   address: item.address,
-                  width: "88rpx",
-                  height: "112rpx",
+                  width: "46rpx",
+                  height: "67rpx",
                   iconPath: "/images/marker.png",
                   id: item.id,
                   callout: {},
@@ -144,8 +144,8 @@ Page({
             var marker = {
               name: item.chargStationName,
               address: item.address,
-              width: "88rpx",
-              height: "112rpx",
+              width: "46rpx",
+              height: "67rpx",
               iconPath: "/images/marker.png",
               id: item.id,
               callout: {},
@@ -261,8 +261,8 @@ Page({
                 var marker = {
                   name: item.chargStationName,
                   address: item.address,
-                  width: "88rpx",
-                  height: "112rpx",
+                  width: "46rpx",
+                  height: "67rpx",
                   iconPath: "/images/marker.png",
                   id: item.id,
                   callout: {},
@@ -318,8 +318,8 @@ Page({
             var marker = {
               name: item.chargStationName,
               address: item.address,
-              width: "88rpx",
-              height: "112rpx",
+              width: "46rpx",
+              height: "67rpx",
               iconPath: "/images/marker.png",
               id: item.id,
               callout: {},

pages/ucenter/help/help.js

@@ -7,7 +7,11 @@ Page({
   data: {
 
   },
-
+  phoneCall(e) {
+    wx.makePhoneCall({
+      phoneNumber: getApp().globalData.helpPhoneNum
+    });
+  },
   /**
    * 生命周期函数--监听页面加载
    */

pages/ucenter/help/help.wxml

@@ -1,2 +1,77 @@
 <!--pages/ucenter/help/help.wxml-->
-<text>pages/ucenter/help/help.wxml</text>
+<view class="container1">
+  <view class="context">
+    <view class='context_view left' bindtap='phoneCall' hover-class='active'>
+      <image class='phone_service' src='/images/phone_service.png'></image>
+      <text>电话客服</text>
+    </view>
+    <view class='context_view' hover-class='active'>
+      <image class='online_service' src='/images/online_service.png'></image>
+      <text>在线客服</text>
+    </view>
+  </view>
+  <view class='title1'>
+    <text class='blod'>常见问题</text>
+  </view>
+  <view class='title2'>
+    <view class='coupon_info'>
+      <image class="coupon" src='/images/coupon.png'></image>
+      <text>优惠券</text>
+      <view>
+        <image class='down1' src='/images/down1.png'></image>
+      </view>
+    </view>
+  </view>
+</view>
+<view class='title3'>
+  <text>优惠券无法使用</text>
+  <text>优惠券是否可以开发票</text>
+</view>
+<view class='title2'>
+  <view class="payment_info">
+    <image class="payment" src='/images/payment.png'></image>
+    <text>支付相关</text>
+    <view>
+      <image class='down1' src='/images/down1.png'></image>
+    </view>
+  </view>
+</view>
+<view class='title3'>
+  <text>重复支付费用</text>
+  <text>订单无法支付</text>
+</view>
+<view class='title2'>
+  <view class="invoice_info">
+    <image class="invoice" src='/images/invoice.png'></image>
+    <text>发票相关</text>
+    <view>
+      <image class='down1' src='/images/down1.png'></image>
+    </view>
+  </view>
+</view>
+<view class='title3'>
+  <text>发票多久寄出</text>
+  <text>纸质发票可以开吗</text>
+</view>
+<view class='title2'>
+  <view class="question_info">
+    <image class="question" src='/images/question.png'></image>
+    <text>软件问题</text>
+    <view>
+      <image class='down1' src='/images/down1.png'></image>
+    </view>
+  </view>
+</view>
+<view class='title3'>
+  <text>如何投诉</text>
+  <!-- <text></text> -->
+</view>
+<view class='title2'>
+  <view class="advice_info">
+    <image class="advice" src='/images/advice.png'></image>
+    <text>意见反馈</text>
+    <view>
+      <image class='down1' src='/images/down1.png'></image>
+    </view>
+  </view>
+</view>

pages/ucenter/help/help.wxss

@@ -1 +1,159 @@
-/* pages/ucenter/help/help.wxss */
+/* pages/ucenter/help/help.wxss */
+page {
+  height: 100%;
+  width: 100%;
+  /* background: #f4f4f4; */
+  
+}
+
+.container1 {
+  /* background: #f4f4f4; */
+  height: auto;
+  overflow: hidden;
+  width: 100%;
+  
+}
+
+.context{
+  background: #fff;
+  /* margin-top: 60rpx; */
+  height: 225rpx;
+  width: 100%;
+  text-align: center;
+  min-height: 178rpx;
+  font-family: 'Lucida Sans',
+                 'Lucida Sans Regular',
+                 'Lucida Grande',
+                 'Lucida Sans Unicode',
+                 Geneva,
+                 Verdana,
+                 sans-serif;
+  font-size: 24rpx;
+  color: #434343;
+  box-shadow: 0rpx 6rpx 6rpx #f5f5f5 inset;
+  border-bottom: 2rpx solid #f1f1f1;
+}
+.context_view {
+  width: calc(50% - 2rpx);
+  margin: 30rpx 0 0rpx 0rpx;
+  display: inline-block;
+}
+.context_view.left {
+  border-right: 2rpx solid #f1f1f1;
+}
+.context_view.active{
+  background-color: #fafafa;
+}
+
+.context_view image {
+  /* margin: 28rpx 0 10rpx 0; */
+  width: 116rpx;
+  height: 113rpx;
+  flex-shrink: 0;
+  overflow: hidden;
+}
+.context text {
+  display: block;
+  font-size: 32rpx;
+  font-weight: bold;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+  line-height: 40rpx;
+  height: 40rpx;
+  min-height: 40rpx;
+  margin-top: 10rpx;
+}
+text {
+  font-size: 34rpx;
+  font-family: 'Lucida Sans',
+                 'Lucida Sans Regular',
+                 'Lucida Grande',
+                 'Lucida Sans Unicode',
+                 Geneva,
+                 Verdana,
+                 sans-serif;
+  color: #040404;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+  line-height: 140rpx;
+  height: 140rpx;
+  min-height: 140rpx;
+}
+.title1{
+  margin:40rpx 32rpx 0rpx 42rpx; 
+  border-bottom: 2rpx solid #f1f1f1;
+}
+.title1 text{
+  font-size:28rpx;
+  color: #999999;
+  height: 68rpx;
+  line-height: 68rpx;
+  min-height: 68rpx;
+  display: block;
+}
+
+.title2{
+  margin:30rpx 32rpx 0rpx 42rpx; 
+}
+.title2 view{
+  height: 68rpx;
+}
+image.down1{
+  width: 20rpx;
+  height: 12rpx;
+}
+
+image.coupon{
+  width: 37rpx;
+  height: 31rpx;
+  margin: 18rpx 40rpx 19rpx 0rpx;
+}
+image.payment{
+  width: 43rpx;
+  height: 37rpx;
+  margin: 12rpx 34rpx 19rpx 0rpx;
+}
+image.invoice{
+  width: 37rpx;
+  height: 33rpx;
+  margin: 16rpx 40rpx 19rpx 0rpx;
+}
+image.question{
+  width: 36rpx;
+  height: 35rpx;
+  margin: 14rpx 41rpx 19rpx 0rpx;
+}
+image.advice{
+  width: 33rpx;
+  height: 35rpx;
+  margin: 14rpx 44rpx 19rpx 0rpx;
+}
+.coupon_info text,.payment_info text,.invoice_info text,.question_info text,.advice_info text{
+  display: inline-block;
+  font-weight: bold;
+  font-size:30rpx;
+  height: 68rpx;
+  line-height: 68rpx;
+  min-height: 68rpx;
+}
+.coupon_info view,.payment_info view,.invoice_info view,.question_info view,.advice_info view{
+  height: 68rpx;
+  line-height: 68rpx;
+  min-height: 68rpx;
+  float: right;
+}
+.title3 {
+  margin-left:120rpx;
+  padding-bottom: 32rpx;
+  border-bottom: 2rpx solid #f1f1f1;
+}
+.title3 text{
+  font-size:24rpx;
+  color: #999999;
+  height: 56rpx;
+  line-height: 56rpx;
+  min-height: 56rpx;
+  display: block;
+}

pages/ucenter/index/index.js

@@ -185,7 +185,10 @@ Page({
     //     console.log(res);                                  //失败
     //   }
     // });
-
+    let url = '/pages/ucenter/help/help'
+    wx.navigateTo({
+      url
+    });
   },
   goNotice(){
     if (!this.data.isLogin) {

pages/ucenter/index/index.wxml

@@ -1,7 +1,4 @@
 <!--pages/ucenter/index/index.wxml-->
-<!-- <view class='title'>
-
-</view> -->
 <view class="container">
   <view class="user_text" bindtap='{{isLogin?"toUserCenter":"tologin"}}' hover-class='active'>
     <!--<open-data class="userAvatarUrl" bindtap="" type='userAvatarUrl'></open-data>-->
@@ -15,22 +12,24 @@
       <image src='/images/enter.png'></image>
     </view>
   </view>
-
+  <view class="banner">
+    <image src='/banner/banner1.png'></image>
+  </view>
   <view class="context">
     <view class='context_view' bindtap="goPurse" hover-class='active'>
-      <image class='chargemoney' src='/images/chargemoney.png'></image>
+      <image class='my_purse' src='/images/my_purse.png'></image>
       <text>我的钱包</text>
     </view>
     <view class='context_view' bindtap="goCharginglog" hover-class='active'>
-      <image class='relevance' src='/images/relevance.png'></image>
+      <image class='my_chargelog' src='/images/my_chargelog.png'></image>
       <text>充电记录</text>
     </view>
     <view class='context_view' hover-class='active'>
-      <image class='out' src='/images/out.png'></image>
+      <image class='my_cuppon' src='/images/my_cuppon.png'></image>
       <text>优惠券</text>
     </view>
     <view class='context_view' hover-class='active'>
-      <image class='exchange' src='/images/exchange.png'></image>
+      <image class='my_integral' src='/images/my_integral.png'></image>
       <text>积分中心</text>
     </view>
   </view>
@@ -86,7 +85,7 @@
           <image src='/images/enter.png'></image>
         </view>
       </view>
-       <view class="zan-cell" wx:if='{{userInfo.flag}}' hover-class="active" bindtap="goChargpileMonitor">
+      <view class="zan-cell" wx:if='{{userInfo.flag}}' hover-class="active" bindtap="goChargpileMonitor">
         <view class="zan-icon">
           <!-- <image src='/images/monitor.png'></image> -->
           <image src='/images/column.png'></image>
@@ -111,7 +110,7 @@
         </view>
       </view>
       <!-- 运维用户 -->
-     
+
       <view class="zan-cell" hover-class="active" bindtap="goNotice">
         <view class="zan-icon">
           <!-- <image src='/images/notice_icon.png'></image> -->
@@ -139,14 +138,22 @@
 
     </view>
   </view>
-  <view class="logout" hover-class="active" wx:if="{{isLogin}}" bindtap="logout">退出账号</view>
+  <!-- <view class="logout" hover-class="active" wx:if="{{isLogin}}" bindtap="logout">退出账号</view> -->
 </view>
 <!-- <view class='footer' bindtap='phoneCall'>
   <text class="h1">客服电话：18211188302</text>
   <text class="h1">工作时间：工作日 08:00-17:00</text>
 </view> -->
 <view class='footer'>
-  <view class='footer_1' bindtap="toindex"><image src='/images/index.png'></image><text class='selected'>首页</text></view>
-  <view class='footer_2' ><image src='/images/scan.png'>扫码充电</image></view>
-  <view class='footer_3' ><image src='/images/ucenter.png'></image><text>我的</text></view>
+  <view class='footer_1' bindtap="toindex">
+    <image src='/images/index.png'></image>
+    <text>首页</text>
+  </view>
+  <view class='footer_2'>
+    <image src='/images/scan.png'>扫码充电</image>
+  </view>
+  <view class='footer_3'>
+    <image src='/images/ucenter_selected.png'></image>
+    <text class='selected'>我的</text>
+  </view>
 </view>

pages/ucenter/index/index.wxss

@@ -102,8 +102,16 @@ text.bold {
   background: #fff;
   margin-top: 20rpx;
 }
-
-
+.banner{
+  height: 210rpx;
+  width: 100%;
+  background-color:#ffffff;
+}
+.banner image{
+  margin: 0rpx 30rpx 0rpx 30rpx;
+  width: 688rpx;
+  height: 200rpx;
+}
 .context{
   background: #fff;
   /* margin-top: 60rpx; */
@@ -132,31 +140,31 @@ text.bold {
   background-color: #fafafa;
 }
 
-image.chargemoney {
-  margin: 30rpx 0 20rpx 0;
-  width: 52rpx;
-  height: 52rpx;
+image.my_purse {
+  margin: 43rpx 0 20rpx 0;
+  width: 40rpx;
+  height: 39rpx;
   flex-shrink: 0;
   overflow: hidden;
 }
-image.relevance {
-  margin: 33rpx 0 20rpx 0;
-  width: 49rpx;
-  height: 49rpx;
+image.my_chargelog {
+  margin: 42rpx 0 20rpx 0;
+  width: 37rpx;
+  height: 40rpx;
   flex-shrink: 0;
   overflow: hidden;
 }
-image.out {
-  margin: 30rpx 0 20rpx 0;
-  width: 52rpx;
-  height: 52rpx;
+image.my_cuppon {
+  margin: 46rpx 0 20rpx 0;
+  width: 44rpx;
+  height: 36rpx;
   flex-shrink: 0;
   overflow: hidden;
 }
-image.exchange {
-  margin: 40rpx 0 20rpx 0;
-  width: 56rpx;
-  height: 42rpx;
+image.my_integral {
+  margin: 44rpx 0 20rpx 0;
+  width: 43rpx;
+  height: 38rpx;
   flex-shrink: 0;
   overflow: hidden;
 }
@@ -374,9 +382,11 @@ image.exchange {
 }
 .footer_3 image{
   margin-top:15rpx;
-  margin-bottom:-10rpx;
-  width:32rpx;
-  height: 49rpx;
+  margin-bottom:-13rpx;
+  /* width:32rpx;
+  height: 49rpx; */
+  width:36rpx;
+  height: 52rpx;
 }
 .footer text{
   font-size: 20rpx;

pages/ucenter/mychargestation/mychargestation.js

@@ -75,8 +75,8 @@ Page({
                 var marker = {
                   name: item.chargStationName,
                   address: item.address,
-                  width: "88rpx",
-                  height: "112rpx",
+                  width: "46rpx",
+                  height: "67rpx",
                   iconPath: "/images/marker.png",
                   id: item.id,
                   callout: {},

project.config.json

@@ -89,9 +89,17 @@
 					"scene": null
 				},
 				{
-					"id": -1,
+					"id": 7,
 					"name": "充电中",
 					"pathName": "pages/charging/charging",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "客服中心",
+					"pathName": "pages/ucenter/help/help",
+					"query": "",
 					"scene": null
 				}
 			]