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

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/chargeProcess/charge.vue

@@ -3,7 +3,7 @@
 		<u-navbar title="充电"  :is-back="isback" ></u-navbar>
 		<view class="recharge" >
 			<view class="title">请选择充电金额</view>
-			<p>当前余额￥{{user.balance}}</p>
+			<p>当前余额{{user.balance}}元</p>
 			<view class="rechargeMain">
 				<view class="recharge-item" @click="moneyClick(item.id)"
 					:class="!otherNum&&moneyActiveClass == item.id ? 'active' : ''" v-for="(item,index) in moneyList"
@@ -36,7 +36,7 @@
 						每次只能使用1张
 					</span>
 					<span class="title-3">
-						-￥6.00
+						-6.00
 					</span>
 				</view>
 				<view class="select">
@@ -64,7 +64,7 @@
 				<view class="right" @click="chooseCoupons"  v-if="selectObj.id">
 					{{selectObj.threshold == 0 ? '无门槛' : '满'+selectObj.threshold+'元可用'}},
 					
-					<span class="price" v-if="selectObj.classify == '1'">抵扣￥{{selectObj.value}}元</span>
+					<span class="price" v-if="selectObj.classify == '1'">抵扣{{selectObj.value}}元</span>
 					<span class="price" v-if="selectObj.classify == '2'">可享{{selectObj.value*10}}折</span>
 					
 					<view class="iconfont">&#xe600;</view>

pages/searchPile/searchPileMap.vue

@@ -39,7 +39,7 @@
 				<view class="icon2-right">
 					<view class="corner2"></view>
 					<view class="corner2-top">
-						￥1.25
+						1.25元
 					</view>
 					<view class="corner2-bottom">
 						空闲10

pages/searchPile/stationAndPile/chargePriceDetails.vue

@@ -19,7 +19,7 @@
 						</view>
 					</view>
 					<view class="unitPrice-serviceCharge">
-						充电单价：￥{{item.single_price.toFixed(2)}}元 | 服务费：￥{{item.service_price.toFixed(2)}}元
+						充电单价：{{item.single_price.toFixed(2)}}元 | 服务费：{{item.service_price.toFixed(2)}}元
 					</view>
 				</view> 
 			</view>

pages/searchPile/stationAndPile/chargingPileDetails.vue

@@ -78,7 +78,7 @@
 						</view>
 						<view class="part-bottom">
 							<view class="unitPrice-servicePrice">
-								充电单价：￥{{item.electricityPrice}} | 服务费：￥{{item.servicePrice}}
+								充电单价：{{item.electricityPrice}}元 | 服务费：{{item.servicePrice}}元
 							</view>
 						</view>
 

pages/user/coupon/chooseCoupons.vue

@@ -39,7 +39,7 @@
 					<view class="price" 
 					 :style="item.chooseStatus == '0' ? 'color:#666':'' "
 					
-					v-if="item.classify == '1'">￥{{item.value}}</view>
+					v-if="item.classify == '1'">{{item.value}}元</view>
 					<view class="price"
 					 :style="item.chooseStatus == '0' ? 'color:#666':'' "
 					 
@@ -63,7 +63,7 @@
 			
 			<view class="num">
 				 
-				<view class="price" v-if="selectObj.classify == '1'">抵扣￥{{selectObj.value}}元</view>
+				<view class="price" v-if="selectObj.classify == '1'">抵扣{{selectObj.value}}元</view>
 				<view class="price" v-if="selectObj.classify == '2'">可享{{selectObj.value*10}}折</view>
 								 
 			</view>

pages/user/coupon/couponDetails.vue

@@ -13,7 +13,7 @@
 						</view>		
 					</view>
 					<view class="content-right">
-						 <view class="price" v-if="userCoupon.classify == '1'">￥{{userCoupon.value}}</view>
+						 <view class="price" v-if="userCoupon.classify == '1'">{{userCoupon.value}}元</view>
 						 <view class="price" v-if="userCoupon.classify == '2'">{{userCoupon.value*10}}折</view>
 						 <view class="price-condition">
 							{{userCoupon.threshold == 0 ? '无门槛' : '满'+userCoupon.threshold+'元可用'}}

pages/user/coupon/myCoupon.vue

@@ -20,7 +20,7 @@
 						</view>	
 					</view>
 					<view class="content-right">
-						<view class="price" v-if="item.classify == '1'">￥{{item.value}}</view>
+						<view class="price" v-if="item.classify == '1'">{{item.value}}元</view>
 						<view class="price" v-if="item.classify == '2'">{{item.value*10}}折</view>
 						<view class="price-condition">
 							{{item.threshold == 0 ? '无门槛' : '满'+item.threshold+'元可用'}}

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/recharge.vue

@@ -3,7 +3,7 @@
 		<u-navbar title="充值"></u-navbar>
 		<view class="recharge">
 			<view class="title">选择充值金额</view>
-			<p>当前余额{{detail.balance}}</p>
+			<p>当前余额{{detail.balance}}元</p>
 			<view class="rechargeMain">
 				<view class="recharge-item" :class="!otherNum&&moneyActiveClass == item.id ? 'active' : ''"
 					v-for="(item,index) in moneyList" :key="item.id" @click="moneyClick(item.id,item)">

pages/user/finance/rechargeDet.vue

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