Merge branch 'master' of http://47.92.161.104:10080/zkx/JP-ChargeTeam51

# Conflicts:
#	pages/user/finance/rechargeDet.vue

pages/record/index.vue

@@ -26,7 +26,7 @@
 					</view>
 					<view class="recordList-row">
 						<p>充电时长：{{item.chargingMinute != null ? item.chargingMinute+'分' : '00分00秒'}}</p>
-						<h4>{{item.actualFee != null ? item.actualFee : '0.00'}}</h4>
+						<h4>{{item.actualFee != null ? item.actualFee : '0.00'}}元</h4>
 					</view>
 				</view>
 			</view>

pages/searchPile/stationAndPile/stationDetailsMap.vue

@@ -471,7 +471,10 @@
 		text-align: center;
 		justify-content: center;
 		align-items: center;
-		width: 250rpx;
+		@include themeify{
+			width: themed('buttonWidth');
+		}
+/*		width: 250rpx;*/
 		display: flex;
 		flex-direction: row;
 	}

pages/user/finance/balance.vue

@@ -23,8 +23,8 @@
 						<view class="balanceCard-btn" @click="rechargeNow">立即充值</view>
 					</view>
 					<view class="balanceCard-foot">
-						<view class="balanceCard-item" v-if="personAccount.totalAmount != null">可用余额{{personAccount.totalAmount.toFixed(2)}}</view>
-						<view class="balanceCard-item" v-if="personAccount.frozenTotal != null">冻结金额{{personAccount.frozenTotal.toFixed(2)}}</view>
+						<view class="balanceCard-item" v-if="personAccount.totalAmount != null">可用余额{{personAccount.totalAmount.toFixed(2)}}元</view>
+						<view class="balanceCard-item" v-if="personAccount.frozenTotal != null">冻结金额{{personAccount.frozenTotal.toFixed(2)}}元</view>
 					</view>
 				</view>
 			</view>
@@ -45,7 +45,7 @@
 							<font>{{item.payNameStr}}</font>
 							<p>{{item.createTime}}</p>
 						</view>
-						<h4>{{item.amount}}</h4>
+						<h4>{{item.amount}}元</h4>
 					</view>
 				</view>
 			</view>

pages/user/finance/rechargeDet.vue

@@ -22,7 +22,9 @@
 				<p>充值渠道</p><span>{{detail.payNameStr}}</span>
 			</view>
 			<view class="rechargeDet-list">
+
 				<p>充值金额</p><span>{{detail.payFee}}元</span>
+
 			</view>
 		</view>
 		<view class="rechargeDet-main">