定位

pages/index/index.vue

@@ -102,11 +102,17 @@
 
 				<view class="park">
 					<text class="park-p">p</text>
-					<text class="park-text">2小时免费停车</text>
+					<text class="park-text oldTextjp2" oldstyle="font-size: 14px;">2小时停车免费</text>
 				</view>
 				<view class="count">
-					<view class="count-left">空闲{{stationData.availableNum}}/总数{{stationData.totalNum}}</view>
-					<view class="count-right"><text class="iconfont">&#xe615;</text>{{stationData.distance}}公里</view>
+					<view class="count-left">
+						<span class="oldTextjp2" oldstyle="font-size: 16px;">空闲{{stationData.availableNum}}/</span>
+						<span class="oldTextjp" oldstyle="font-size: 16px;">总数{{stationData.totalNum}}</span>
+					</view>
+					<view class="count-right oldTextjp" oldstyle="font-size: 16px;" v-if="distance > 0.1">
+						<text class="iconfont">&#xe615;</text>{{distance.toFixed(1)}}公里</view>
+					<view class="count-right oldTextjp" oldstyle="font-size: 16px;" v-else>
+						<text class="iconfont">&#xe615;</text>小于100米</view>
 				</view>
 			</view>
 		</view>
@@ -114,13 +120,13 @@
 		<view class="location-box" v-if="message != 'getLocation:ok' && chargeList.length == 0">
 			<view class="location">
 				<view class="location-text">
-					<view class="text-1">
+					<view class="text-1 oldTextjp" oldstyle="font-size: 20px;">
 						定位中...
 					</view>
-					<view class="text-2">
+					<view class="text-2 oldTextjp2" oldstyle="font-size: 16px;">
 						授权定位后可查询附近充电站
 					</view>
-					<view class="text-3" @click="getPoint()">
+					<view class="text-3 oldTextjp2" oldstyle="font-size: 16px;" @click="getPoint()">
 						重新定位
 					</view>
 				</view>
@@ -136,22 +142,22 @@
 		<view class="state1 state" v-if="chargeList.length > 0" v-for="(item,index) in chargeList" :key="item.id"
 			@click="gotoUrl('pages/searchPile/chargeProcess/dcCharging?id=' + item.id)">
 			<view class="state-text">
-				<view class="text-1">
+				<view class="text-1 oldTextjp" oldstyle="font-size: 20px;">
 					{{item.statusText}}
 				</view>
-				<view v-if="item.status == '0'" class="text-2">
+				<view v-if="item.status == '0'" class="text-2 oldTextjp2" oldstyle="font-size: 16px;">
 					启动中
 				</view>
-				<view v-if="item.status == '1'" class="text-2">
+				<view v-if="item.status == '1'" class="text-2 oldTextjp2" oldstyle="font-size: 16px;">
 					已充{{item.dueFee != null ? item.dueFee : '0.00'}}元
 				</view>
 				<!-- <view v-if="item.status == '2'" class="text-2" style="color: red;">
 				超出时间将收取占位费
 			</view> -->
-				<view v-if="item.status == '4'" class="text-2">
+				<view v-if="item.status == '4'" class="text-2 oldTextjp2" oldstyle="font-size: 16px;">
 					前方等待{{item.waitNum}}位
 				</view>
-				<view class="text-3">
+				<view class="text-3 oldTextjp2" oldstyle="font-size: 16px;">
 					{{item.deviceName}}/<br />{{item.deviceNo}}
 				</view>
 			</view>
@@ -229,6 +235,7 @@
 		},
 		data() {
 			return {
+				distance: 0,
 				timeOut: false,
 				pointTimeOut: true,
 				stationData: {},
@@ -474,6 +481,10 @@
 							latitude: this.latitude
 						}).then((response) => {
 							this.stationData = response.data.data[0];
+							
+							var lnglat = new AMap.LngLat(this.longitude,this.latitude);
+							var myDistance = lnglat.distance([this.stationData.longitude,this.stationData.latitude]);
+							this.distance = myDistance/1000;
 						}).catch(error => {
 							uni.showToast({
 								title: error,

pages/searchPile/stationAndPile/stationDetails.vue

@@ -14,7 +14,9 @@
 			</view>
 			<view class="details-item">
 				<text class="iconfont font5" style="color: #4e94ff;">&#xe60e;</text> 
-				<text class="item-text">{{stationDetail.station.distance!=null ? stationDetail.station.distance.toFixed(3):''}}公里</text>
+				<text class="item-text">
+					{{stationDetail.station.distance!=null&&stationDetail.station.distance>0.1 ? stationDetail.station.distance.toFixed(1)+'公里':'小于100米'}}
+				</text>
 			</view>
 			<view class="details-item">
 				<text class="iconfont font5" style="color: #ffad79;">&#xe621;</text>

pages/user/index.vue

@@ -4,7 +4,7 @@
 			<view class="userHead-img">
 				<u-avatar :src="userId ? headImg : '../../assets/img/head.png'" size="96"></u-avatar>
 			</view>
-			<view class="userHead-text oldTextjp2" >
+			<view class="userHead-text oldTextjp2" oldstyle="font-size: 28px;">
 				<h3>{{userId ? userPhone : '点击登录/注册'}}</h3>
 			</view>
 		</view>