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

# Conflicts:
#	pages/searchPile/chargeProcess/dcCharging.vue

.env.dev.js

@@ -1,16 +1,17 @@
 const UNI_APP = {  
 	ProjectName :"51充电联盟",
-	//	BASE_URL: 'https://51team.xiaoxinda.com/charging-station-server/',
+	 BASE_URL: 'https://51team.xiaoxinda.com/charging-station-server/',
 	
-	BASE_URL: 'https://charging.xiaoxinda.com/charging-station-test/',
+	//BASE_URL: 'https://charging.xiaoxinda.com/charging-station-test/',
 	//BASE_URL: 'http://192.168.77.162:8080/charging-station/' ,
-    PARK_URL: 'https://51team.xiaoxinda.com/charging-parking/' ,
+	//PARK_URL: 'https://51team.xiaoxinda.com/charging-parking/' ,
 	NODE_ENV :"dev",
 	SIMPLE_RUN:true,// 无视权限控制跳转页面   ， 用于样式人员快速访问各种功能 ，快速测试等
 
-	//openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY", 
-	openId:"oK9Wr59rru-i3bm7dtTtxnkR-i4s",
-	//	openId:"test111",
+	//openId:"oK9Wr57rAcNzihDN2PEdptprT0As", 
+	//openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",
+			openId:"oK9Wr59rru-i3bm7dtTtxnkR-i4s",
+	//		openId:"oK9Wr5xRUoP9EygZqBec0xkJMVTs",
 	//小鹏管家appid
 	//VUE_APP_WXAPPID:"wx7e70eb62a8459869",
 	VUE_APP_WXAPPID:"wx3afdb1b60188c1e5",

pages/MyInvoice/invioceResult.vue

@@ -26,7 +26,7 @@
 					发票金额
 				</view>
 				<view class="info-content">
-					{{selectObj.totalPrice}}元
+					{{selectObj.totalPrice.toFixed(2)}}元
 				</view>
 			</view>
 				

pages/MyInvoice/invoiceDetail.vue

@@ -10,7 +10,7 @@
 						oldstyle="font-size: 14px;">
 			  			<view class="title">
 			  				{{item.stationName}}
-							 <text class="price2">{{item.actualFee?item.actualFee:0}}元</text>
+							 <text class="price2">{{item.actualFee?item.actualFee.toFixed(2):'0.00'}}元</text>
 			  			</view>
 						<p><text class="text-1">充电电量</text> <text class="text-2">{{item.electricQuantity/10000}}度</text></p>
 						<p><text class="text-1">开始时间</text> <text class="text-2">{{item.startTime?item.startTime:item.endTime}}</text></p>
@@ -29,7 +29,7 @@
 			<ujp-navbar title="发票详情"></ujp-navbar>
 			<view class="price">
 				<view class="num">
-					{{invoiceInfo.amount}}元
+					{{invoiceInfo.amount.toFixed(2)}}元
 				</view>
 				<view class="text" >
 					发票金额

pages/MyInvoice/invoiceManagement.vue

@@ -24,7 +24,7 @@
 			 oldstyle="font-size: 14px;"
 			 @click="submit(item.id)">
 				<view class="title">
-					{{item.stationName}} <text class="price">{{item.actualFee?item.actualFee:0}}元</text>
+					{{item.stationName}} <text class="price">{{item.actualFee?item.actualFee.toFixed(2):'0.00'}}元</text>
 				</view>
 				<p><text class="text-1">充电电量</text> <text class="text-2">{{item.electricQuantity/10000}}度</text></p>
 				<p><text class="text-1">开始时间</text> <text class="text-2">{{item.startTime?item.startTime:item.endTime}}</text></p>
@@ -48,7 +48,7 @@
 				全选
 			</view>
 			<view class="total">
-				<p class="total-price">共<text style="color: #FF7300;" >{{sumActualFee}}元</text></p>
+				<p class="total-price">共<text style="color: #FF7300;" >{{sumActualFee.toFixed(2)}}元</text></p>
 				<p class="order">{{selectcount}}个订单</p>
 			</view>
 			<u-button type="success" @click="submit()" shape="circle">去开票</u-button>
@@ -65,7 +65,7 @@
 						'have-invoiced':item.status==2
 					}">{{item.statusText}}</text>
 	  			</view>
-	  			<p><text class="text-1">发票金额</text> <text class="text-2">{{item.amount}}元</text></p>
+	  			<p><text class="text-1">发票金额</text> <text class="text-2">{{item.amount.toFixed(2)}}元</text></p>
 	  			<p><text class="text-1">发票抬头</text><text class="text-2">{{item.title}}</text></p>
 	  			<p><text class="text-1">申请时间</text> <text class="text-2">{{item.createTime}}</text></p>
 	  		</view>

pages/MyInvoice/issueInvoice.vue

@@ -6,7 +6,7 @@
 		<view class="invioice-info">
 			<p class="title">发票信息</p>
 			<u-cell-group>
-				<u-cell-item title="发票金额" :arrow="false"> <text style="color:#ff3d00;">{{obj.totalPrice}}元</text></u-cell-item>
+				<u-cell-item title="发票金额" :arrow="false"> <text style="color:#ff3d00;">{{obj.totalPrice.toFixed(2)}}元</text></u-cell-item>
 				<u-cell-item title="抬头类型" :arrow="false">
 					<view v-if="!selectObj.title">请选择发票</view>
 					<view v-else-if="selectObj.headerType==1">企业单位</view>
@@ -55,7 +55,7 @@
 							发票抬头
 						</view>
 						<view class="content">
-							{{obj.totalPrice}}元
+							{{obj.totalPrice.toFixed(2)}}元
 						</view>
 					</view>
 					<view class="hint">

pages/index/index.vue

@@ -157,7 +157,7 @@
 					</view>
 					<view class="station-price">
 						<view class="flex">
-							<view class="price-left">{{stationData.costPrice}}</view>
+							<view class="price-left">{{stationData.costPrice.toFixed(2)}}</view>
 							<view class="price-right">
 								元/度 起 
 							</view>
@@ -255,7 +255,7 @@
 					启动中
 				</view>
 				<view v-if="item.status == '1'" class="text-2 oldTextjp2" oldstyle="font-size: 16px;">
-					已充{{item.dueFee != null ? item.dueFee : '0.00'}}元
+					已充{{item.dueFee != null ? item.dueFee.toFixed(2) : '0.00'}}元
 				</view>
 				<!-- <view v-if="item.status == '2'" class="text-2" style="color: red;">
 				超出时间将收取占位费
@@ -265,7 +265,7 @@
 					<span v-else >前方等待{{item.waitNum-1}}位</span>
 				</view>
 				<view class="text-3 oldTextjp2" oldstyle="font-size: 16px;">
-				<p style=" width: 160%;">	{{item.stationName}}/{{item.deviceName}}&nbsp;&nbsp;当前电价{{item.chargingCostPrice }}元/度</p>
+				<p style=" width: 160%;">	{{item.stationName}}/{{item.deviceName}}&nbsp;&nbsp;当前电价{{item.chargingCostPrice.toFixed(2)}}元/度</p>
 				</view>
 			</view>
 			<view class="img-box" style="height: 110px;">

pages/monthlyCardActivity/monthlyCardList.vue

@@ -23,7 +23,7 @@
 				{{item.address}}
 			</view>
 			<view class="price">
-				<view class="num">{{item.costPrice}}</view>
+				<view class="num">{{item.costPrice.toFixed(2)}}</view>
 				<view class="unit oldTextjp2" oldstyle="font-size: 16px;">
 					 元/度 起
 				</view>

pages/parking/outPayment.vue

@@ -23,7 +23,7 @@
 						停车费
 					</view>
 					<view class="content">
-						{{detail.price}}元
+						{{detail.price.toFixed(2)}}元
 					</view>
 				</view>
 				
@@ -60,7 +60,7 @@
 					收费标准
 				</view>
 				<view class="content">
-					{{detail.hourCost}}元/小时
+					{{detail.hourCost.toFixed(2)}}元/小时
 				</view>
 			</view>
 		</view>

pages/parking/pay.vue

@@ -23,7 +23,7 @@
 					    text-align: center;
 					    font-size: 46px;
 					    color: #53b56b;
-					"> {{detail.price}}<span style="font-size: 16px;">元</span></h2>
+					"> {{detail.price.toFixed(2)}}<span style="font-size: 16px;">元</span></h2>
 					<view class="cartitle"> 缴费信息</view>
 					<view class="info" >
 						<view class="info-name">
@@ -40,7 +40,7 @@
 							停车费
 						</view>
 						<view class="info-text" style="font-size: 16px;">
-							{{detail.total}}元
+							{{detail.total.toFixed(2)}}元
 						</view>
 					</view>
 					<view class="info"   >
@@ -48,7 +48,7 @@
 							折扣
 						</view>
 						<view class="info-text" style="font-size: 16px;">
-							 {{detail.discountMoney}}元
+							 {{detail.discountMoney.toFixed(2)}}元
 						</view>
 					</view>
 					
@@ -59,7 +59,7 @@
 						</view>
 						<view class="info-text">
 							 			
-							{{detail.hourCost}}元
+							{{detail.hourCost.toFixed(2)}}元
 						</view>
 					</view>
 					<view class="info" >

pages/parking/search.vue

@@ -35,7 +35,7 @@
     text-align: center;
     font-size: 46px;
     color: #53b56b;
-"> {{detail.price}}<span style="font-size: 16px;">元</span></h2>
+"> {{detail.price.toFixed(2)}}<span style="font-size: 16px;">元</span></h2>
 					<view class="cartitle"> 缴费信息</view>
 					<view class="info" >
 						<view class="info-name">
@@ -53,7 +53,7 @@
 							停车费
 						</view>
 						<view class="info-text" style="font-size: 16px;">
-							{{detail.total}}元
+							{{detail.total.toFixed(2)}}元
 						</view>
 					</view>
 					<view class="info"   >
@@ -61,7 +61,7 @@
 							折扣
 						</view>
 						<view class="info-text" style="font-size: 16px;">
-							 {{detail.discountMoney}}元
+							 {{detail.discountMoney.toFixed(2)}}元
 						</view>
 					</view>
 					
@@ -74,7 +74,7 @@
 						</view>
 						<view class="info-text">
 							 			
-							{{detail.hourCost}}元
+							{{detail.hourCost.toFixed(2)}}元
 						</view>
 					</view>
 					<view class="info" >

pages/record/details.vue

@@ -8,18 +8,18 @@
 			</view>
 			<view class="details-main">
 				<view class="details-price">
-					<h3>{{chargeDetail.actualFee != null ? chargeDetail.actualFee : '0.00'}}</h3><span>元</span>
+					<h3>{{chargeDetail.actualFee != null ? chargeDetail.actualFee.toFixed(2) : '0.00'}}</h3><span>元</span>
 				</view>
 				<p :style="elderStatus ? 'font-size: 18px;' : ''">订单总额</p>
 			</view>
 			<view class="oldTextjp2" oldstyle="font-size: 18px;">
-				<view class="details-row"><p>电费</p><span>{{chargeDetail.totalElecMoney != null ? chargeDetail.totalElecMoney : '0.00'}}元</span></view>
-				<view class="details-row" ><p>服务费</p><span>{{chargeDetail.totalServiceMoney != null ? chargeDetail.totalServiceMoney : '0.00'}}元</span></view>
+				<view class="details-row"><p>电费</p><span>{{chargeDetail.totalElecMoney != null ? chargeDetail.totalElecMoney.toFixed(2) : '0.00'}}元</span></view>
+				<view class="details-row" ><p>服务费</p><span>{{chargeDetail.totalServiceMoney != null ? chargeDetail.totalServiceMoney.toFixed(2) : '0.00'}}元</span></view>
 				
 <!-- 				<view class="details-row" v-if="chargeDetail.discountAmount" ><p>服务费</p><span>{{chargeDetail.totalServiceMoney != null ? (chargeDetail.totalServiceMoney*100-chargeDetail.discountAmount*100)/100 : '0.00'}}元({{chargeDetail.totalServiceMoney}}-{{chargeDetail.discountAmount}})</span></view>
  -->				
 				<view class="details-row"><p>优惠券抵扣</p><span style="color:red">{{userCouponObj? userCouponObj.useText : '未使用'}}</span></view>
-				<view class="details-row" v-if="chargeDetail.discountAmount" ><p>实际减免</p><span >-{{chargeDetail.discountAmount}}元</span></view>
+				<view class="details-row" v-if="chargeDetail.discountAmount" ><p>实际减免</p><span >-{{chargeDetail.discountAmount.toFixed(2)}}元</span></view>
 			
 			<view class="details-row" v-if="chargeDetail.userCardId"><p>会员活动</p><span >充电服务费包月卡</span></view>
 			

pages/record/index.vue

@@ -26,7 +26,7 @@
 					</view>
 					<view class="recordList-row">
 						<p :style="elderStatus ? 'font-size: 14px' : ''">充电时长：{{item.chargingMinute != null ? getPercent(item.chargingMinute): '0秒'}}</p>
-						<h4 class="oldTextjp2" oldstyle="font-size: 28px;">{{item.actualFee != null ? item.actualFee : '0.00'}}元</h4>
+						<h4 class="oldTextjp2" oldstyle="font-size: 28px;">{{item.actualFee != null ? item.actualFee.toFixed(2) : '0.00'}}元</h4>
 					</view>
 				</view>
 			</view>

pages/search/search.vue

@@ -11,7 +11,7 @@
 				{{item.position}}
 			</view>
 			<view class="price">
-				<view class="num">{{item.price}}</view> <view class="unit">
+				<view class="num">{{item.price.toFixed(2)}}</view> <view class="unit">
 					 元/度 起
 				</view>
 			</view>

pages/searchPile/chargeProcess/charge.vue

@@ -7,12 +7,12 @@
 					去充值
 				</view>
 			</view>
-			<p>当前余额{{user.balance>0?user.balance:0}}元</p>
+			<p>当前余额{{user.balance>0?user.balance.toFixed(2):'0.00'}}元</p>
 			<view class="rechargeMain">
 				<view class="recharge-item" @click="moneyClick(item.id)"
 					:class="!otherNum&&moneyActiveClass == item.id ? 'active' : ''" v-for="(item,index) in moneyList"
 					:key="item.id">
-					{{item.name}}元
+					{{item.name.toFixed(2)}}元
 				</view>
 				<view class="recharge-item" :class="otherNum ? 'active' : ''" style="
 					padding: 8px 0px;">
@@ -57,7 +57,7 @@
 							<u-radio @change="radioChange" :key="index" :name="item.id"
 								:style="item.chooseStatus==0?'	background-color: #e3e3e3 !important;':''"
 								:disabled="item.chooseStatus==0">
-								满{{item.threshold}}元减{{item.value}}元
+								满{{item.threshold.toFixed(2)}}元减{{item.value.toFixed(2)}}元
 								<view class="explain" @click="gotoUrl('pages/user/coupon/couponDetails?id='+item.id)" :key="index" >使用说明</view>
 
 							</u-radio>
@@ -74,9 +74,9 @@
 			 		优惠券
 			 	</view>
 				<view class="right" @click="chooseCoupons"  v-if="selectObj.id">
-					{{selectObj.threshold == 0 ? '无门槛' : '满'+selectObj.threshold+'元可用'}},
+					{{selectObj.threshold == 0 ? '无门槛' : '满'+selectObj.threshold.toFixed(2)+'元可用'}},
 					
-					<span class="price" v-if="selectObj.classify == '1'||selectObj.classify == '3'">抵扣{{selectObj.value}}元</span>
+					<span class="price" v-if="selectObj.classify == '1'||selectObj.classify == '3'">抵扣{{selectObj.value.toFixed(2)}}元</span>
 					<span class="price" v-if="selectObj.classify == '2'">服务费{{selectObj.value}}折</span>
 					
 					<view class="iconfont">&#xe600;</view>

pages/searchPile/chargeProcess/dcCharging.vue

@@ -71,7 +71,7 @@
 						充电金额
 					</view>
 					<view class="info-text">
-						{{chargingRecord.actualFee}}元
+						{{chargingRecord.actualFee.toFixed(2)}}元
 					</view>
 				</view>
 				<view class="info" v-if="chargingRecord.discountAmount">
@@ -79,7 +79,7 @@
 						优惠金额
 					</view>
 					<view class="info-text" style="color:red">
-						{{chargingRecord.discountAmount}}元
+						{{chargingRecord.discountAmount.toFixed(2)}}元
 					</view>
 				</view>
 				
@@ -192,7 +192,7 @@
 									<view style="
 											font-size: 16px;
 											font-weight: bold;
-										" 	>已充费用{{chargingRecord.dueFee?chargingRecord.dueFee:0}}元</view>
+										" 	>已充费用{{chargingRecord.dueFee?chargingRecord.dueFee.toFixed(2):'0.00'}}元</view>
 								</text>
  								
 								
@@ -244,7 +244,9 @@
 					</view>
 					<view class="info-item">
 						<view class="content">
-							{{detail.balance>0&&chargingRecord.dueFee?(detail.balance*1000-chargingRecord.dueFee*1000)/1000:detail.balance}}
+
+							{{detail.balance>0&&chargingRecord.dueFee?((detail.balance*1000-chargingRecord.dueFee*1000)/1000).toFixed(2):detail.balance.toFixed(2)}}
+
 						</view>
 						<view class="name">
 							账户余额(元)
@@ -270,7 +272,7 @@
 							<p class="time">{{price.startTime}}-{{price.endTime}}</p>
 						</view>
 						<view class="detail">
-							<p class="electrovalence"><text class="num">{{chargingRecord.userCardId?price.electricityPrice:price.costPrice}}</text> 元/度</p>
+							<p class="electrovalence"><text class="num">{{chargingRecord.userCardId?price.electricityPrice.toFixed(2):price.costPrice.toFixed(2)}}</text> 元/度</p>
 							<p class="electrovalence-monthlyCard">电价:{{price.electricityPrice}} | 服务费:{{chargingRecord.userCardId?0+'(包月卡)':price.servicePrice}}</p>
 						</view>
 					
@@ -282,7 +284,7 @@
 						</view>
 						<view class="detail">
 							{{chargingRecord.chargeStrategy==0?'充满自停':''}}
-								{{chargingRecord.chargeStrategy==2?chargingRecord.estimateFee+'元':''}}
+								{{chargingRecord.chargeStrategy==2?chargingRecord.estimateFee.toFixed(2):'0.00'}}元
 							
 						</view>
 					
@@ -415,7 +417,7 @@
 			<view class="cost">
 				<view class="">
 					<view class="cost-top">
-						{{chargingRecord.dueFee?chargingRecord.dueFee:0}}元
+						{{chargingRecord.dueFee?chargingRecord.dueFee.toFixed(2):'0.00'}}元
 					</view>
 					<view class="cost-bottom "  >
 						实时费用
@@ -424,7 +426,7 @@
 				<view class="line"></view>
 				<view class="">
 					<view class="cost-top">
-						{{detail.balance>0?detail.balance:0}}元
+						{{detail.balance>0?detail.balance.toFixed(2):'0.00'}}元
 						<view class="iconfont cost-font" @click="gotoUrl('pages/user/finance/recharge')" >&#xe633;</view>
 					</view>
 					<view class="cost-bottom">
@@ -467,7 +469,7 @@
 				</view>
 				<view class="info-text" >
 					{{chargingRecord.chargeStrategy==0?'充满自停':''}}
-					{{chargingRecord.chargeStrategy==2?chargingRecord.estimateFee+'元':''}}
+					{{chargingRecord.chargeStrategy==2?chargingRecord.estimateFee.toFixed(2):'0.00'}}元
 				</view>
 			</view>
 			
@@ -513,10 +515,10 @@
 					</view>
 				</view>
 				<view class="info-text"  style="line-height: 23px;">
-					<view><span style="color: #FF3D00;font-size: 20px;"><b>{{price.costPrice}}</b></span>元/度</view>
+					<view><span style="color: #FF3D00;font-size: 20px;"><b>{{price.costPrice.toFixed(2)}}</b></span>元/度</view>
 					
 					<view class="info-name2">
-						电价:{{price.electricityPrice}}元 | 服务费:{{price.servicePrice}}元
+						电价:{{price.electricityPrice.toFixed(2)}}元 | 服务费:{{price.servicePrice.toFixed(2)}}元
 					</view>
 				</view>
 				

pages/searchPile/chargeProcess/dcCharging2.vue

@@ -71,7 +71,7 @@
 						充电金额
 					</view>
 					<view class="info-text">
-						{{chargingRecord.actualFee}}元
+						{{chargingRecord.actualFee.toFixed(2)}}元
 					</view>
 				</view>
 				<view class="info" v-if="chargingRecord.discountAmount">
@@ -79,7 +79,7 @@
 						优惠金额
 					</view>
 					<view class="info-text" style="color:red">
-						{{chargingRecord.discountAmount}}元
+						{{chargingRecord.discountAmount.toFixed(2)}}元
 					</view>
 				</view>
 				
@@ -192,7 +192,7 @@
 									<view style="
 											font-size: 16px;
 											font-weight: bold;
-										" 	>已充费用{{chargingRecord.dueFee?chargingRecord.dueFee:0}}元</view>
+										" 	>已充费用{{chargingRecord.dueFee?chargingRecord.dueFee.toFixed(2):'0.00'}}元</view>
 								</text>
  								
 								
@@ -244,7 +244,7 @@
 					</view>
 					<view class="info-item">
 						<view class="content">
-							{{detail.balance>0&&chargingRecord.dueFee?(detail.balance*1000-chargingRecord.dueFee*1000)/1000:'0'}}
+							{{detail.balance>0&&chargingRecord.dueFee?((detail.balance*1000-chargingRecord.dueFee*1000)/1000).toFixed(2):'0.00'}}
 						</view>
 						<view class="name">
 							账户余额(元)
@@ -270,7 +270,7 @@
 							<p class="time">{{price.startTime}}-{{price.endTime}}</p>
 						</view>
 						<view class="detail">
-							<p class="electrovalence"><text class="num">{{chargingRecord.userCardId?price.electricityPrice:price.costPrice}}</text> 元/度</p>
+							<p class="electrovalence"><text class="num">{{chargingRecord.userCardId?price.electricityPrice.toFixed(2):price.costPrice.toFixed(2)}}</text> 元/度</p>
 							<p class="electrovalence-monthlyCard">电价:{{price.electricityPrice}} | 服务费:{{chargingRecord.userCardId?0+'(包月卡)':price.servicePrice}}</p>
 						</view>
 					
@@ -282,7 +282,7 @@
 						</view>
 						<view class="detail">
 							{{chargingRecord.chargeStrategy==0?'充满自停':''}}
-								{{chargingRecord.chargeStrategy==2?chargingRecord.estimateFee+'元':''}}
+								{{chargingRecord.chargeStrategy==2?chargingRecord.estimateFee.toFixed(2):'0.00'}}元
 							
 						</view>
 					
@@ -414,7 +414,7 @@
 			<view class="cost">
 				<view class="">
 					<view class="cost-top">
-						{{chargingRecord.dueFee?chargingRecord.dueFee:0}}元
+						{{chargingRecord.dueFee?chargingRecord.dueFee.toFixed(2):'0.00'}}元
 					</view>
 					<view class="cost-bottom "  >
 						实时费用
@@ -423,7 +423,7 @@
 				<view class="line"></view>
 				<view class="">
 					<view class="cost-top">
-						{{detail.balance>0?detail.balance:0}}元
+						{{detail.balance>0?detail.balance.toFixed(2):'0.00'}}元
 						<view class="iconfont cost-font" @click="gotoUrl('pages/user/finance/recharge')" >&#xe633;</view>
 					</view>
 					<view class="cost-bottom">
@@ -466,7 +466,7 @@
 				</view>
 				<view class="info-text" >
 					{{chargingRecord.chargeStrategy==0?'充满自停':''}}
-					{{chargingRecord.chargeStrategy==2?chargingRecord.estimateFee+'元':''}}
+					{{chargingRecord.chargeStrategy==2?chargingRecord.estimateFee.toFixed(2):'0.00'}}元
 				</view>
 			</view>
 			
@@ -512,10 +512,10 @@
 					</view>
 				</view>
 				<view class="info-text"  style="line-height: 23px;">
-					<view><span style="color: #FF3D00;font-size: 20px;"><b>{{price.costPrice}}</b></span>元/度</view>
+					<view><span style="color: #FF3D00;font-size: 20px;"><b>{{price.costPrice.toFixed(2)}}</b></span>元/度</view>
 					
 					<view class="info-name2">
-						电价:{{price.electricityPrice}}元 | 服务费:{{price.servicePrice}}元
+						电价:{{price.electricityPrice.toFixed(2)}}元 | 服务费:{{price.servicePrice.toFixed(2)}}元
 					</view>
 				</view>
 				

pages/searchPile/searchPile.vue

@@ -142,7 +142,7 @@
 							{{item.name}}
 						</view>
 						<view class="price">
-							<view class="num">{{item.price}}</view>
+							<view class="num">{{item.price.toFixed(2)}}</view>
 							<view class="unit">
 								 元/度 起
 							</view>
@@ -203,7 +203,7 @@
 								
 								<view class="card_item2" >
  									<view style="color:#FF6573;margin-right: 10rpx;">
-										{{item.price}}
+										{{item.price.toFixed(2)}}
 									</view>
 									<view style="display: flex; justify-content: center;align-items: center">
 									 元/度 起									

pages/searchPile/stationAndPile/chargingPileDetails.vue

@@ -37,7 +37,7 @@
 							</view>
 						</view>
 						<view class="content">
-							当前时段：{{price.startTime}}~{{price.endTime}}    费用为{{price.costPrice}} 元/度(含电费{{price.electricityPrice}}元/度 + 服务费{{price.servicePrice}}元/度)
+							当前时段：{{price.startTime}}~{{price.endTime}}    费用为{{price.costPrice.toFixed(2)}} 元/度(含电费{{price.electricityPrice.toFixed(2)}}元/度 + 服务费{{price.servicePrice.toFixed(2)}}元/度)
 							
 						</view>
 					</view>
@@ -77,7 +77,7 @@
 					<text class="free" v-else>{{gun.workStatusText}}</text>
 				</view>
 				<view class="price" v-if="price">
-					<text>{{price.costPrice}}</text><text class="unit">元/度</text>
+					<text>{{price.costPrice.toFixed(2)}}</text><text class="unit">元/度</text>
 				</view>
 				<view class="address">
 					{{detail.stationAddress}}

pages/searchPile/stationAndPile/stationDetailsMap.vue

@@ -26,7 +26,7 @@
 				
 				<view class="card_item2 " >
 					<view class="font6" style="color:#FF6573;margin-right: 10rpx;">
-						{{item.costPrice}}
+						{{item.costPrice.toFixed(2)}}
 					</view>
 					<view style="display: flex; justify-content: center;align-items: center">
 					 元/度 起										

pages/user/InviteFriends.vue

@@ -49,7 +49,7 @@
 					<view class="reward-head">
 						<p>成功邀请{{list?list.length:0}}人，已获得</p>
 						<view class="reward-head-price">
-							<h2>{{list?list.length*5:0}}</h2><span>元</span>
+							<h2>{{list?(list.length*5).toFixed(2):'0.00'}}</h2><span>元</span>
 						</view>
 					</view>
 					<view class="reward-main">

pages/user/coupon/chooseCoupons.vue

@@ -40,14 +40,14 @@
 					<view class="price" 
 					 :style="item.chooseStatus == '0' ? 'color:#666':'' "
 					
-					v-if="item.classify == '1'||item.classify == '3'">{{item.value}}<span style="font-size: 12px;">元</span></view>
+					v-if="item.classify == '1'||item.classify == '3'">{{item.value.toFixed(2)}}<span style="font-size: 12px;">元</span></view>
 					<view class="price2"
 					 :style="item.chooseStatus == '0' ? 'color:#666':'' "
 					 
 					 v-if="item.classify == '2'"><span style="font-size: 12px;">服务费</span>{{item.value}}<span style="font-size: 12px;">折</span></view>
 				 
 				  <view class="contidion oldTextjp2" oldstyle="font-size: 16px;">
-				  	{{item.threshold == 0 ? '无门槛' : '满'+item.threshold+'元可用'}}
+				  	{{item.threshold == 0 ? '无门槛' : '满'+item.threshold.toFixed(2)+'元可用'}}
 				  </view>
 			</view>
 		</view>
@@ -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.toFixed(2)}}元</view>
 				<view class="price" v-if="selectObj.classify == '2'">服务费{{selectObj.value}}折</view>
 								 
 			</view>

pages/user/coupon/couponDetails.vue

@@ -15,12 +15,12 @@
 						</view>		
 					</view>
 					<view class="content-right">
-						 <view class="price" v-if="userCoupon.classify == '1'||userCoupon.classify == '3'">{{userCoupon.value}}<span style="font-size: 12px;">元</span></view>
+						 <view class="price" v-if="userCoupon.classify == '1'||userCoupon.classify == '3'">{{userCoupon.value.toFixed(2)}}<span style="font-size: 12px;">元</span></view>
 
 						 <view class="price2" v-if="userCoupon.classify == '2'"><span style="font-size: 12px;">服务费</span>{{userCoupon.value}}<span style="font-size: 12px;">折</span></view>
 
 						 <view class="price-condition oldTextjp2" oldstyle="font-size: 16px;">
-							{{userCoupon.threshold == 0 ? '无门槛' : '满'+userCoupon.threshold+'元可用'}}
+							{{userCoupon.threshold == 0 ? '无门槛' : '满'+userCoupon.threshold.toFixed(2)+'元可用'}}
 						 </view>
 					</view>
 				</view>

pages/user/coupon/myCoupon.vue

@@ -22,13 +22,13 @@
 						</view>	
 					</view>
 					<view class="content-right">
-						<view class="price" v-if="item.classify == '1'">{{item.value}}<span style="font-size: 12px;">元</span></view>
+						<view class="price" v-if="item.classify == '1'">{{item.value.toFixed(2)}}<span style="font-size: 12px;">元</span></view>
 
 						<view class="price2" v-if="item.classify == '2'"><span style="font-size: 12px;">服务费</span>{{item.value}}<span style="font-size: 12px;">折</span></view>
-						<view class="price2" v-if="item.classify == '3'">{{item.value}}<span style="font-size: 12px;">元</span></view>
+						<view class="price2" v-if="item.classify == '3'">{{item.value.toFixed(2)}}<span style="font-size: 12px;">元</span></view>
 
 						<view class="price-condition oldTextjp2" oldstyle="font-size: 16px;">
-							{{item.threshold > 0 ? '满'+item.threshold+'元可用' : '无门槛'}}
+							{{item.threshold > 0 ? '满'+item.threshold.toFixed(2)+'元可用' : '无门槛'}}
 						</view>
 					</view>
 				</view>

pages/user/finance/balance.vue

@@ -45,7 +45,7 @@
 							<font class="oldTextjp2" oldstyle="font-size: 18px;">{{item.payNameStr}}</font>
 							<p  class="oldTextjp2" oldstyle="font-size: 14px;">{{item.createTime}}</p>
 						</view>
-						<h4 class="oldTextjp2" oldstyle="font-size: 24px;">{{item.amount}}元</h4>
+						<h4 class="oldTextjp2" oldstyle="font-size: 24px;">{{item.amount.toFixed(2)}}元</h4>
 					</view>
 				</view>
 			</view>

pages/user/finance/recharge.vue

@@ -11,11 +11,11 @@
 				
 		<view class="recharge">
 			<view class="title oldTextjp" oldstyle="font-size:20px">选择充值金额</view>
-			<p class="oldTextjp2" oldstyle="font-size:16px">当前余额{{detail.balance>0?detail.balance:0}}元</p>
+			<p class="oldTextjp2" oldstyle="font-size:16px">当前余额{{detail.balance>0?detail.balance.toFixed(2):'0.00'}}元</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)">
-					{{item.amountDesc?item.amountDesc:item.rechargeAmount+'元'}}
+					{{item.amountDesc?item.amountDesc:item.rechargeAmount.toFixed(2)+'元'}}
 					<view class="amount" v-if="item.amountRemark">{{item.amountRemark}}</view>
 					</view>
 				

pages/user/finance/rechargeDet.vue

@@ -4,7 +4,7 @@
 		<ujp-navbar title="充值详情"></ujp-navbar>
 		<view class="rechargeDet-head">
 			<view class="payPrice">
-				<font>{{detail.payFee}}</font><span>元</span>
+				<font>{{detail.payFee.toFixed(2)}}</font><span>元</span>
 			</view>
 			<p class="oldTextjp2" oldstyle="font-size: 16px;">充值金额(元)</p>
 		</view>
@@ -23,7 +23,7 @@
 			</view>
 			<view class="rechargeDet-list">
 
-				<p>充值金额</p><span>{{detail.payFee}}元</span>
+				<p>充值金额</p><span>{{detail.payFee.toFixed(2)}}元</span>
 
 			</view>
 		</view>

pages/user/finance/rechargeList.vue

@@ -14,7 +14,7 @@
 			<view class="rechargeList-item" v-for="(item,index) in accountList" :key="item.id" @click="gotoUrl('pages/user/finance/rechargeDet?id=' + item.id)">
 				<view class="rechargeList-row">
 					<span class="oldTextjp" oldstyle="font-size: 18px;">{{item.payName == "give" ? '赠送金额' : '充值金额'}}</span>
-					<h4 class="oldTextjp2" oldstyle="font-size: 20px;">{{item.amount}}元</h4>
+					<h4 class="oldTextjp2" oldstyle="font-size: 20px;">{{item.amount.toFixed(2)}}元</h4>
 				</view>
 				<view class="rechargeList-row">
 					<p class="oldTextjp2" oldstyle="font-size: 14px;">{{item.payNameStr}}</p>

pages/user/finance/rechargeRes.vue

@@ -7,7 +7,7 @@
 			<view class="title oldTextjp" oldstyle="font-size: 20px;" v-if="detail.type=='2'" >开通{{detail.payStatus==20?'成功':'失败'}}</view>
 			
 			<view class="payPrice">
-				<font>{{detail.totalFee}}</font><span>元</span>
+				<font>{{detail.totalFee.toFixed(2)}}</font><span>元</span>
 			</view>
 			<p class="oldTextjp2" oldstyle="font-size: 16px;"  >{{detail.payNameStr}}</p>
 		

pages/user/finance/refundDet.vue

@@ -4,7 +4,7 @@
 		<ujp-navbar title="退费详情"></ujp-navbar>
 		<view class="rechargeDet-head">
 			<view class="payPrice">
-				<font>{{refund.refundRealAmount}}</font><span>元</span>
+				<font>{{refund.refundRealAmount!=null ? refund.refundRealAmount.toFixed(2) : '0.00'}}</font><span>元</span>
 			</view>
 			<p>退费金额(元)</p>
 		</view>
@@ -13,7 +13,7 @@
 				<p>退费订单</p><span>{{refund.refundOrderNo}}</span>
 			</view>
 			<view class="rechargeDet-list">
-				<p>手续费</p><span>{{refund.proceduresAmount!=null?refund.proceduresAmount.toFixed(2):'0'}}元</span>
+				<p>手续费</p><span>{{refund.proceduresAmount!=null?refund.proceduresAmount.toFixed(2):'0.00'}}元</span>
 			</view>
 			<view class="rechargeDet-list">
 				<p>退费时间</p><span>{{refund.applicationTime}}</span>
@@ -22,7 +22,7 @@
 				<p>退费渠道</p><span>{{refund.refundChannelText}}</span>
 			</view> -->
 			<view class="rechargeDet-list">
-				<p>退费金额</p><span>{{refund.refundRealAmount!=null?refund.refundRealAmount.toFixed(2):'0'}}元</span>
+				<p>退费金额</p><span>{{refund.refundRealAmount!=null?refund.refundRealAmount.toFixed(2):'0.00'}}元</span>
 			</view>
 		</view>
 		<view class="rechargeDet-main">

pages/user/finance/refundList.vue

@@ -4,7 +4,7 @@
 		<view class="balance">
 			<view class="balanceHead">
 				<view class="payPrice">
-					<font>{{account.availableAmount}}</font><span>元</span>
+					<font>{{account.availableAmount!=null ? account.availableAmount.toFixed(2) : '0.00'}}</font><span>元</span>
 				</view>
 				<view class="tips">
 					<p>可退费金额(元)</p><u-icon name="question-line" custom-prefix="custom-icon" color="#00B962" size="32" @click="showtip = true"></u-icon>
@@ -25,7 +25,7 @@
 						</view>
 						<view class="refundList-row" >
 							<p>{{item.applicationTime}}</p>
-							<p>{{item.refundAmount.toFixed(2)}}元</p>
+							<p>{{item.refundAmount!=null ? item.refundAmount.toFixed(2) : '0.00'}}元</p>
 						</view>
 					</view>
 					

pages/user/myReservation/reservationListDetails.vue

@@ -89,7 +89,7 @@
 			
 					</view>
 					<view class="item-content">
-						{{price.electricityPrice}}元/度
+						{{price.electricityPrice.toFixed(2)}}元/度
 					</view>
 				</view>
 				<view class="item">
@@ -98,7 +98,7 @@
 						充电服务费 
 					</view>
 					<view class="item-content">
-						{{price.servicePrice}}元/度
+						{{price.servicePrice.toFixed(2)}}元/度
 					</view>
 				</view>
 				

pages/user/receiveCoupon.vue

@@ -18,12 +18,12 @@
 					<img src="../../assets/img/Frame915.png" alt="">
 					
 						<view class="num">
-							{{item.value}}
+							{{item.value.toFixed(2)}}
 						</view>
 						<view class="unit">元</view>
 					<view class="ticket-info">
 						<view class="ticket-name">
-							{{item.threshold == 0 ? '无门槛充电抵扣券' : '满'+selectObj.threshold+'元可用'}}
+							{{item.threshold == 0 ? '无门槛充电抵扣券' : '满'+selectObj.threshold.toFixed(2)+'元可用'}}
 							
 						</view>
 						<view class="condition">