Browse Source

界面改版第三次上传

yinzhipeng 4 years ago
parent
commit
00766d3912

+ 2 - 2
app.json

@@ -29,9 +29,9 @@
     "pages/ucenter/notice/notice",
     "pages/ucenter/notice_info/notice_info",
     "pages/ucenter/chargpilemonitor/chargpilemonitor",
-    "pages/ucenter/chargpilemonitor/chargpilemonitorsearch"
+    "pages/ucenter/chargpilemonitor/chargpilemonitorsearch",
+    "pages/chargemoneyresult/chargemoneyresult"
   ],
-
   "window": {
     "backgroundTextStyle": "light",
     "navigationBarBackgroundColor": "#ffffff",

BIN
images/alipay.png


BIN
images/chargemoney1.png


BIN
images/chargemoney_succ.png


BIN
images/down.png


BIN
images/wechat.png


+ 9 - 5
pages/chargemoney/chargemoney.js

@@ -6,7 +6,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-    chargemoney_select: null,
+    chargemoney_select: 1000,
     userInfo: {},
     isLogin: false
   },
@@ -98,10 +98,14 @@ Page({
                         } = res3;
                         log.info('[充值]', '[微信支付回调]', '[响应]', data);
                         if (data && data.code == 200) {
-                          wx.showModal({
-                            showCancel: false,
-                            content: '充值成功'
-                          });
+                          // wx.showModal({
+                          //   showCancel: false,
+                          //   content: '充值成功'
+                          // });
+                          let url = `/pages/chargemoneyresult/chargemoneyresult?timeStamp=${res1.data.timeStamp}&money=${that.data.chargemoney_select}`;
+                          wx.redirectTo({
+                            url
+                          })
                           log.info('[充值]', '[微信支付回调]', '[成功]');
                         } else {
                           wx.showModal({

+ 41 - 33
pages/chargemoney/chargemoney.wxml

@@ -1,43 +1,51 @@
+
 <!--pages/chargemoney/chargemoney.wxml-->
-<view id='50' class="{{chargemoney_select==50?'chargemoney_select':'chargemoney'}}" bindtap='bindMoneyTap' hover-class='active'>
-  <image src='/images/chargemoney{{chargemoney_select==50?2:1}}.png'></image>
-  <view>
-    <text>50元</text>
+<view class="money">
+  <view class='title'><text class='blod'>充值金额</text></view>
+  <view id='1000' class="{{chargemoney_select==1000?'chargemoney_select':'chargemoney'}}" bindtap='bindMoneyTap' hover-class='active'>
+    <image wx:if='{{chargemoney_select!=1000}}' src='/images/chargemoney1.png'></image>
+    <view>
+      <text>充1000元</text>
+    </view>
   </view>
-</view>
-<view id='100' class="{{chargemoney_select==100?'chargemoney_select':'chargemoney'}}" bindtap='bindMoneyTap' hover-class='active'>
-  <image src='/images/chargemoney{{chargemoney_select==100?2:1}}.png'></image>
-  <view>
-    <text>100元</text>
+  <view id='500' class="{{chargemoney_select==500?'chargemoney_select':'chargemoney'}}" bindtap='bindMoneyTap' hover-class='active'>
+    <image wx:if='{{chargemoney_select!=500}}' src='/images/chargemoney1.png'></image>
+    <view>
+      <text>充500元</text>
+    </view>
   </view>
-</view>
-<view id='200' class="{{chargemoney_select==200?'chargemoney_select':'chargemoney'}}" bindtap='bindMoneyTap' hover-class='active'>
-  <image src='/images/chargemoney{{chargemoney_select==200?2:1}}.png'></image>
-  <view>
-    <text>200元</text>
+  <view id='300' class="{{chargemoney_select==300?'chargemoney_select':'chargemoney'}}" bindtap='bindMoneyTap' hover-class='active'>
+    <image wx:if='{{chargemoney_select!=300}}' src='/images/chargemoney1.png'></image>
+    <view>
+      <text>充300元</text>
+    </view>
   </view>
-</view>
-<view id='500' class="{{chargemoney_select==500?'chargemoney_select':'chargemoney'}}" bindtap='bindMoneyTap' hover-class='active'>
-  <image src='/images/chargemoney{{chargemoney_select==500?2:1}}.png'></image>
-  <view>
-    <text>500元</text>
+  <view id='100' class="{{chargemoney_select==100?'chargemoney_select':'chargemoney'}}" bindtap='bindMoneyTap' hover-class='active'>
+    <image wx:if='{{chargemoney_select!=100}}' src='/images/chargemoney1.png'></image>
+    <view>
+      <text>充100元</text>
+    </view>
   </view>
-</view>
-<view id='800' class="{{chargemoney_select==800?'chargemoney_select':'chargemoney'}}" bindtap='bindMoneyTap' hover-class='active'>
-  <image src='/images/chargemoney{{chargemoney_select==800?2:1}}.png'></image>
-  <view>
-    <text>800元</text>
-  </view>
-</view>
-<view id='1000' class="{{chargemoney_select==1000?'chargemoney_select':'chargemoney'}}" bindtap='bindMoneyTap' hover-class='active'>
-  <image src='/images/chargemoney{{chargemoney_select==1000?2:1}}.png'></image>
-  <view>
-    <text>1000元</text>
+  <view class='title1'><text class='blod'>选择支付方式</text></view>
+  <view class='title2'>
+    <view class='alipay' >
+      <image src='/images/alipay.png'></image>
+      <text>支付宝支付</text>
+      <view><radio color="#00a8dc" disabled="true" /></view>
+    </view>
+    <view class="wechat" >
+      <image src='/images/wechat.png'></image>
+      <text>微信支付</text>
+      <view><radio color="#00a8dc" checked="true"/></view>
+    </view>
   </view>
+  
 </view>
 
-<view class='money_input'>
+
+<!-- <view class='money_input'>
   <text>金额(元)</text>
   <input value='{{chargemoney_select}}' placeholder-class="section_phcolor" bindinput='saveMoney' type='number' placeholder="请输入充值金额" />
-</view>
-<button class='chargemoney_button' bindtap="beginChargemoney">立即充值(跳转微信支付)</button>
+</view> -->
+<button class='chargemoney_button' bindtap="beginChargemoney">立即充值(跳转微信支付)</button>
+<view class="foot"><text>点击立即充值即表示同意</text><text class='blue'>充值协议</text></view>

+ 91 - 58
pages/chargemoney/chargemoney.wxss

@@ -1,11 +1,20 @@
 /* pages/chargemoney/chargemoney.wxss */
+page{
+  box-shadow: 0rpx 6rpx 6rpx  #f5f5f5 inset;
+}
+.money{
+  padding:0 15rpx;
+}
+.money .title{
+  padding:40rpx 15rpx 0rpx 15rpx;
+}
 
 .chargemoney {
   display: inline-block;
   position: relative;
-  width: 148rpx;
-  height: 77rpx;
-  margin: 50rpx 51rpx 0 51rpx;
+  width: 330rpx;
+  height: 140rpx;
+  margin: 30rpx 15rpx 0 15rpx;
   flex-shrink: 0;
   overflow: hidden;
 }
@@ -13,31 +22,34 @@
 .chargemoney_select {
   display: inline-block;
   position: relative;
-  width: 148rpx;
-  height: 77rpx;
-  margin: 50rpx 51rpx 0 51rpx;
+  width: 330rpx;
+  height: 140rpx;
+  margin: 30rpx 15rpx 0 15rpx;
   flex-shrink: 0;
   overflow: hidden;
+  background-color: #00a8dc;
+  border-radius: 20rpx;
+  box-shadow: 0rpx 6rpx 8rpx #4768f3;
 }
 
-.chargemoney image, .chargemoney_select image {
-  width: 147rpx;
-  height: 77rpx;
+.chargemoney image {
+  width: 330rpx;
+  height: 140rpx;
 }
 
 .chargemoney view, .chargemoney_select view {
   position: absolute;
   top: 0;
   left: 0;
-  width: 148rpx;
-  height: 77rpx;
+  width: 330rpx;
+  height: 140rpx;
   flex-shrink: 0;
   overflow: hidden;
   text-align: center;
 }
 
 text {
-  font-size: 32rpx;
+  font-size: 34rpx;
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
                  'Lucida Grande',
@@ -45,68 +57,62 @@ text {
                  Geneva,
                  Verdana,
                  sans-serif;
-  color: #959595;
+  color: #434343;
   text-overflow: ellipsis;
   white-space: nowrap;
   overflow: hidden;
-  line-height: 77rpx;
-  height: 77rpx;
-  min-height: 77rpx;
+  line-height: 140rpx;
+  height: 140rpx;
+  min-height: 140rpx;
+}
+text.blod {
+  font-weight: bold;
+  /* padding-left: 15rpx; */
+  line-height: 54rpx;
+  height: 54rpx;
+  min-height: 54rpx;
 }
 
 .chargemoney_select text {
-  color: red;
+  color: #ffffff;
 }
 
-.active {
-  background-color: #ebebeb;
+.money .title1{
+  padding:60rpx 15rpx 0rpx 15rpx;
 }
-
-.money_input {
-  margin: 51rpx 30rpx;
-  padding: 0 21rpx;
-  border-top: 1rpx solid #f7f7f7;
-  border-bottom: 1rpx solid #f7f7f7;
+.money .title2{
+  padding:25rpx 15rpx 0rpx 15rpx;
 }
-
-.section_phcolor {
-  font-size: 28rpx;
-  line-height: 100rpx;
-  height: 100rpx;
-  min-height: 100rpx;
-  color: #aaaaaa;
+.money .title2 view{
+  height: 114rpx;
 }
-
-.money_input {
-  line-height: 100rpx;
-  height: 100rpx;
-  min-height: 100rpx;
+.alipay image,.wechat image{
+  width: 44rpx;
+  height: 44rpx;
+  margin: 35rpx 20rpx 35rpx 0rpx;
 }
-
-.money_input text {
+.alipay text,.wechat text{
   display: inline-block;
-  color: #434343;
-  line-height: 100rpx;
-  height: 100rpx;
-  min-height: 100rpx;
+  line-height: 114rpx;
+  height: 114rpx;
+  min-height: 114rpx;
 }
-
-.money_input input {
-  padding: 0 20rpx;
-  display: inline-block;
-  width: 450rpx;
-  height: 100rpx;
-  line-height: 100rpx;
-  min-height: 100rpx;
-  color: #aaaaaa;
-  font-size: 28rpx;
+.alipay view,.wechat view{
+  line-height: 114rpx;
+  height: 114rpx;
+  min-height: 114rpx;
+  float: right;
+}
+radio{
+  color: #00a8dc;
 }
+
 .chargemoney_button{
   position: absolute;
   bottom: 0;
-  width: calc(100% - 60rpx);
-  font-size: 32rpx;
-  margin: 50rpx 30rpx;
+  width: calc(100% - 170rpx);
+  font-size: 34rpx;
+  margin: 90rpx 85rpx;
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
                  'Lucida Grande',
@@ -117,8 +123,35 @@ text {
   color: #ffffff;
   text-overflow: ellipsis;
   white-space: nowrap;
-  background-color: #1cb03f;
+  background-color: #00a8dc;
+  border-radius: 40rpx;
 }
 .chargemoney_button.button-hover{
-  background-color: #1ca05e;
+  background-color: #00a9dcb4;
+}
+
+.foot{
+  position: absolute;
+  bottom: 0;
+  text-align: center;
+  width: 100%;
+}
+.foot text{
+  font-size: 28rpx;
+  font-family: 'Lucida Sans',
+                 'Lucida Sans Regular',
+                 'Lucida Grande',
+                 'Lucida Sans Unicode',
+                 Geneva,
+                 Verdana,
+                 sans-serif;
+  color: #434343;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  line-height: 90rpx;
+  height: 90rpx;
+  min-height: 90rpx;
+}
+text.blue{
+  color:#00a8dc;
 }

+ 111 - 0
pages/chargemoneyresult/chargemoneyresult.js

@@ -0,0 +1,111 @@
+// pages/chargemoneyresult/chargemoneyresult.js
+let Util = require("../../utils/util");
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    timeStamp:null,
+    money:null
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    var{
+      timeStamp,
+      money
+    }=options;
+    var startDate = new Date();
+    startDate.setTime(timeStamp*1000);
+    //console.log(startDate);
+    var timeStamp = startDate.getFullYear()+ '年' +Util.formatNumber(startDate.getMonth() + 1) + '月' + Util.formatNumber(startDate.getDate()) + '日  ' + Util.formatNumber(startDate.getHours()) + ':' + Util.formatNumber(startDate.getMinutes()) + ':' + Util.formatNumber(startDate.getSeconds());
+    this.setData({
+      timeStamp,
+      money
+    });
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+  * 生命周期函数--监听页面显示
+  */
+  onShow: function () {
+    let userInfo = wx.getStorageSync('userInfo');
+    let isLogin = wx.getStorageSync('isLogin');
+    let that = this;
+    wx.request({
+      url: getApp().globalData.postHeadAgreement + '/restapi/wechat/syncUser',
+      data: {
+        loginName: userInfo.loginName
+      },
+      method: 'POST',
+      success: function (res) {
+        let {
+          data
+        } = res;
+        if (data.code && data.code != 200) {
+          wx.removeStorageSync('userInfo');
+          wx.removeStorageSync('isLogin');
+          let url = '/pages/login/login';
+          wx.redirectTo({
+            url,
+          });
+        } else {
+          that.setData({
+            userInfo: data,
+            isLogin: true
+          });
+          wx.setStorageSync('userInfo', data);
+          wx.setStorageSync('isLogin', true);
+        }
+      },
+      fail(e) {
+        console.log("用户数据同步失败");
+      }
+    });
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

+ 5 - 0
pages/chargemoneyresult/chargemoneyresult.json

@@ -0,0 +1,5 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText": "充值成功"
+
+}

+ 23 - 0
pages/chargemoneyresult/chargemoneyresult.wxml

@@ -0,0 +1,23 @@
+
+<view class='context'>
+  <view class="chargemoney_succ"><image class="chargemoney_succ_image" src="/images/chargemoney_succ.png"></image></view>
+  <view class='context_time'>
+    <text class="info">充值成功!</text>
+    <text class="time">{{timeStamp}}</text>
+  </view>
+  <view class='context_result'>
+    <view>
+      <text>本次充值</text>
+      <text class='inline'>{{money}}元</text>
+    </view>
+    <view>
+      <text>可用余额</text>
+      <text  class='inline'>{{userInfo.repaidbalance}}元</text>
+    </view>
+    <view>
+      <text>付款方式</text>
+      <text  class='inline'>微信支付</text>
+    </view>
+  </view>
+</view>
+

+ 79 - 0
pages/chargemoneyresult/chargemoneyresult.wxss

@@ -0,0 +1,79 @@
+.chargemoney_succ{
+  margin: 0rpx 310rpx;
+}
+.chargemoney_succ_image {
+  height: 130rpx;
+  width: 130rpx;
+  margin-top: 76rpx;
+}
+.context {
+  height: 100%;
+  width: 100%;
+  position: absolute;
+  top: 0;
+  left: 0;
+  box-shadow: 0rpx 6rpx 6rpx  #f5f5f5 inset;
+}
+text {
+  display: block;
+  font-size: 24rpx;
+  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: 24rpx;
+  height: 24rpx;
+  min-height: 24rpx;
+}
+
+.context_time  {
+  margin-top: 32rpx;
+  /* margin-right: 32rpx;
+  margin-left: 32rpx; */
+  margin-bottom: 96rpx;
+  text-align: center; 
+}
+.context_time .info{
+  color: #00aadd;
+  font-size: 34rpx;
+  line-height: 34rpx;
+  height: 34rpx;
+  min-height: 34rpx;
+}
+.context_time .time{
+  margin-top: 24rpx;
+  color: #00aadd;
+  font-size: 24rpx;
+  line-height: 24rpx;
+  height: 24rpx;
+  min-height: 24rpx;
+}
+.context_result {
+  margin: 0rpx 40rpx;
+  padding: 12rpx 32rpx;
+  background-color: #f5f5f5;
+  border-radius: 10rpx;
+}
+.context_result view {
+  line-height: 64rpx;
+  height: 64rpx;
+  min-height: 64rpx;
+}
+.context_result text {
+  display: inline-block;
+  color: #959595;
+}
+.context_result .inline {
+  color: #434343;
+  padding-left: 40rpx;
+}
+
+
+

+ 1 - 1
pages/index/index.js

@@ -62,7 +62,7 @@ Page({
         latitude: 31.1,
         longitude: 131
       }]
-
+      
     }],
     showModal: false,
     notice: null

+ 15 - 8
pages/index/index.wxml

@@ -1,22 +1,29 @@
 <view class='container'>
   <view class="section">
-    <view class="userAvatarUrl" bindtap="bindUserAvatarUrl">
-      <!-- <open-data type='userAvatarUrl'></open-data> -->
-      <image src='{{isLogin?!userInfo.flag?userInfo.avatar:"/images/userhead.png":"/images/user.png"}}'></image>
+    <view class='input' bindtap="bindInput">
+      <image src='/images/search.png'></image>
+      <text>{{keywords}}</text>
+    </view>
+    <view class='city_select'>北京</view>
+    <view class='down'>
+     <image src='/images/down.png'></image>
     </view>
-    <!-- <input bindtouchstart="bindInput" placeholder="搜索位置查找附近的充电桩" value="{{keywords.name}}" /> -->
-    <!-- <input bindtouchstart="bindInput" placeholder="搜索充电桩" value="{{keywords}}" /> -->
-    <view class='input' bindtap="bindInput">{{keywords}}</view>
   </view>
   <view class="{{textData.name?userInfo.flag?'map_container1':'map_container':'map_container_big'}}">
     <map class="map" id="map" longitude="{{longitude}}" latitude="{{latitude}}" scale="16" show-location="true" markers="{{markers}}" bindmarkertap="makertap" bindregionchange="mapchange" polygon="{{polygon}}">
-      <view class='map_distance'>
+      <!-- <view class='map_distance'>
         <picker class="picker" bindchange="bindDistanceinfoChange" value="{{distanceinfoindex}}" range-key="text" range="{{distanceinfo}}">
           <text>距离{{distanceinfo[distanceinfoindex].text}}</text>
         </picker>
+      </view> -->
+      <view wx:if="{{textData}}" class='map_textdata_fast'>
+          <text decode="true">●&nbsp;快充&nbsp;{{textData.fastfreenum==null?0:textData.fastfreenum}}/</text><text style='color:#969696;'>{{textData.fastCharg==null?0:textData.fastCharg}}</text>
+      </view>
+      <view wx:if="{{textData}}" class='map_textdata_slow'>
+          <text decode="true">●&nbsp;慢充&nbsp;{{textData.slowfreenum==null?0:textData.slowfreenum}}/</text><text  style='color:#969696;'>{{textData.slowCharg==null?0:textData.slowCharg}}</text>
       </view>
       <cover-view class='map_location' bindtap='click_location_control' hover-class='map_location_hover'>
-        <cover-image class="circle1_1" src='/images/circle1_1.png'></cover-image>
+        <!-- <cover-image class="circle1_1" src='/images/circle1_1.png'></cover-image> -->
         <cover-image class='circle1' src='/images/circle1.png'></cover-image>
       </cover-view>
       <!-- <cover-view class='map_scan' wx:if="{{!userInfo.flag}}" bindtap='click_scan_control'  hover-class='map_scan_hover'>

+ 104 - 34
pages/index/index.wxss

@@ -1,29 +1,15 @@
 .section {
-  height: 89rpx;
+  height: 100rpx;
   width: 100%;
   display: flex;
 }
 
-.userAvatarUrl {
-  flex-shrink: 0;
-  height: 66rpx;
-  width: 66rpx;
-  border-radius: 50%;
-  margin: 11rpx;
-  overflow: hidden;
-}
-
-.userAvatarUrl image {
-  height: 66rpx;
-  width: 66rpx;
-}
-
 .section .input {
   width: 100%;
-  margin: 24rpx auto;
-  height: 40rpx;
-  min-height: 40rpx;
-  line-height: 40rpx;
+  /* margin: 24rpx auto; */
+  height: 60rpx;
+  min-height: 60rpx;
+  line-height: 60rpx;
   font-size: 28rpx;
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
@@ -33,10 +19,47 @@
                  Verdana,
                  sans-serif;
   color: #a0a0a0;
-  padding: 0 30rpx;
-  border-left: 1rpx solid #dfdfdf;
+  margin: 0 40rpx;
+  background-color: #f2f2f2;
+  border-radius: 30rpx;
+}
+.input image {
+  margin: 10rpx auto;
+  height: 40rpx;
+  width: 40rpx;
+  padding: 0 20rpx;
+}
+.input text {
+  display: inline-block;
+  height: 60rpx;
+  min-height: 60rpx;
+  line-height: 60rpx;
+  margin: 0;
+  color: #aeaeae;
+}
+.section .city_select {
+  flex-shrink: 0;
+  /* margin: 24rpx auto; */
+  height: 60rpx;
+  min-height: 60rpx;
+  line-height: 60rpx;
+  font-size: 28rpx;
+  font-family: 'Lucida Sans',
+                 'Lucida Sans Regular',
+                 'Lucida Grande',
+                 'Lucida Sans Unicode',
+                 Geneva,
+                 Verdana,
+                 sans-serif;
+  color: #333333;
+  padding: 0;
+}
+.down image {
+  margin: 24rpx auto;
+  height: 12rpx;
+  width: 24rpx;
+  padding: 0 40rpx 0 10rpx;
 }
-
 .map_container {
   position: absolute;
   top: 89rpx;
@@ -48,6 +71,7 @@
   position: absolute;
   top: 89rpx;
   bottom: 290rpx;
+  /* bottom: 385rpx; */
   left: 0;
   right: 0;
 }
@@ -67,24 +91,26 @@
 
 .map_location {
   position: absolute;
-  left: 30rpx;
-  bottom: 110rpx;
+  /* left: 30rpx;
+  bottom: 110rpx; */
+  right: 32rpx;
+  top: 160rpx;
   width: 86rpx;
   height: 86rpx;
   z-index:999;
+  background-color: #ffffff;
+  border-radius: 43rpx;
 }
 .map_location .circle1 {
   width: 38rpx;
   height: 38rpx;
   display:block;
-  position: absolute;
   margin: 24rpx;
 }
 .map_location .circle1_1 {
   width: 86rpx;
   height: 86rpx;
   display:block;
-  position: absolute;
 }
 
 .map_location_hover{
@@ -104,12 +130,57 @@
   width: 168rpx;
   height: 64rpx;
 }*/
+
+.map_textdata_fast{
+  background-color: #ffffff;
+  position: absolute;
+  /* left: 30rpx;
+  bottom: 110rpx; */
+  right: 32rpx;
+  top: 30rpx;
+  /* width: 86rpx; */
+  height: 40rpx;
+  z-index:999;
+  border-radius: 12rpx;
+  min-height: 40rpx;
+  padding-right: 18rpx;
+  padding-left: 15rpx;
+}
+.map_textdata_slow{
+  background-color: #ffffff;
+  position: absolute;
+  /* left: 30rpx;
+  bottom: 110rpx; */
+  right: 32rpx;
+  top: 90rpx;
+  /* width: 86rpx; */
+  height: 40rpx;
+  z-index:999;
+  border-radius: 12rpx;
+  min-height: 40rpx;
+  padding-right: 18rpx;
+  padding-left: 15rpx;
+}
+.map_textdata_fast text,.map_textdata_slow text{
+  display: inline-block;
+  height: 40rpx;
+  line-height: 40rpx;
+  min-height: 40rpx;
+  font-size:24rpx;
+  margin: 0;
+}
+.map_textdata_fast text{
+  color: #35b2ab;
+}
+.map_textdata_slow text{
+  color: #da8527;
+}
 .map_text {
   position: absolute;
   left: 0;
   right: 0;
-  bottom: 0px;
-  height: 325rpx;
+  bottom: 95rpx;
+  height: 230rpx;
   background: #fff;
   padding: 0 30rpx;
 }
@@ -117,8 +188,8 @@
   position: absolute;
   left: 0;
   right: 0;
-  bottom: 0px;
-  height: 290rpx;
+  bottom: 95rpx;
+  height: 195rpx;
   background: #fff;
   padding: 0 30rpx;
 }
@@ -244,12 +315,11 @@ text.red {
 }
 */
 
-.picker{
+/* .picker{
   text-align: right;
   position: absolute;
   left: 30rpx;
-  top: 30rpx;
-  
+  top: 30rpx;  
 }
 .picker text{
   color: #545253;
@@ -257,7 +327,7 @@ text.red {
   padding: 4rpx 10rpx 4rpx 10rpx;
   border:solid 2rpx #545253;
   border-radius: 8rpx;
-}
+} */
 
 /* 通知相关 begin */
 .modal_box {

+ 7 - 0
project.config.json

@@ -80,6 +80,13 @@
 					"pathName": "pages/ucenter/chargemoneylog/chargemoneylog",
 					"query": "",
 					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "充值",
+					"pathName": "pages/chargemoney/chargemoney",
+					"query": "",
+					"scene": null
 				}
 			]
 		}