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

pages/searchPile/stationAndPile/stationDetails.vue

@@ -148,8 +148,8 @@
 							{{item1.workStatus != 2 ?item1.workStatusText: (item1.soc!=null? (item1.workStatusText + ' SOC ' + item1.soc.toFixed(1)+'%'):item1.workStatusText)}}
 						</view>
 					</view>
-					<!-- <view v-if="item1.isAppointment"> -->
-					<view>
+					<view v-if="item1.isAppointment">
+					
 						<u-button class="buttonAppointment" shape="circle" size="small" @click="book(item1)">预约</u-button>
 					</view>
 				</view>			

pages/user/myReservation/reservationListDetails.vue

@@ -13,6 +13,10 @@
 				预留{{detail.reserveMinutes}}分钟
 				<view class="img-box" v-if="detail.status==1">
 					<img src="@/assets/img/finished.png" alt="">
+					<!-- 已取消 -->
+					<!-- <img src="../../../static/img/canc.png" alt=""> -->
+					<!-- 已完成-->
+					<!-- <img src="../../../static/img/f.png" alt=""> -->
 				</view>
 			</view>
 			<!-- 已取消/已拒绝 -->