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

pages/searchPile/stationAndPile/stationDetails.vue

@@ -19,19 +19,21 @@
 				<view class="sign-2" v-if="stationDetail.station.tagList.length != 0" 
 					v-for="(tagName,tagIndex) in stationDetail.station.tagList" :key="tagIndex">{{tagName}}</view>
 			</view>
-			<view class="infos-item between" @click="map">
+			<view class="infos-item between oldTextjp2" oldstyle="font-size: 16px;" @click="map">
 				
 				<view class="position">
-					<view class="img-box oldTextjp" oldstyle="font-size: 18px;"><img src="../../../assets/img/riLine-navigation-line.svg" alt=""></view>
+					<view class="img-box"><img src="../../../assets/img/riLine-navigation-line.svg" alt=""></view>
 					{{stationDetail.station.address}}</view>
-				<view class="distance oldTextjp2" oldstyle="font-size: 18px;">
+				<view class="distance" v-if="stationDetail.station.distance">
 				{{stationDetail.station.distance!=null&&stationDetail.station.distance>0.1 ? stationDetail.station.distance.toFixed(1)+'公里':'小于100米'}}<text class="iconfont">&#xe600;</text></view>
+				<view class="distance" v-else>
+					定位中<text class="iconfont">&#xe600;</text></view>
 			</view>
-			<view class="infos-item oldTextjp2" oldstyle="font-size: 18px;" v-if="stationDetail.station.describe">
+			<view class="infos-item oldTextjp2" oldstyle="font-size: 16px;" v-if="stationDetail.station.describe">
 				<view class="date"><text><img src="../../../assets/img/riLine-map-pin-time-line.svg" alt=""></text>
 				{{stationDetail.station.describe}}</view>
 			</view>
-			<view class="infos-item between oldTextjp2" oldstyle="font-size: 18px;" @click="parkingTips=true">
+			<view class="infos-item between oldTextjp2" oldstyle="font-size: 16px;" @click="parkingTips=true">
 				<view class="park"><text><img src="../../../assets/img/riLine-parking-box-line.svg" alt=""></text>
 				{{stationDetail.station.parkingDescription}}</view>
 				<view class="iconfont park-font">
@@ -43,7 +45,7 @@
 				confirm-text="知道了" confirm-color="#53b56b">
 				<view style="padding: 15px;" v-html="stationDetail.station.parkingSimpleDescription"></view>
 			</u-modal>
-			<view class="infos-item between oldTextjp2" oldstyle="font-size: 18px;">
+			<view class="infos-item between oldTextjp2" oldstyle="font-size: 16px;">
 				<view class="date"><text><img src="../../../assets/img/riLine-charging-pile-line Copy.svg" alt="">
 				</text>{{(stationDetail.station.type.indexOf('1')>=0?'直流快充':'')}}{{(stationDetail.station.type.indexOf(',')>=0?'/':'')}}{{(stationDetail.station.type.indexOf('2')>=0?'交流慢充':'')}}</view>
 				<view class="free">