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

pages/searchPile/searchPile.vue

@@ -156,6 +156,19 @@
 							<text class="park-p" style="color: #FFFFFF;">p</text>
 							<text class="park-text">{{item.parkingDescription}}</text>
 						</view>	
+						<view class="park" v-else>
+							<text class="park-p" style="color: #FFFFFF;">p</text>
+							<text class="park-text">以实际停车场为准</text>
+						</view>	
+						<view class="park" v-if="item.giveDiscount" >
+							<!-- <text class="park-p" style="color: #FFFFFF;">p</text> -->
+							<img src="@/assets/img/riFill-coupon-3-fill.svg">
+							<view class="park-text park-text2">
+								<view class="park-text3"> 
+									本站会员享服务费{{item.discountRatio/10}}折									
+								</view>
+							</view>
+						</view>	
 					</view>
 					<view class="img-box">
 						<img :src="item.image" alt="">
@@ -856,14 +869,25 @@ export default {
 //									longitude: 112.28541 + i * 0.001,
 //									latitude: 30.308354 + i * 0.01
 									};
-						if(items[i].id != null)
-							obj.id = items[i].id;
+						if(items[i].id != null){
+								obj.id = items[i].id;
+								obj=items[i];
+						}
 						else
 							continue;
 						if(items[i].type.indexOf("1")>=0 && items[i].type.indexOf("2")>=0)
 						{
 							obj.type = '快/慢'
 						}
+						if(items[i].type=="1" )
+						{
+							obj.type = '快充'
+						}
+						if(items[i].type=="2" )
+						{
+							obj.type = '慢充'
+						}
+						
 						if(items[i].name!=null)
 							obj.name = items[i].name;
 						if(items[i].address!=null)
@@ -945,14 +969,25 @@ export default {
 	//									longitude: 112.28541 + i * 0.001,
 	//									latitude: 30.308354 + i * 0.01
 								};
-							if(items[i].id != null)
-								obj.id = items[i].id;
+							if(items[i].id != null){
+									obj.id = items[i].id;
+									obj=items[i];
+							}
 							else
 								continue;
 							if(items[i].type.indexOf("1")>=0 && items[i].type.indexOf("2")>=0)
 							{
 								obj.type = '快/慢'
 							}
+							if(items[i].type=="1" )
+							{
+								obj.type = '快充'
+							}
+							if(items[i].type=="2" )
+							{
+								obj.type = '慢充'
+							}
+							
 							if(items[i].name!=null)
 								obj.name = items[i].name;
 							if(items[i].address!=null)

pages/searchPile/stationAndPile/stationDetails.vue

@@ -48,7 +48,8 @@
 				<img class="iconfont font5" src="@/assets/img/riLine-coupon-3-line.svg"  style="width: 40rpx;" >
 				<!-- <view class="iconfont font5" style="color: #ffad79;">&#xe621;</view> -->
 				<view class="item-text oldTextjp2" oldstyle="font-size: 16px;">
-					本站<span v-if="stationDetail.station.giveDiscount">服务费{{stationDetail.station.discountRatio/10}}折，</span>支持包月卡、服务费代金券和超级代金券等优惠活动
+					本站<span v-if="stationDetail&&stationDetail.station&&stationDetail.station.giveDiscount">会员享服务费{{stationDetail.station.discountRatio/10}}折，</span>支持包月卡、服务费代金券和超级代金券等优惠活动
+					
 				</view>
 			</view>
 			
@@ -268,10 +269,10 @@
 									<text class="unit">元/度</text>
 								</view>
 							</view>
-							<view class="unitPrice-serviceCharge" v-if="stationDetail.station.giveDiscount">
-								充电单价：{{item.electricityPrice.toFixed(2)}}元 | 服务费：折后{{item.discountServicePrice}}元(折前{{item.servicePrice.toFixed(2)}})
+							<view class="unitPrice-serviceCharge" v-if="stationDetail.station&&stationDetail.station.giveDiscount">
+								充电单价:{{item.electricityPrice.toFixed(2)}}元 | 服务费:折后{{item.discountServicePrice}}元(折前{{item.servicePrice.toFixed(2)}}元)
 							</view>
-							<view class="unitPrice-serviceCharge" v-if="!stationDetail.station.giveDiscount">
+							<view class="unitPrice-serviceCharge" v-if="stationDetail.station&&!stationDetail.station.giveDiscount">
 								充电单价：{{item.electricityPrice.toFixed(2)}}元 | 服务费：{{item.servicePrice.toFixed(2)}}元
 							</view>
 							<view v-if="item.current" class="product_tip">