“已确认”订单增加“取消预约”功能

pages/user/myReservation/myReservation.vue

@@ -22,7 +22,7 @@
 			<view class="station-name ellipsis">
 				{{item.stationName}}/{{item.deviceName}}
 				<view class="toBe-confirmed btn" v-if="item.status == '0'">{{item.statusText}}</view>
-				<view class="confirmed btn" v-if="item.status == '1'">{{item.statusText}}</view>
+				<view class="confirmed btn" v-if="item.status == '1'">已确认</view>
 				<view class="canceled btn" v-if="item.status == '3'">{{item.statusText}}</view>
 				<view class="have-expired btn" v-if="item.status == '9'">{{item.statusText}}</view>
 				<view class="confirmed btn" v-if="item.status == '2'">{{item.statusText}}</view>
@@ -77,6 +77,7 @@
 			</view>
 			<view class="button" v-if="item.status == '1'">
 				<u-button class="navigation" shape="circle" @click="gotoUrl('pages/searchPile/stationAndPile/stationDetailsMap?stationId='+item.stationId)">导航</u-button>
+				<u-button class="cancel" shape="circle" @click="refuseClick(item)">取消预约</u-button>
 			</view>
 			<view class="button" v-if="item.status == '2'">
 				<u-button class="check" shape="circle" @click="gotoUrl('pages/user/myReservation/reservationListDetails?id='+item.id)">查看详情</u-button>
@@ -109,8 +110,8 @@
 				navBarHeight:44,
 				statusList: [
 					{id:"",name:"全部预约单"},
+					{id:"1",name:"已确认"},
 					{id:"0",name:"待确认"},
-					{id:"1",name:"已预约"},
 					{id:"2",name:"已完成"},
 					{id:"3",name:"已取消"},
 					{id:"4",name:"已拒绝"},

pages/user/myReservation/reservationListDetails.vue

@@ -146,11 +146,12 @@
 		 @click="regChangeStatus()"
 		 class="cancel-btn">取消预约</u-button>
 		</view>
-		<view class="bottom" v-if="detail.status==1" >
+		<view class="bottom2" v-if="detail.status==1" >
 		<!-- 	<u-button shape='circle' class="refuse-btn">拒绝</u-button>
 			<u-button type="success" shape='circle'>确认</u-button>
 			 --><!-- 删除订单按钮 -->
-		 <u-button shape='circle' type="success" @click="charge" >开始充电</u-button>
+			<u-button size="medium" shape='circle' @click="regChangeStatus()" class="cancel-btn">取消预约</u-button>
+			<u-button size="medium" shape='circle' type="success" @click="charge" >开始充电</u-button>
 		</view>
 	</view>
 </template>
@@ -458,4 +459,26 @@
 			// 	color: #666666
 			// }
 		}
+		.bottom2{
+			width: 100%;
+			height: 56px;
+			position: fixed;
+			bottom: 0;
+			background-color: #fff;
+			display: flex;
+			.refuse-btn{
+				background-color: #DBDBDB;
+			}
+			.u-btn{
+				height: 40px;
+				margin: auto;
+				font-size: 18px;
+				
+			}
+			// .cancel-btn{
+			// 	width: 91.4%;
+			// 	background-color: #dbdbdb;
+			// 	color: #666666
+			// }
+		}
 </style>