调整

pages/index/index.vue

@@ -252,7 +252,7 @@
 					</view>
 				</view>
 				<view class="sign">
-					<view class="sign-1" v-if="stationData.giveDiscount">服务费{{stationData.discountRatio/10}}折</view>
+					<view class="sign-1" v-if="stationData.giveDiscount&&stationData.discountRatio">服务费{{stationData.discountRatio/10}}折</view>
 					<view class="sign-2" v-if="stationData.tagList.length != 0" v-for="(tagName,tagIndex) in stationData.tagList" :key="tagIndex">{{tagName}}</view>
 				</view>
 				<view class="price-free">

pages/searchPile/stationAndPile/stationDetails.vue

@@ -31,8 +31,8 @@
 			<view class="sign" :class="{
 				noImg:!(stationDetail.station != null && stationDetail.station.image != null)
 			}">
-				<view class="sign-1" v-if="stationDetail.station.giveDiscount">
-					服务费{{stationDetail.station.discountRatio/10}}折</view>
+				<view class="sign-1" v-if="station.giveDiscount">
+					服务费{{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>
@@ -52,10 +52,10 @@
 				<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: 16px;" @click="parkingTips=true" v-if="stationDetail.station.parkingSimpleDescription">
+			<view class="infos-item between oldTextjp2" oldstyle="font-size: 16px;" @click="()=>{if(stationDetail.station.parkingSimpleDescription){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" v-if="stationDetail.station.parkingSimpleDescription" >
 					&#xe600;
 				</view>
 			</view>
@@ -322,7 +322,9 @@
 		<view class="price-explain" :class="{
 			'elderMode':elderMode
 		}" v-show="current==1">
-			<u-alert-tips type="warning" :descStyle="{
+			<u-alert-tips
+			 v-if="showtips"
+			 type="warning" :descStyle="{
 						     fontSize: '28rpx',
 						     color: '#ef7a30',
 					 }"   description="每个月的电价可以在“网上国网”APP网站上查到，会根据“煤电联动”机制进行调整。" :show-icon="true"></u-alert-tips>
@@ -337,7 +339,7 @@
 					</view>
 					<view class="price">
 						<text class="price-1"><text class="num">{{item.costPrice.toFixed(2)}}</text> <text >元/度</text></text> 
-						<text class="price-2"  v-if="stationDetail.station&&stationDetail.station.giveDiscount" >
+						<text class="price-2"  v-if="station&&station.giveDiscount" >
 							<text class="num">{{((item.servicePrice*1000+item.electricityPrice*1000)/1000).toFixed(2)}}元/度</text>
 						</text>
 					</view>
@@ -347,12 +349,12 @@
 						</view>
 						
 						<view
-						 v-if="stationDetail.station&&stationDetail.station.giveDiscount"
+						 v-if="station&&station.giveDiscount"
 						
 						 class="service-price">服务费{{item.discountServicePrice}}元/度(折前{{item.servicePrice.toFixed(2)}}元/度)</view>
 						
 						<view 
-							v-if="stationDetail.station&&!stationDetail.station.giveDiscount"
+							v-if="station&&!station.giveDiscount"
 						class="service-price">服务费{{item.servicePrice}}元/度</view>
 					</view>
 				</view>
@@ -403,7 +405,8 @@
 				devicesId: '',
 				elderMode: false,
 				userId: '',
-				show: false,
+				show: false,
+				showtips:true,
 				list: [{
 						"name": "充电桩"
 					},
@@ -770,7 +773,8 @@
 
 					if (res.data.prices.length) {
 
-						let date = new Date();
+						let date = new Date();
+						this.station=res.data.chargingStation
 						let hours = date.getHours();
 						let minutes = date.getMinutes();
 						let seconds = date.getSeconds();
@@ -784,7 +788,10 @@
 							var obj = this.pricesInfo[i]
 
 							if (date_str >= obj.startTime && date_str <= obj.endTime) {
-								obj.current = true;
+								obj.current = true;
+								if(obj.electricityPrice==0){
+									this.showtips=false
+								}
 							}
 
 						}