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

pages/record/details.vue

@@ -4,54 +4,80 @@
 		<view class="details">
 			<view class="details-head">
 				<u-icon name="charging-pile-fill" custom-prefix="custom-icon" color="#27B148" size="48"></u-icon>
-				<h4>荆鹏软件园充电站</h4>
+				<h4>{{chargeDetail.stationName}}</h4>
 			</view>
 			<view class="details-main">
 				<view class="details-price">
-					<span>￥</span><h3>15.00</h3><span>元</span>
+					<span>￥</span><h3>{{chargeDetail.actualFee != null ? chargeDetail.actualFee : '0.00'}}</h3><span>元</span>
 				</view>
 				<p>订单总额</p>
 			</view>
-			<view class="details-row"><p>电费(元)</p><span>￥400.00</span></view>
-			<view class="details-row"><p>服务费(元)</p><span>￥100.00</span></view>
+			<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>
 		<view class="details">
 			<view class="details-title">
 				<h4>充电详情</h4>
 			</view>
-			<view class="details-row"><p>消费电量(kW-h)</p><span>40.000</span></view>
-			<view class="details-row"><p>开始时间</p><span>2022-05-01 10:00:00</span></view>
-			<view class="details-row"><p>结束时间</p><span>2022-05-01 11:59:59</span></view>
-			<view class="details-row"><p>充电时长</p><span>1小时59分59秒</span></view>
+			<view class="details-row"><p>消费电量(kW-h)</p><span>{{chargeDetail.electricQuantity != null ? chargeDetail.electricQuantity : '0.000'}}</span></view>
+			<view class="details-row"><p>开始时间</p><span>{{chargeDetail.startTime}}</span></view>
+			<view class="details-row"><p>结束时间</p><span>{{chargeDetail.endTime}}</span></view>
+			<view class="details-row"><p>充电时长</p><span>{{chargeDetail.chargingMinute != null ? chargeDetail.chargingMinute+'分' : '00分00秒'}}</span></view>
 		</view>
 		<view class="details">
 			<view class="details-title">
 				<h4>更多信息</h4>
 			</view>
-			<view class="details-row"><p>结束原因</p><span>用户手动结束</span></view>
-			<view class="details-row"><p>订单状态</p><span>已缴费</span></view>
-			<view class="details-row"><p>充电桩编号</p><span>A000152</span></view>
-			<view class="details-row"><p>更新时间</p><span>2022-05-01 12:00:00</span></view>
-			<view class="details-row"><p>充电车辆</p><span>鄂D999999</span></view>
+			<view class="details-row"><p>结束原因</p><span>{{chargeDetail.remark}}</span></view>
+			<view class="details-row"><p>订单状态</p><span>{{chargeDetail.statusText}}</span></view>
+			<view class="details-row"><p>充电桩编号</p><span>{{chargeDetail.deviceNo}}</span></view>
+			<view class="details-row"><p>更新时间</p><span>{{chargeDetail.updateTime}}</span></view>
+			<view class="details-row"><p>充电车辆</p><span>{{chargeDetail.carNumber}}</span></view>
 		</view>
 		<view class="detailsBtn">
-			<u-button class="detailsBtn-btn" type="primary" shape="circle" plain>返回</u-button>
+			<u-button class="detailsBtn-btn" type="primary" shape="circle" plain @click="toHome">返回主页</u-button>
 		</view>
 	</view>
 </template>
 
 <script>
+	import * as API from '@/apis/index.js'
+	
 	export default {
 		data() {
 			return {
-				form: {
-					name: '',
-					intro: '',
-				},
+				id: '',
+				chargeDetail: {},
+			}
+		},
+		onLoad(op) {
+			if(op.id) {
+				this.id = op.id;
+				this.getchargingDetail();
 			}
 		},
 		methods: {
-
+			toHome() {
+				uni.navigateTo({
+					url: '/pages/index/index'
+				})
+			},
+			getchargingDetail() {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})		
+				API.chargingDetail(this.id).then((res) => {
+					uni.hideLoading();
+					
+					this.chargeDetail = res.data.chargingRecord;
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			}
 		}
 	}
 </script>

pages/record/index.vue

@@ -11,18 +11,18 @@
 			<view class="recordList">
 				<view class="recordList-item" v-for="(item,index) in chargeList" :key="item.id" @click="gotoUrl('pages/record/details?id=' + item.id)">
 					<view class="recordList-name">
-						<h4>荆鹏软件园充电站/A0001</h4>
-						<span class="state1">排队中</span>
+						<h4>{{item.stationName}}/{{item.deviceNo}}</h4>
+						<span class="state1">{{item.statusText}}</span>
 					</view>
 					<view class="recordList-row">
-						<p>开始时间：2022-05-05 12:00:00</p>
+						<p>开始时间：{{item.status == '0' || item.status == '4' ? '暂未开始' : item.createTime}}</p>
 					</view>
 					<view class="recordList-row">
-						<p>充电电量：20.000kW-h</p>
+						<p>充电电量：{{item.electricQuantity != null ? item.electricQuantity : '0.000'}}kW-h</p>
 					</view>
 					<view class="recordList-row">
-						<p>充电时长：10分20秒</p>
-						<h4>61.50</h4>
+						<p>充电时长：{{item.chargingMinute != null ? item.chargingMinute+'分' : '00分00秒'}}</p>
+						<h4>{{item.actualFee != null ? item.actualFee : '0.00'}}</h4>
 					</view>
 				</view>
 			</view>
@@ -86,7 +86,7 @@
 				API.chargingRecordData({
 					pageIndex: 1,
 					pageSize: 100,
-					month: this.dateMonth,
+					// month: this.dateMonth,
 				}).then((res) => {
 					uni.hideLoading();