扣费详情

apis/pagejs/deduction.js

@@ -59,8 +59,8 @@ import request from '@/apis/utils/request'
  	})
  }
  
- export function rechargeDetails(data) {
- 	var url='/mobile/tenant/rechargeDetails';
+ export function recordDetails(data) {
+ 	var url='/mobile/tenant/recordDetails';
  	return request({
  		method: 'post',
  		data: data,

pages/deductionRecord/deductionDetails.vue

@@ -4,12 +4,18 @@
 		<view class="background">
 			<view class="recharge-details">
 				<view class="headline">
-					<text>
-						<image class="img" src="@/assets/img/Copy PEokWS2 Copy 1@1x.png" mode=""></image>
-					</text>1月1日电费
+					<text v-if="tenantBalanceRecord.businessName">
+						<image class="img" v-if="tenantBalanceRecord.businessName.indexOf('水')>-1" src="@/assets/img/wImage@1x.png" mode=""></image>
+							<image class="img"  v-else-if="tenantBalanceRecord.businessName.indexOf('房')>-1||tenantBalanceRecord.businessName.indexOf('租')>-1" src="@/assets/img/wImage.png" mode=""></image>
+							<image class="img"  v-else-if="tenantBalanceRecord.businessName.indexOf('保洁')>-1" src="@/assets/img/wImage3.png" mode=""></image>
+							<image class="img" v-else-if="tenantBalanceRecord.businessName.indexOf('物业')>-1"  src="@/assets/img/wImage4.png" mode=""></image>
+							
+						<image class="img" v-else src="@/assets/img/Copy PEokWS2 Copy 1@1x.png" mode=""></image>
+						
+					</text>{{contractItem.paymentMethod=='1'?'':dayM(tenantBalanceRecord.createTime)}}{{tenantBalanceRecord.businessName}}
 				</view>
 				<view class="sum">
-					80.00
+					{{tenantBalanceRecord.amount}}
 				</view>
 				<view class="state">
 					已扣费
@@ -17,13 +23,13 @@
 				<view class="details">
 					<view class="item">
 						<view class="item-title">
-							租户信息
+							合同信息
 						</view>
 						<view class="item-value">
-							3~6楼联通公司
+							{{tenantContract.remark}}
 						</view>
 					</view>
-					<view class="item">
+					<view class="item" v-if="false">
 						<view class="item-title">
 							户号
 						</view>
@@ -31,22 +37,25 @@
 								00880088
 						</view>
 					</view>
-					<view class="item">
+					<view class="item" >
 						<view class="item-title">
 							收费标准
 						</view>
-						<view class="item-value">
-							1.3元/度
-						</view>
-					</view>
-					<view class="item">
-						<view class="item-title">
-							度数
-						</view>
-						<view class="item-value">
-							2314度
+						<view class="item-value" v-if="contractItem.id">
+							{{contractItem.price}}元{{contractItem.unit=='元'?'':'/'+contractItem.unit}}
 						</view>
 					</view>
+					<template v-if="tenantBalanceRecord.businessName=='电费'" >
+						<view class="item">
+							<view class="item-title">
+								度数
+							</view>
+							<view class="item-value">
+								{{tenantBalanceRecord.extraJson.kwh}}度(起止码{{tenantBalanceRecord.extraJson.startMeter}}-{{tenantBalanceRecord.extraJson.endMeter}})
+							</view>
+						</view>
+					</template>
+					
 				</view>
 				
 				<view class="details">
@@ -55,38 +64,38 @@
 							付款方式
 						</view>
 						<view class="item-value">
-							微信支付
+							{{tenantBalanceRecord.methodN}}
 						</view>
 					</view>
-					<view class="item">
+				<!-- 	<view class="item">
 						<view class="item-title">
 							订单号
 						</view>
 						<view class="item-value">
 					30816112557708460925
 						</view>
-					</view>
+					</view> -->
 					<view class="item">
 						<view class="item-title">
 							创建时间
 						</view>
 						<view class="item-value">
-							2023-08-20 10:29:00
+							{{tenantBalanceRecord.createTime}}
 						</view>
 					</view>
-					<view class="item">
+					<!-- <view class="item">
 						<view class="item-title">
 							支付时间
 						</view>
 						<view class="item-value">
 							2023-08-20 10:29:00
 						</view>
-					</view>
+					</view> -->
 				</view>
 			</view>
 		</view>
 		<!-- 返回 -->
-		<button class="back">返回</button>
+		<!-- <button class="back">返回</button> -->
 	</view> 
 </template>
 
@@ -96,7 +105,10 @@
 	export default {
 		data() {
 			return {
-				id:''
+				id:'',
+				tenantBalanceRecord:{},
+				contractItem:{},
+				tenantContract:{}
 			}
 		},
 		onLoad(op){
@@ -106,17 +118,28 @@
 			this.getRechargeDetails()
 		},
 		methods: {
+			dayM(time){
+				if(!time){
+					return ''
+				}
+				var day=new Date(new Date(time).getTime()-1)
+				return (day.getMonth()+1)+"月"+day.getDate()+"日"
+			},
 			getRechargeDetails(){
 				uni.showLoading({
 					title: "加载中",
 					mask: true,
 				})
 				
-				API.rechargeDetails({
+				API.recordDetails({
 					id:this.id
 				}).then((response) => {
 					uni.hideLoading();
 					
+					this.contractItem=response.data.contractItem;
+					
+					this.tenantContract=response.data.tenantContract;
+					this.tenantBalanceRecord=response.data.tenantBalanceRecord;
 				}).catch(error => {
 					uni.hideLoading();
 					uni.showToast({
@@ -131,14 +154,11 @@
 
 <style lang="scss" scoped>
 	.background{
-		position: relative;
-		height: 200px;
+		
 		background: linear-gradient(180deg, rgba(203,234,255,1) 0%,rgba(203,234,255,0) 100%);
+		padding: 40rpx 32rpx ;
 		.recharge-details{
-			position: absolute;
-			top: 24rpx;
-			left: 32rpx;
-			right: 32rpx;
+		
 			background-color: #fff;
 			border-radius: 8px;
 			padding: 40rpx 32rpx ;
@@ -193,9 +213,6 @@
 	 background-color: rgba(255,255,255,1);
 	 color: rgba(119,119,119,1);
 	 font-size: 32rpx;
-	 position: absolute;
-	 top: 970rpx;
-	 left: 32rpx;
-	 right: 32rpx;
+	
  }
 </style>

pages/deductionRecord/deductionRecord.vue

@@ -16,7 +16,7 @@
 				1000.00<text class="unit">元</text>
 			</view> -->
 			<view class="chart">
-				<view id="pieEcharts" style="min-height:240px;">
+				<view id="pieEcharts" >
 				
 				</view>
 			</view>
@@ -45,10 +45,10 @@
 			@click="gotoUrl('/pages/deductionRecord/deductionDetails?id='+item.id)"
 			:key="i" >
 				<view class="icon">
-					<image class="img" v-if="item.remark.indexOf('水')>-1" src="@/assets/img/wImage@1x.png" mode=""></image>
-						<image class="img"  v-else-if="item.remark.indexOf('房')>-1||item.remark.indexOf('租')>-1" src="@/assets/img/wImage.png" mode=""></image>
-						<image class="img"  v-else-if="item.remark.indexOf('保洁')>-1" src="@/assets/img/wImage3.png" mode=""></image>
-						<image class="img" v-else-if="item.remark.indexOf('物业')>-1"  src="@/assets/img/wImage4.png" mode=""></image>
+					<image class="img" v-if="item.businessName.indexOf('水')>-1" src="@/assets/img/wImage@1x.png" mode=""></image>
+					<image class="img"  v-else-if="item.businessName.indexOf('房')>-1||item.businessName.indexOf('租')>-1" src="@/assets/img/wImage.png" mode=""></image>
+					<image class="img"  v-else-if="item.businessName.indexOf('保洁')>-1" src="@/assets/img/wImage3.png" mode=""></image>
+					<image class="img" v-else-if="item.businessName.indexOf('物业')>-1"  src="@/assets/img/wImage4.png" mode=""></image>
 						
 					<image class="img" v-else src="@/assets/img/Copy PEokWS2 Copy 1@1x.png" mode=""></image>
 				</view>

pages/recharge/rechargeRecord.vue

@@ -4,7 +4,7 @@
 		<!-- 折线图 -->
 		<view class="chart-box">
 			<view class="chart">
-				<view id="pieEcharts" style="min-height:240px;">
+				<view id="pieEcharts" >
 				
 				</view>
 			</view>