调整

pages/deductionRecord/deductionDetails.vue

@@ -45,12 +45,57 @@
 					</view>
 					<view class="item">
 						<view class="item-title">
-							收费标准
+							收费标准  
 						</view>
-						<view class="item-value" v-if="contractItem.id">
-							{{contractItem.price}}{{contractItem.unit}}
+						<view class="item-value" v-if="contractItem.id">
+							<template v-if="tenantBalanceRecord.extraJson.chargeType=='2'">
+								
+							</template>
+							<template v-else>
+								{{contractItem.price}}{{contractItem.unit}}
+							</template>
 						</view>
-					</view>
+					</view>
+					<template v-if="tenantBalanceRecord.extraJson.chargeType=='2'">
+						<table class="table1" >
+							<tr class="tr1">
+								<td class="td1">类型</td>
+								<td>度数</td>
+								<td>价格({{contractItem.unit}})</td>
+								<td>金额</td>
+							</tr>
+							<tr>
+								<td class="td1">峰</td>
+								<td class="td3">{{tenantBalanceRecord.extraJson.fengKwh}}</td>
+								
+								<td >{{tenantBalanceRecord.extraJson.fengPrice}}</td>
+								<td class="td3">{{tenantBalanceRecord.extraJson.fengFee}}</td>
+							</tr>
+							<tr>
+								<td class="td1">谷</td>
+								<td class="td3">{{tenantBalanceRecord.extraJson.guKwh}}</td>
+								<td >{{tenantBalanceRecord.extraJson.guPrice}}</td>
+								
+								<td class="td3">{{tenantBalanceRecord.extraJson.guFee}}</td>
+							</tr>
+							<tr>
+								<td class="td1">平</td>
+								<td class="td3">{{tenantBalanceRecord.extraJson.pingKwh}}</td>
+								<td >{{tenantBalanceRecord.extraJson.pingPrice}}</td>
+								<td class="td3">{{tenantBalanceRecord.extraJson.pingFee}}</td>
+								
+							</tr>
+							<tr>
+								<td class="td1">尖</td>
+								<td class="td3">{{tenantBalanceRecord.extraJson.jianKwh}}</td>
+								<td >{{tenantBalanceRecord.extraJson.jianPrice}}</td>
+								<td class="td3">{{tenantBalanceRecord.extraJson.jianFee}}</td>
+								
+							</tr>
+						</table>
+						
+					</template>
+					
 					<template v-if="tenantBalanceRecord.businessName=='电费'&&tenantBalanceRecord.extraJson">
 						
 						
@@ -196,7 +241,7 @@
 
 <style lang="scss" scoped>
 	.table1{
-	
+		margin: 8rpx 0;
 		width: 100%;
 		   border-collapse: collapse;
 		td{

pages/mine/electronicMonitoring.vue

@@ -649,9 +649,9 @@
 							 var obj=list[name]
 							 var text= `<p>${name}</p>`
 							
-							// if(obj.electricityPrice!=undefined){
-							// 	text+=`<p>电价：${obj.electricityPrice}元/度</p>`
-							// }
+							if(obj.electricityPrice!=undefined){
+								text+=`<p>电价：${obj.electricityPrice}元/度</p>`
+							}
 							if(obj.kwh!=undefined){
 								text+=`<p>电量：${obj.kwh}度</p>`
 							}