替换提现，布局调整

pages/index/index.wxml

@@ -48,8 +48,9 @@
       <text class='inline border'>服务费：{{textData.serviceprice == null? '暂无服务费' : textData.serviceprice + ' 元/度'}}</text>
       <!-- <text class='inline border'>停车费：{{textData.stopprice}}元/小时</text> -->
     </view>
+    <view class='navigationTap' bindtap="getRoute"></view>
     <view class='navigation_info'>
-      <view class='navigation' bindtap="getRoute">
+      <view class='navigation'>
         <image src='/images/navigation.png'></image>
       </view>
       <text>{{textData.distance}}km</text>

pages/index/index.wxss

@@ -190,7 +190,7 @@
   width: 140rpx;
   height: 230rpx;
   margin:0;
-  padding-top: 70rpx;
+  padding-top: 100rpx;
   float: right;
 }
 .navigation {
@@ -200,6 +200,19 @@
   border-radius: 40rpx;
 }
 
+.navigationTap {
+  width: 90rpx;
+  height: 80rpx;
+  background-color: #66ccff;
+  border-radius: 40rpx;
+  padding: 30rpx;
+  position:absolute;
+  right: 20rpx;
+  bottom:20rpx;
+  z-index: 999;
+  opacity: 0;
+}
+
 .navigation image {
   width: 34rpx;
   height: 40rpx;

pages/login/username_login/username_login.wxml

@@ -11,7 +11,7 @@
       </view>
       <view class='input_view'>
         <image class='password_img' src='/images/password.png'></image>
-        <input placeholder='请输入您的密码' value="{{password}}" focus="{{passwordFocus}}" maxlength='16' bindinput='inputPassword'type='password' placeholder-class='placeholder'></input>
+        <input placeholder='请输入您的密码' value="{{password}}" focus="{{passwordFocus}}" maxlength='20' bindinput='inputPassword'type='password' placeholder-class='placeholder'></input>
       </view>
     </view>
     <!-- <view class="errorMsg"><text>{{errorMsg}}</text></view> -->

pages/outmoney/outmoney.json

@@ -1,4 +1,4 @@
 {
   "usingComponents": {},
-  "navigationBarTitleText": "余额转出"
+  "navigationBarTitleText": "提现"
 }

pages/outmoney/outmoney.wxml

@@ -1,7 +1,7 @@
 <!--pages/outmoney/outmoney.wxml-->
 <view class='money_input'>
   <text>提现金额（元）</text>
-  <input placeholder-class="section_phcolor" bindinput='outMoney' focus="true" type='digit' placeholder="请输入转出金额,不低于0.3元" />
+  <input placeholder-class="section_phcolor" bindinput='outMoney' focus="true" type='digit' placeholder="请输入提现金额,不低于0.3元" />
 </view>
 <view class="outmoney"><text>可用余额{{userInfo.repaidbalance}}元</text></view>
 <view class='money_input'>

pages/register/register.wxml

@@ -37,11 +37,11 @@
       </view> -->
       <view class='input_view'>
         <image class='password_img' src='/images/password.png'></image><div class="line"></div>
-        <input placeholder='请设置密码' maxlength='16' bindinput='inputPassword' type='password' placeholder-class='placeholder'></input>
+        <input placeholder='请设置密码' maxlength='20' bindinput='inputPassword' type='password' placeholder-class='placeholder'></input>
       </view>
       <view class='input_view'>
         <image class='password_img' src='/images/password.png'></image><div class="line"></div>
-        <input placeholder='请确认密码' maxlength='16' bindinput='inputRepassword' type='password' placeholder-class='placeholder'></input>
+        <input placeholder='请确认密码' maxlength='20' bindinput='inputRepassword' type='password' placeholder-class='placeholder'></input>
       </view>
     </view>
     <view class="errorMsg"><text wx:if="{{showMsg}}">{{errorMsg}}</text></view>

pages/reset_password/reset_password.wxml

@@ -8,11 +8,11 @@
       <view class="bindPhoneInfo"><text>绑定手机号：{{phone}}</text></view>
       <view class='input_view'>
         <image class='password_img' src='/images/password.png'></image>
-        <input placeholder='输入新密码' maxlength='16'  bindinput='inputPassword' type='password' placeholder-class='placeholder'></input>
+        <input placeholder='输入新密码' maxlength='20'  bindinput='inputPassword' type='password' placeholder-class='placeholder'></input>
       </view>
       <view class='input_view'>
         <image class='password_img' src='/images/password.png'></image>
-        <input placeholder='确认新密码' maxlength='16' bindinput='inputRepassword' type='password' placeholder-class='placeholder'></input>
+        <input placeholder='确认新密码' maxlength='20' bindinput='inputRepassword' type='password' placeholder-class='placeholder'></input>
       </view>
     </view>
     <view class="errorMsg"><text wx:if="{{showMsg}}">{{errorMsg}}</text></view>

pages/search_result/search_result.js

@@ -115,13 +115,24 @@ Page({
                   serviceprice: item.serviceprice,
                   /** 停车费 */
                   stopprice: item.stopprice,
-                  operationState: item.operationState
+                  operationState: item.operationState,
+                  sharpChargPrice : item.sharpChargPrice,
+                  sharpServicePrice : item.sharpServicePrice,
+                  peakChargPrice : item.peakChargPrice,
+                  peakServicePrice : item.peakServicePrice,
+                  flatChargPrice : item.flatChargPrice,
+                  flatServicePrice : item.flatServicePrice,
+                  valleyChargPrice : item.valleyChargPrice,
+                  valleyServicePrice : item.valleyServicePrice
+
+
                 };
                 if (myChargeStationsIds.indexOf(item.id + ',') != -1) {
                   marker.userFlag = true;
                 } else {
                   marker.userFlag = false;
                 }
+                
                 markers[index] = marker;
 
               });
@@ -166,7 +177,15 @@ Page({
               serviceprice: item.serviceprice,
               /** 停车费 */
               stopprice: item.stopprice,
-              operationState: item.operationState
+              operationState: item.operationState,
+              sharpChargPrice : item.sharpChargPrice,
+              sharpServicePrice : item.sharpServicePrice,
+              peakChargPrice : item.peakChargPrice,
+              peakServicePrice : item.peakServicePrice,
+              flatChargPrice : item.flatChargPrice,
+              flatServicePrice : item.flatServicePrice,
+              valleyChargPrice : item.valleyChargPrice,
+              valleyServicePrice : item.valleyServicePrice
             };
             markers[index] = marker;
           });
@@ -252,6 +271,8 @@ Page({
               } = res;
               let markers = [];
               data.forEach((item, index) => {
+                console.log("itemitemitemitemitem");
+                console.log(item);
                 //item.callout = {
                 // content: item.name, //文本	String	1.2.0
                 //  display: 'BYCLICK', //'BYCLICK': 点击显示; 'ALWAYS': 常显	String	1.2.0
@@ -317,6 +338,7 @@ Page({
           } = res;
           let markers = [];
           data.forEach((item, index) => {
+            console.log("itemitemitemitemitem");
             //item.callout = {
             // content: item.name, //文本	String	1.2.0
             //  display: 'BYCLICK', //'BYCLICK': 点击显示; 'ALWAYS': 常显	String	1.2.0
@@ -419,6 +441,14 @@ Page({
           keywords: this.data.keywords,
           textData: item
         });
+        console.info({
+          markers,
+          markerId,
+          latitude,
+          longitude,
+          keywords: this.data.keywords,
+          textData: item
+        })
 
         wx.navigateBack({
           delta: pages.length

pages/ucenter/accountsecurity/mdfpassword/mdfpassword.wxml

@@ -5,11 +5,11 @@
     <view class='context_input'>
       <view class='input_view'>
         <image class='password_img' src='/images/password.png'></image>
-        <input placeholder='输入新密码' maxlength='16'  bindinput='inputPassword' type='password' placeholder-class='placeholder'></input>
+        <input placeholder='输入新密码' maxlength='20'  bindinput='inputPassword' type='password' placeholder-class='placeholder'></input>
       </view>
       <view class='input_view'>
         <image class='password_img' src='/images/password.png'></image>
-        <input placeholder='确认新密码' maxlength='16' bindinput='inputRepassword' type='password' placeholder-class='placeholder'></input>
+        <input placeholder='确认新密码' maxlength='20' bindinput='inputRepassword' type='password' placeholder-class='placeholder'></input>
       </view>
     </view>
     <view class="errorMsg"><text wx:if="{{showMsg}}">{{errorMsg}}</text></view>