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

apis/site.js

@@ -1,6 +1,8 @@
 import request from '../utils/request.js';
 import Qs from 'qs';
-
+export function geChargingStationData(data){
+	
+}
 export function getPileDetails(data){
 	var p = new Promise(function(resolve,rejct){
 		if(data != null)

pages/searchPile/searchPile.vue

@@ -46,6 +46,7 @@
 						<u-tag
 							class="preference_item"
 							v-for="(item, index) in info.miles_type"
+							:key="index"
 							:style="index == preference.miles_index ? 'background-color:#00B962;color:#FFFFFF' : 'background-color:#EFF4F2;color:#926666'"
 							shape="circle"
 							:text="item.text"
@@ -59,6 +60,7 @@
 						<u-tag
 							class="preference_item"
 							v-for="(item, index) in info.obc_type"
+							:key="index"
 							:style="index == preference.obc_type_index ? 'background-color:#00B962;color:#FFFFFF' : 'background-color:#EFF4F2;color:#926666'"
 							shape="circle"
 							:text="item.text"
@@ -73,6 +75,7 @@
 						<u-tag
 							class="preference_item_plus"
 							v-for="(item, index) in info.obc_status"
+							:key="index"
 							:style="index == preference.obc_status_index ? 'background-color:#00B962;color:#FFFFFF' : 'background-color:#EFF4F2;color:#926666'"
 							shape="circle"
 							:text="item.text"
@@ -86,6 +89,7 @@
 						<u-tag
 							class="preference_item_plus"
 							v-for="(item, index) in info.obc_voltage"
+							:key="index"
 							:style="index == preference.obc_voltage_index ? 'background-color:#00B962;color:#FFFFFF' : 'background-color:#EFF4F2;color:#926666'"
 							shape="circle"
 							:text="item.text"
@@ -164,7 +168,7 @@
 				 
 				<view v-if="stations.length>0" class="chargerCard" style="border-radius: 20rpx;" > 
 					<swiper :current="currentIndex" @change="swiperChange" @transition="swiperTransition" style="height: 100%;">
-					 	<swiper-item v-for="(item,index) in stations" style="height: 100%;">							 
+					 	<swiper-item v-for="(item,index) in stations" :key="index" style="height: 100%;">							 
 							
 							<view class="swiper-item" style="height: 100%; background-color: #ffffff;">
 								<view class="card_item" style="font-size: 35rpx;padding-top: 5rpx;">

pages/searchPile/stationAndPile/chargePriceDetails.vue

@@ -7,7 +7,7 @@
 					:current="current" @change="change"></u-tabs>
 			</view>
 			<view class="line-box"><u-line color="#999999" /></view>
-			<view class="time-frame" v-for="(item,index) in list[current].items">
+			<view class="time-frame" v-for="(item,index) in list[current].items" :key="index">
 				<view class="time-items">
 					<view class="time-price">
 						<view class="time">

pages/searchPile/stationAndPile/chargingPileDetails.vue

@@ -42,7 +42,7 @@
 			</view>
 			<!-- 时段分类 -->
 		<view class="time-rates">
-			<view class="time-part"  v-for="(item,index) in pile.price">
+			<view class="time-part"  v-for="(item,index) in pile.price" :key="index">
 				<view class="part-top">
 					<view class="time">
 						{{item.time}}

pages/searchPile/stationAndPile/stationDetails.vue

@@ -39,7 +39,7 @@
 					<view class="iconfont right-font">&#xe600;</view>
 				</view>
 			</view>
-			<view class="price-item" v-for="(item,index) in info.prices">
+			<view class="price-item" v-for="(item,index) in info.prices" :key="index">
 				<view :class="item.name=='慢充'?'text1':'text5'">{{item.name}}</view>
 				<view class="text2">{{item.price}}</view>
 				<view class="text3">起 元/度</view>
@@ -90,7 +90,7 @@
 				<view class="type">
 					{{item.description}}
 				</view>
-				<view class="charging-gun" v-for="(item1,index1) in item.plugs" >
+				<view class="charging-gun" v-for="(item1,index1) in item.plugs" :key="index1" >
 					<view class="iconfont">
 						&#xe618;
 					</view>