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

apis/apointment.js

@@ -17,4 +17,22 @@ import request from '@/utils/request'
  		data: data,
  		url: '/mobile/chargingAppointment/submitAppointment'
  	})
- }
+ }
+ 
+export function myAppointmentDetail(data) {
+ 	return request({
+ 		method: 'get',
+ 		data: data,
+ 		url: '/mobile/chargingAppointment/myAppointmentDetail'
+ 	})
+ }
+
+export function regChangeStatus(data) {
+ 	return request({
+ 		method: 'get',
+ 		data: data,
+ 		url: '/mobile/chargingAppointment/regChangeStatus'
+ 	})
+ }
+
+

pages/searchPile/stationAndPile/stationDetails.vue

@@ -40,9 +40,12 @@
 				</view>
 -->
 
-				<view class="iconfont address-font" >
-						&#xe60c;
-						<label class="view-map" style="text-align: center;">查看地图</label>
+				<view class="address-box">
+					<view class="iconfont address-font" >
+							&#xe60c;
+							
+					</view>
+					<view class="view-map" style="text-align: center;">导航</view>
 				</view>
 			
 				
@@ -82,9 +85,9 @@
 						{{info.park.price}}
 					</view>
 				</view>
-				<view class="text3">
+				<!-- <view class="text3">
 					仅供参考，以停车场实际价格为准
-				</view>
+				</view> -->
 			</view>
 		</view> 
 		
@@ -145,7 +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 v-if="item1.isAppointment"> -->
+					<view>
 						<u-button class="buttonAppointment" shape="circle" size="small" @click="book(item1)">预约</u-button>
 					</view>
 				</view>			
@@ -565,7 +569,6 @@
 		.station-address {
 			width: 100%;
 			height: 40px;
-			line-height: 40px;
 			margin-top: 17px;
 			position: relative;
 
@@ -588,24 +591,25 @@
 /*				font-size: 12px*/
 			}
 			
-			.address-font {
-				@include themeify{
-					font-size: themed('font-size9');
-/*					line-height: themed('font-size15');
-					height: themed('font-size15');*/
- 				}
-/*				font-size: 28px;*/
-				color: #4e94ff;
-				position: absolute;
-				top: 0;
-				right: 0;
- 				.view-map{
-					@include themeify{
-						font-size: themed('font-size1');
-/*						line-height: themed('font-size2');
-						height: themed('font-size2'); */
-					}
-				}
+			.address-box {
+						
+			/*				font-size: 28px;*/
+							color: #4e94ff;
+							position: absolute;
+							top: 0;
+							right: 0;
+							.address-font{
+								@include themeify{
+									font-size: themed('font-size8');
+								}
+							}
+			 				.view-map{
+								@include themeify{
+									font-size: themed('font-size1');
+			/*						line-height: themed('font-size2');
+									height: themed('font-size2'); */
+								}
+							}
 				
 			}
 			
@@ -731,11 +735,11 @@
 			
 		}
 		.text4{
-			margin-left: 72px;
+			// margin-left: 72px;
 /*			font-size: 12px;
 			line-height: 20px;*/
 			@include themeify{
-				font-size: themed('font-size1');
+				font-size: themed('font-size3');
 				line-height: themed('font-size5');
 			}
 			color: rgba(102, 102, 102, 100);
@@ -954,6 +958,7 @@
 		padding: 12px 16px;
 		display: flex;
 		justify-content: space-between;
+		z-index: 9999;
 		.button1{
 			width: 44%;
 			height: 32px;