bug修复

component/googleMap/googleMap.vue

@@ -2,7 +2,7 @@
 	<view class="content">
 		<view id="container">
 			<view :style="{width:width,height:height}" :keyId='keyId' :change:keyId='keyId' :id="`mapModule` + keyId"
-				:prop="mapData" :change:prop="mapModule.update" :lngLat="myLocation"
+				:prop="mapData" :change:prop="mapModule.update" :lngLat="myLocations"
 				:change:lngLat="mapModule.initAmap"></view>
 
 		</view>
@@ -227,7 +227,7 @@
 					size: new google.maps.Size(item.width, item.height),
 					scaledSize: new google.maps.Size(item.width, item.height)
 				});
-				let distance = common.getFlatternDistance(this.myLocation.longitude, this.myLocation
+				let distance = common.getFlatternDistance(this.myLocations.longitude, this.myLocations
 					.latitude, item.longitude, item.latitude)
 				let time = Math.ceil(Number(((distance - 0) / 1000).toFixed(2)) * 25 / 10)
 				let content = `${common.formatDistance(Number(distance))} 骑行${time}分钟`
@@ -277,7 +277,7 @@
 				type: Object,
 				required: true //必填项
 			},
-			myLocation: {
+			myLocations: {
 				type: Object,
 				required: true //必填项
 			},

component/uploader/uploader.css

@@ -10,8 +10,8 @@
 }
 
 .list-item {
-	width: 206rpx;
-	height: 206rpx;
+	width: 200rpx;
+	height: 200rpx;
 	background-color: #F4F5F6;
 	border-radius: 16rpx;
 	display: flex;
@@ -23,14 +23,14 @@
 }
 
 .img-item {
-    width: 206rpx;
-    height: 206rpx;
+    width: 200rpx;
+    height: 200rpx;
     background-color: #fff;
 	border-radius: 16rpx;
 }
 .img-item-demo {
-    width: 206rpx;
-    height: 206rpx;
+    width: 200rpx;
+    height: 200rpx;
     background-color: #fff;
 	border-radius: 16rpx;
 	/* 翻转图片的颜色 */

pages/batteryRecord/batteryRecord.vue

@@ -3,7 +3,7 @@
 		<navBar name="换电记录" type="noBottom"></navBar>
 		
 		<view class="order-type-view flex-row flex-between">
-			<view @click="srcFn(`/pages/carList/carList`)" class="car-model-list flex-row">
+			<view v-if="car_info.car_sn" @click="srcFn(`/pages/carList/carList`)" class="car-model-list flex-row">
 				<view class="car-model-text">{{car_info.car_name}}</view><img class="right-corner-icon"
 					src="https://qiniu.bms16.com/Fqs6TrEmcdT7QNEdKWs9Hir2cacO" alt="">
 			</view>

pages/carList/carList.vue

@@ -106,9 +106,8 @@
 			loadUserCarList(){
 				this.car_info = uni.getStorageSync('car_info') || {};
 				const me = this
-				common.loading()
 				http.postApi(config.API_FLK_CAR_DEVICE_LIST, {}, (resp) => {
-					uni.hideLoading();
+					
 					if (resp.data.code === 200) {
 						const carList=resp.data.data.list
 						resp.data.data.list.map(item=>{

pages/carLocation/carLocation.vue

@@ -7,7 +7,7 @@
 		</map>
 		<!-- #endif -->
 		<!-- #ifdef APP -->
-		<googleMap keyId="1" width='100%' height='calc(100vh - 506rpx)' v-if="myLocation.latitude"  :mapData="{type:3,markers,zoom:13}" :myLocation='myLocation'></googleMap>
+		<googleMap keyId="1" width='100%' height='calc(100vh - 506rpx)' v-if="myLocation.latitude"  :mapData="{type:3,markers,zoom:13}" :myLocations='myLocation'></googleMap>
 		<!-- #endif -->
 		<!-- 由于cover-view一些样式及点击事件不支持 -->
 		<!-- 气泡内容 -->