费用说明处理

pages/charge/index.vue

@@ -126,7 +126,7 @@
 					 <p>充电{{listTypeIndex==0?'时长':'金额'}} <span style="color:#1677FF;margin-left:10px ">{{getListName()}}</span>
 					 
 					 </p>
-					 <view class="u-flex" style="     color: #1677ff;
+					 <view class="u-flex"  v-if="detail.templateCode!=3" style="     color: #1677ff;
     margin-right: 5px;" @click="showTips()">
 						<span>费用说明</span>
 						<u-icon name="error-circle" color="#1677ff" size="32"></u-icon>
@@ -189,10 +189,14 @@
 			
 				<!-- <p v-for="(item,i) in detail.priceList" class="showPriceList" :key="i">{{item.minPower}}W-{{item.maxPower}}W
 					<span>{{item.price}}元每小时</span></p> -->
-
-				<p style="    padding: 20rpx;" v-if="detail.roundingMinute!=null&&detail.roundingMinute!=-1">
-					超过{{detail.roundingMinute}}分钟，按1小时记，不足{{detail.roundingMinute}}分钟，不计费</p>
-				<p style="    padding: 20rpx;" v-if="detail.priceList.length==0">无费用说明或为免费充电模式</p>
+				<p style="    padding: 20rpx;" v-if="(detail.electricityPrice&&detail.servicePrice)">
+				电费单价：{{detail.electricityPrice}}元/千瓦时;服务费单价：{{detail.servicePrice}}元/千瓦时	</p>
+				<template v-else>
+					<p style="    padding: 20rpx;" v-if="detail.roundingMinute!=null&&detail.roundingMinute!=-1">
+						超过{{detail.roundingMinute}}分钟，按1小时记，不足{{detail.roundingMinute}}分钟，不计费</p>
+					
+				</template>
+			
 			</view>
 		</u-modal>
 

pages/index/index.vue

@@ -47,8 +47,8 @@
 					{{item.updateTime}}{{item.remark?':'+item.remark:''}}
 				</view>
 				<view class="chargeTime" v-if="item.status==1">
-					<p v-if="item.templateCode==3" v-show="item.estimateFee<=5">预充金额:{{item.estimateFee?item.estimateFee+'元':'充满自停'}}</p>
-					<p v-else >剩余时长<span>({{getPercent(item).time}})</span></p>
+					<p v-if="item.templateCode==3&&item.estimateFee<=5">预充金额:{{item.estimateFee?item.estimateFee+'元':'充满自停'}}</p>
+					<p v-if="item.templateCode!=3" >剩余时长<span>({{getPercent(item).time}})</span></p>
 					
 					<u-line-progress v-if="(item.templateCode==3&&item.estimateFee<=5)||item.templateCode!=3" active-color="#ececec" height="48" :percent="getPercent(item).percent">
 						<div style="     
@@ -90,7 +90,7 @@
 					<view class="chargeBtn-item" v-if="item.status==1||item.status==0" @click="returnMoney(item)">终止并退款
 					</view>
 					<view class="chargeBtn-item" v-if="item.status==2" @click="f5(true)">刷新</view>
-					<view class="chargeBtn-item" @click="showTips(item)">费用说明</view>
+					<view class="chargeBtn-item" v-if="item.templateCode!=3" @click="showTips(item)">费用说明</view>
 				</view>
 
 				<view class="chargeNext">{{i+1}}/{{list.length}}</view>
@@ -100,11 +100,14 @@
 
 
 		</swiper>
-		<u-modal v-model="showmodel" title="费用说明">
-			<p v-if="showitem.length==0">当前为免费充电桩</p>
+		<u-modal v-model="showmodel" title="费用说明">
+			
+			
 			<p v-for="(item,i) in showitem" class="showmodel" :key="i">{{item.minPower}}W-{{item.maxPower}}W
-				<span>{{item.price}}元每小时</span></p>
-
+				<span>{{item.price}}元每小时</span></p>
+				
+			<p style="    padding: 20rpx;" v-if="(showObj.electricityPrice&&showObj.servicePrice)">
+			电费单价：{{showObj.electricityPrice}}元/千瓦时;服务费单价：{{showObj.servicePrice}}元/千瓦时	</p>
 
 		<p style="    padding: 15px;" v-if="roundingMinute!=null&&roundingMinute!=-1">超过{{roundingMinute}}分钟，按1小时记，不足{{roundingMinute}}分钟，不计费</p>
 			<p style="    padding: 15px;" v-if="showitem.length==0">无费用说明或为免费充电模式</p>
@@ -128,7 +131,8 @@
 				k: 0,
 				id: "",
 				current: "0",
-				showmodel: false,
+				showmodel: false,
+				showObj:{},
 				showitem: [],
 				percent: 0,
 				list: [],
@@ -289,7 +293,7 @@
 					this.roundingMinute=5;
 				}
 				this.showitem = item.chargingPriceList;
-				
+				this.showObj=item
 			},
 			returnMoney(item) {