调整

pages/searchPile/stationAndPile/chargingPileDetails.vue

@@ -295,13 +295,13 @@
 			},
 			charge() {
 				//this.role()
-				if (this.isReady) {
+				
 					uni.navigateTo({
 						url: '/pages/searchPile/chargeProcess/charge?stationId=' + this.detail.stationId +
 							'&deviceNo=' + this.detail.deviceNo + "&gun=" + this.gun.channelNo + "&carNumber=" + (
 								this.car ? this.car.carNum : '')
 					})
-				}
+				
 
 			},
 			isInsertBtn(){

pages/searchPile/stationAndPile/stationDetails.vue

@@ -25,7 +25,7 @@
 			</view>
 			 <view class="details-item">
 				<text class="iconfont font5" style="color: #ffad79;">&#xe621;</text>
-				 <text class="item-text"> {{info.station.time}}</text>
+				 <text class="item-text"> {{stationDetail.station.describe}}</text>
 			</view> 
 			<view class="station-address" @click="map">
 				<img src="static/img/Frame 201.png" alt="">
@@ -64,12 +64,15 @@
 			
 			<view class="item"  v-for="(item,i) in device.gunList" :key="i+'_'+index"  >
 					
-					<view :class="{
+					<view 
+					:style="getItem(item,device).length>3?' padding: 0 10px':(getItem(item,device).length==3?'padding: 4px;':'padding: 8px;')"
+					:class="{
 						free:true,
 						charging:item.enableShare&&item.workStatus!=0,
 						'not-open':!(item.enableShare&&device.online)
+						
 					}">
-						{{!device.online?('离线'):(item.enableShare&&device.online?item.workStatusText:'暂不开放')}}
+						{{getItem(item,device)}}
 					</view>
 					<view class="info">
 						<view class="name">
@@ -81,11 +84,11 @@
 					</view>
 					<template v-if="item.enableShare&&device.online">
 						<view class="tag" v-if="item.workStatus != 2 ">
-							<view class="tag-item"  @click="book(item,item.isAppointment&&item.enableAppointment)" :class="item.isAppointment&&item.enableAppointment?'':'not-open-tag'">
+							<view class="tag-item"  v-if="item.enableAppointment" @click="book(item,item.isAppointment)" :class="item.isAppointment?'':'not-open-tag'">
 								预约
 							</view>
 							<view class="tag-item"  @click="book2(item,item.enableShare)"   :class="item.enableShare?'':'not-open-tag'" >
-								解锁
+								充电
 							</view>
 						</view>
 						<view class="persent" v-else>
@@ -415,6 +418,10 @@
 			 
 		},
 		methods:{
+			getItem(item,device){
+				
+				return !device.online?('离线'):(item.enableShare&&device.online?item.workStatusText:'暂不开放')
+			},
 			change(index) {
 				this.current = index;
 				this.items = this.list[index].items;
@@ -1138,7 +1145,9 @@
 			display: flex;
 			border-bottom: 1px solid rgba(238, 242, 240, 100);
 			.free{
-				width: 13.8vw;
+				
+			
+				 max-width: 50px;
 				display: flex;
 				align-items: center;
 				justify-content: center;

pages/user/myReservation/reservationListDetails.vue

@@ -167,6 +167,7 @@
 	export default {
 		data() {
 			return {
+				gunNo:"",
 				deviceNo:"",
 				channelNo:"",
 				carNumber:"",
@@ -216,7 +217,7 @@
 			},
 			charge(){
 				uni.navigateTo({
-					url:'/pages/searchPile/stationAndPile/chargingPileDetails?id='+this.detail.gunNo
+					url:'/pages/searchPile/stationAndPile/chargingPileDetails?isback=1&id='+this.gunNo
 				})
 			},
 			regChangeStatusSuccess(){
@@ -280,6 +281,7 @@
 					this.deviceNo = this.chargingDevice.deviceNo;
 					this.channelNo = res.data.channelNo;
 					this.carNumber = res.data.carNumber;
+					this.gunNo = res.data.gunNo;
 								
 								
 					if(this.detail.status=="0"){