wkyy vor 2 Jahren
Ursprung
Commit
dd74050508
2 geänderte Dateien mit 32 neuen und 20 gelöschten Zeilen
  1. 4 3
      pages/searchPile/searchPile.vue
  2. 28 17
      pages/searchPile/stationAndPile/stationDetails.vue

+ 4 - 3
pages/searchPile/searchPile.vue

@@ -144,15 +144,16 @@
 					
 					
 					
 					
 						<view class="address">
 						<view class="address">
-							<view class="name">
+							<view class="name oldTextjp" oldstyle="font-size: 20px;">
 								{{item.name}}
 								{{item.name}}
 							</view>
 							</view>
-							<view class="distance" v-if="item.distance != '99999999'">
+							<view class="distance oldTextjp" oldstyle="font-size: 16px;" v-if="item.distance != '99999999'">
 								<text class="iconfont" style="color:#666666">&#xe615;</text>
 								<text class="iconfont" style="color:#666666">&#xe615;</text>
 								{{item.distance!=null && item.distance>0.1 ? item.distance.toFixed(1)+'公里' : '小于100米'}}
 								{{item.distance!=null && item.distance>0.1 ? item.distance.toFixed(1)+'公里' : '小于100米'}}
 							</view>
 							</view>
 							<view class="distance" v-else>
 							<view class="distance" v-else>
 								<text class="iconfont" style="color:#666666">&#xe615;</text>
 								<text class="iconfont" style="color:#666666">&#xe615;</text>
+								暂无定位
 							</view>
 							</view>
 						</view>
 						</view>
 						<view class="sign">
 						<view class="sign">
@@ -831,7 +832,7 @@ export default {
 				data1.latitude = pos.latitude.toString(); 
 				data1.latitude = pos.latitude.toString(); 
 			if(this.info.miles_type[this.preference.miles_index].distance!=null)
 			if(this.info.miles_type[this.preference.miles_index].distance!=null)
 				data1.raidus = this.info.miles_type[this.preference.miles_index].distance.toString();
 				data1.raidus = this.info.miles_type[this.preference.miles_index].distance.toString();
-			// data1.online = "0";//在线	
+			data1.online = "0";//在线	
 			if(pos.findType != null)
 			if(pos.findType != null)
 				data1.findType = pos.findType;
 				data1.findType = pos.findType;
 			else
 			else

+ 28 - 17
pages/searchPile/stationAndPile/stationDetails.vue

@@ -14,43 +14,53 @@
 				{{stationDetail.station.name}}
 				{{stationDetail.station.name}}
 			</view>
 			</view>
 			<view class="sign">
 			<view class="sign">
-				<view class="sign-1">会员享服务费8.5折</view>
-				<view class="sign-2">包月卡</view>
-				<view class="sign-2">服务费代金券</view>
-				<view class="sign-2">超级代金券</view>
+				<view class="sign-1" v-if="stationDetail.station.giveDiscount">
+					会员享服务费{{stationDetail.station.discountRatio/10}}折</view>
+				<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>
-			<view class="infos-item between">
+			<view class="infos-item between" @click="map">
 				
 				
-				<view class="position"><view class="img-box"><img src="../../../assets/img/riLine-navigation-line.svg" alt=""></view>湖北省荆州市沙市区江津东路附155号荆鹏软件园侧门院内</view>
-				 <view class="distance">小于100米<text class="iconfont">&#xe600;</text></view>
+				<view class="position">
+					<view class="img-box oldTextjp" oldstyle="font-size: 18px;"><img src="../../../assets/img/riLine-navigation-line.svg" alt=""></view>
+					{{stationDetail.station.address}}</view>
+				<view class="distance oldTextjp2" oldstyle="font-size: 18px;">
+				{{stationDetail.station.distance!=null&&stationDetail.station.distance>0.1 ? stationDetail.station.distance.toFixed(1)+'公里':'小于100米'}}<text class="iconfont">&#xe600;</text></view>
 			</view>
 			</view>
-			<view class="infos-item">
-				<view class="date"><text><img src="../../../assets/img/riLine-map-pin-time-line.svg" alt=""></text>周一到周日 07:00~22:00 (节假日除外)</view>
+			<view class="infos-item oldTextjp2" oldstyle="font-size: 18px;">
+				<view class="date"><text><img src="../../../assets/img/riLine-map-pin-time-line.svg" alt=""></text>
+				{{stationDetail.station.describe}}</view>
 			</view>
 			</view>
-			<view class="infos-item between">
-				<view class="park "><text><img src="../../../assets/img/riLine-parking-box-line.svg" alt=""></text>2小时停车免费</view>
+			<view class="infos-item between oldTextjp2" oldstyle="font-size: 18px;" @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">
 				<view class="iconfont park-font">
 					&#xe600;
 					&#xe600;
 				</view>
 				</view>
 			</view>
 			</view>
-			<view class="infos-item between">
+			<u-modal v-model="parkingTips"
+				title="新能源汽车停车费说明"
+				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="date"><text><img src="../../../assets/img/riLine-charging-pile-line Copy.svg" alt="">
 				<view class="date"><text><img src="../../../assets/img/riLine-charging-pile-line Copy.svg" alt="">
-				</text>直流快充/交流慢充</view>
+				</text>{{(stationDetail.station.type.indexOf('1')>=0?'直流快充':'')}}{{(stationDetail.station.type.indexOf(',')>=0?'/':'')}}{{(stationDetail.station.type.indexOf('2')>=0?'交流慢充':'')}}</view>
 				<view class="free">
 				<view class="free">
 					<view class="fast">
 					<view class="fast">
-						<view class="fast-font">
+						<view class="fast-font" v-if="stationDetail.station.type == '1' || stationDetail.station.type == '1,2'">
 						</view>
 						</view>
 						<view class="num">
 						<view class="num">
-							3/4
+							{{stationDetail.station.fastAvailableNum}}/{{stationDetail.station.fastNum}}
 						</view>
 						</view>
 					</view>
 					</view>
 					<view class="slow">
 					<view class="slow">
-						<view class="slow-font">
+						<view class="slow-font" v-if="stationDetail.station.type == '2' || stationDetail.station.type == '1,2'">
 						</view>
 						</view>
 						<view class="num">
 						<view class="num">
-							3/4
+							{{stationDetail.station.slowAvailableNum}}/{{stationDetail.station.slowNum}}
 						</view>
 						</view>
 					</view>
 					</view>
 				</view>
 				</view>
@@ -361,6 +371,7 @@
 
 
 		data() {
 		data() {
 			return {
 			return {
+				parkingTips:false,
 				stationId: '',
 				stationId: '',
 				pricesInfo: [],
 				pricesInfo: [],
 				devicesId: '',
 				devicesId: '',