地图优化

common/storage.js

@@ -200,8 +200,8 @@ function setUserCurrentLocation(
 
 function getUserCurrentLocation() {
 	return uni.getStorageSync(USER_CURRENT_LOCATION) || {
-		longitude: 115.853024,
-		latitude: 28.686280
+		longitude: "115.853024",
+		latitude: "28.686280"
 	};
 }
 

component/googleMap/googleMap.vue

@@ -43,7 +43,7 @@
 				let _this = this
 				const script = document.createElement('script')
 				script.src =
-					'https://map.gpsall.cc/maps/api/js?key=AIzaSyA70JUgslynjmVv0NPz3hcvkTbPZpr2i_c&callback=initMap&v=weekly&loading=async';
+					'https://map.gpsall.cc/maps/api/js?key=AIzaSyCWxFJPWgJP8hb2cTbvfZb13tbm2rlhxgs&callback=initMap&v=weekly&loading=async';
 				script.async = true; // 异步加载
 				script.defer = true; // 延迟执行
 				document.head.appendChild(script)
@@ -90,6 +90,7 @@
 				new google.maps.event.addListener(_this.map, "click", function(event) {
 					_this.$ownerInstance.callMethod('bindTapMap')
 				});
+				
 				//如果有polylines则添加
 				if (_this.polylines?.points?.length > 0) {
 					console.log('添加轨迹')

component/googleMap/googleMaps.vue

@@ -1,6 +1,6 @@
 <template>
 	<view :style="{width:width,height:height}">
-		<view :style="{width:width,height:height}" id='map'></view>
+		<view :style="{width:width,height:height}" id='map111'></view>
 	</view>
 </template>
 
@@ -16,10 +16,6 @@
 				type: String,
 				default: '100%'
 			},
-			myLocations:{
-				type:Object,
-				default:{}
-			}
 		},
 		data() {
 			return {
@@ -28,31 +24,21 @@
 			}
 		},
 		mounted() {
-			// https://maps.googleapis.com/maps/api/js?key=YOUR_API_KEY&callback=initMap
-			const script = document.createElement('script')
-			script.src =
-				'https://maps.googleapis.com/maps/api/js?key=AIzaSyCWxFJPWgJP8hb2cTbvfZb13tbm2rlhxgs&callback=initMap&v=weekly&loading=async';
-			script.async = true; // 异步加载
-			script.defer = true; // 延迟执行
-			document.head.appendChild(script)
-			window.initMap = function() {
-				console.log('啦啦啦啦')
-			};
-			// let loader = new Loader({
-			// 	apiKey: "AIzaSyCWxFJPWgJP8hb2cTbvfZb13tbm2rlhxgs",
-			// 	version: "weekly",
-			// });
-			// this.init(loader)
+			console.log('哈哈哈')
+			let loader = new Loader({
+				apiKey: "AIzaSyCWxFJPWgJP8hb2cTbvfZb13tbm2rlhxgs",
+				version: "weekly",
+			});
+			this.init(loader)
 		},
 		methods: {
 			async init(loader) {
 				loader.load().then(async res => {
-					console.log(res)
 					const {
 						Map
 					} = await google.maps.importLibrary("maps");
 
-					this.map = new Map(document.getElementById("map"), {
+					this.map = new Map(document.getElementById("map111"), {
 						center: {
 							lat: -34.397,
 							lng: 150.644

mixin/index.js

@@ -27,7 +27,11 @@ export default {
   },
   methods: {
 	  async locationMiXin(){
-		   this.myLocation = await this.$location()
+		  let myLocation = await this.$location()
+		   this.myLocation = {
+			   latitude:`${myLocation.latitude}`,
+			   longitude:`${myLocation.longitude}`,
+		   }
 	  },
 		tapOpenControl(e){
 			const _carOnline=uni.getStorageSync('car_info').online!=0 //在线

pages/index/components/control/control.vue

@@ -77,7 +77,7 @@
 	var config = require('@/common/config.js');
 	var common = require('@/common/common.js');
 	var http = require('@/common/http.js');
-	import CustomSwitch from '@/component/customSwitch.vue'; // 引入组件
+	// import CustomSwitch from '@/component/customSwitch.vue'; // 引入组件
 	import controlMixin from '@/mixin/index';
 	import i18n from '@/locale/index.js'
 	import {
@@ -96,9 +96,7 @@ export default {
 			default: false
 		},
 	},
-	components: {
-		CustomSwitch
-	},
+
     data() {
         return {
 			// popText:'',

pages/travelingTrack/travelingTrack.vue

@@ -10,13 +10,11 @@
 		<!-- #endif -->
 
 		<!-- #ifdef APP -->
-		<googleMap keyId="1" width="100%" height='calc(50vh - 0rpx)' v-if="myLocation.latitude" :mapData='{
+		<googleMap keyId="1" width="100%" height='calc(50vh - 0rpx)' v-if="myLocation.latitude  && mapShow" :mapData='{
 			markers,
 			type:3,
 			polylines
-		}' :myLocation='myLocation'></googleMap>
-		
-		<!-- <googleMaps width="100%" height='calc(50vh - 0rpx)' :myLocations='myLocation'></googleMaps> -->
+		}' :myLocations='myLocation'></googleMap>
 		<!-- #endif -->
 
 		<view class="car-info">
@@ -67,7 +65,7 @@
 <script module="tools" lang="wxs" src="@/pages/common/wxs/tools.wxs"></script>
 <script module="tools" lang="sjs" src="@/pages/common/wxs/tools.sjs"></script>
 <script>
-	import googleMaps from "@/component/googleMap/googleMaps";
+	import googleMap from "@/component/googleMap/googleMap";
 	var common = require('../../common/common.js');
 	var amap = require('../../common/amap-wx.js');
 	var config = require('../../common/config.js');
@@ -77,10 +75,11 @@
 	var storage = require('../../common/storage.js');
 	export default {
 		components: {
-			googleMaps,
+			googleMap,
 		},
 		data() {
 			return {
+				mapShow:false,
 				time:'未知',
 				carInfo: {},
 				id: 0, // 使用 marker点击事件 需要填写id
@@ -92,10 +91,6 @@
 					enableTraffic: false // 是否开启实时路况
 				},
 				myInfo: {},
-				myLocation: {
-					latitude: 39.910925,
-					longitude: 116.413384,
-				},
 				star_address: '',
 				end_address: '',
 				address: {},
@@ -116,6 +111,7 @@
 		 * 生命周期函数--监听页面加载
 		 */
 		onLoad(options) {
+			
 			this.carInfo = uni.getStorageSync('car_info')
 			this.plate_number = options.plate_number
 			const me = this
@@ -217,6 +213,7 @@
 						this.getAddressName(this.markers[0].latitude, this.markers[0].longitude, 1)
 					}
 
+					this.mapShow = true
 				}
 				console.log(data)
 			},