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

pages/searchPile/stationAndPile/stationDetails.vue

@@ -254,7 +254,7 @@
 				 @click="priceDetail(1,item.deviceId)"  :title="item.deviceName" :label="'当前时段：'+item.startTime+'~'+item.endTime+'  '+item.costPrice+'元/度(含电费'+item.electricityPrice+'元/度+服务费'+item.servicePrice+'元/度'"></u-cell-item>
 			
  					<u-cell-item :arrow="false" v-if="false" title="停车费用" value="充电免停2小时停车费(临牌车不享受免停)"></u-cell-item>
-				</u-cell-group> -->
+				</u-cell-group>111zkx -->
 			<view class="main">
 				<view style="width: 100%;">
 					<view>