公摊显示问题

pages/deductionRecord/deductionDetails.vue

@@ -43,7 +43,7 @@
 							00880088
 						</view>
 					</view>
-					<view class="item">
+					<view class="item" v-if="tenantBalanceRecord.remark=='电费'">
 						<view class="item-title">
 							收费标准  
 						</view>
@@ -168,11 +168,13 @@
 								<!-- <td></td> -->
 								<td class="td3" >{{tenantBalanceRecord.extraJson.childSumKwh}}度</td>
 							</tr>
+							
 							<tr>
 								<td class="td1">公摊电量</td>
 								<!-- <td></td> -->
 								<td class="td3" >{{(tenantBalanceRecord.extraJson.sharedKwh)}}度</td>
 							</tr>
+							
 							<tr>
 								<td class="td1">租用总面积</td>
 								<!-- <td></td> -->
@@ -193,6 +195,11 @@
 								<!-- <td></td> -->
 								<td class="td3" >{{tenantBalanceRecord.extraJson.allocationRatio}}</td>
 							</tr>
+							<tr >
+								<td class="td1">电价</td>
+								<!-- <td></td> -->
+								<td class="td3" >{{tenantBalanceRecord.extraJson.price}}元/度</td>
+							</tr>
 						<tr style="font-weight: bold;color:#fff;background-color:#307af6 ;" >
 							
 								<td class="td1">租户公摊电量</td>

pages/deductionRecord/deductionRecord.vue

@@ -316,7 +316,14 @@
 			},
 			extraInfoText(extraInfo){
 				var obj=JSON.parse(extraInfo)
-				return  `起止码${obj.startMeter}-${obj.endMeter};<br/>合计${obj.kwh}度`
+				if(obj.sharedKwh!=null){
+					return  `租户公摊电量合计${obj.tenantSharedKwh}度`
+					
+				}else{
+					return  `起止码${obj.startMeter}-${obj.endMeter};<br/>合计${obj.kwh}度`
+					
+				}
+				
 				
 			},
 			selector2confirm(e){

pages/statistics/statistics.vue

@@ -689,7 +689,7 @@
 							var item=tenant1.contractItemList[k]
 							//console.log(item.prepaidEndTime)
 							
-							if(item.paymentMethod==1){
+							if(item.paymentMethod==1&&item.name!='电费'){
 								if(item.prepaidEndTime&&this.stateBl(item.prepaidEndTime)){
 									bl=true;
 								}

pages/tenantList/contractList.vue

@@ -60,7 +60,7 @@
 				</view>
 				<view>
 					<view  class="deadline" v-for="(obj,i) in tenant.tenantContractList" :key="i">
-					<view class="deadline-item"  v-for="(item,i) in obj.contractItemList" :key="i" v-if="item.paymentMethod==1" >
+					<view class="deadline-item"  v-for="(item,i) in obj.contractItemList" :key="i" v-if="item.paymentMethod==1&&item.name!='电费'" >
 						<view class="item-icon">
 							
 							<image class="img" v-if="item.name.indexOf('水')>-1" src="@/assets/img/deadline2.png" mode=""></image>
@@ -158,7 +158,7 @@
 							
 							var item=tenant1.contractItemList[k]
 							//console.log(item.prepaidEndTime)
-							if(item.paymentMethod==1){
+							if(item.paymentMethod==1&&item.name!='电费'){
 								if(item.prepaidEndTime&&this.stateBl(item.prepaidEndTime)){
 									bl=true;
 								}