多设备同时充电情况

.env.dev.js

@@ -1,7 +1,7 @@
 const UNI_APP = {  
 	ProjectName :"51充电联盟",
-	//BASE_URL: 'https://51team.xiaoxinda.com/charging-station-server/',
-	BASE_URL: 'https://charging.xiaoxinda.com/charging-station-test/',
+	BASE_URL: 'https://51team.xiaoxinda.com/charging-station-server/',
+	//BASE_URL: 'https://charging.xiaoxinda.com/charging-station-test/',
 	//BASE_URL: 'http://192.168.77.162:8081/charging-station/' ,
 	PARK_URL: 'https://51team.xiaoxinda.com/charging-parking/' ,
 	NODE_ENV :"dev",
@@ -12,8 +12,8 @@ const UNI_APP = {
 	
 	openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",//zkx
 	//openId:"oK9Wr59rru-i3bm7dtTtxnkR-i4s",//杨所
-	//openId:"oK9Wr5zv8lvirni3txbxRkmpg8d0",//
-	
+	//openId:"oK9Wr56vX9nP_B56_Pyigg5n5Ce8",//
+	openId:"oK9Wr5_2USr1yP4MRew9KbJA0-ng",//老板
 	
 	//openId:"oK9Wr58zNwDernF0TL6o3mdUxk2A",
 	//		openId:"oK9Wr5xRUoP9EygZqBec0xkJMVTs",

pages/index/index.vue

@@ -433,12 +433,13 @@
 			@click="gotoUrl('pages/searchPile/chargeProcess/dcCharging?id=' + item.id)">
 			<view class="state-text">
 				<view class="text-1 oldTextjp" oldstyle="font-size: 20px;">
-					{{item.statusText}}
+					{{item.statusText}}	
 				</view>
 				<view v-if="item.status == '0'" class="text-2 oldTextjp2" oldstyle="font-size: 16px;">
 					启动中
 				</view>
 				<view v-if="item.status == '1'" class="text-2 oldTextjp2" oldstyle="font-size: 16px;">
+					<span v-if="item.carNumber&&chargeList.length>1">{{item.carNumber}}-</span> 
 					已充{{item.dueFee != null ? item.dueFee.toFixed(2) : '0.00'}}元
 				</view>
 				<!-- <view v-if="item.status == '2'" class="text-2" style="color: red;">
@@ -449,7 +450,7 @@
 					<span v-else >前方等待{{item.waitNum-1}}位</span>
 				</view>
 				<view class="text-3 oldTextjp2" oldstyle="font-size: 16px;">
-				<p style=" width: 160%;">	{{item.stationName}}/{{item.deviceName}}&nbsp;&nbsp;当前电价{{item.chargingCostPrice.toFixed(2)}}元/度</p>
+				<p style=" width: 160%;">	{{item.stationName}}/{{item.deviceName}}枪{{item.channelNo}}&nbsp;&nbsp;当前电价{{item.chargingCostPrice.toFixed(2)}}元/度</p>
 				</view>
 			</view>
 			<view class="img-box" style="height: 110px;">
@@ -1663,7 +1664,7 @@
 	// 头部图片
 	img {
 		width: 100%;
-		height: 100%;
+		// height: 100%;
 		
 	}
      .background{
@@ -1932,13 +1933,13 @@
 		background-color: #ffffff;
 		height: 120px;
 		display: flex;
-		margin: 20px auto 0;
+		margin: 40rpx auto 0;
 		border-radius: 8px;
 		border: #F2F4F4 1px;
 
 		.state-text {
-			width: 61.8%;
-			padding: 24px 0 0 28px;
+			    min-width: 60%;
+			padding: 48rpx 0 0 56rpx;
 
 			.text-1 {
 				height: 16px;