bug修改

component/googleMap/googleMap.vue

@@ -170,6 +170,8 @@
 			},
 
 			update(newValue, _, ownerInstance) {
+				console.log('过来了')
+				console.log(newValue)
 				if (newValue.zoom) this.zoom = newValue.zoom || 14
 				if (newValue.polylines && newValue.polylines.points && newValue.polylines.points.length > 0) this
 					.polylines = newValue.polylines

mixin/index.js

@@ -28,7 +28,6 @@ export default {
   methods: {
 	  async locationMiXin(){
 		   this.myLocation = await this.$location()
-		   console.log(this.myLocation)
 	  },
 		tapOpenControl(e){
 			const _carOnline=uni.getStorageSync('car_info').online!=0 //在线

pages/openCabinet/openCabinet.vue

@@ -107,7 +107,7 @@
 				})
 				if (data.code == 200) {
 					this.list = data.data.statusInfo
-					if (data.data.statusInfo.status == 3 || data.data.statusInfo.status == 4) {
+					if (data.data.statusInfo.status == 3 || data.data.statusInfo.status == 4 || data.data.statusInfo.status == 5) {
 						this.clearIntervalTimer()
 						this.isOverModal = true
 					}

pages/service/service.vue

@@ -165,41 +165,7 @@
 				}
 				this.nearCabinetList.unshift(this.nearCabinetList.splice(index, 1)[0])
 			},
-			markertapFn(e) {
-				let markerId = e.markerId
-				if (markerId == 5000) return
-				if (this.selectType == 'store') {
-					this.markers.map(item => {
-						if (markerId == item.id) {
-							item.iconPath = SHOPSELECTIMG
-							let distance = common.getFlatternDistance(this.myLocation.longitude, this.myLocation
-								.latitude, item.longitude, item.latitude)
-							let time = Math.ceil(Number(((distance - 0) / 1000).toFixed(2)) * 25 / 10)
-							let content = `${common.formatDistance(Number(distance))} 骑行${time}分钟`
-							item.label = {
-								content,
-								color: "#0074FF",
-								fontSize: 10,
-								bgColor: "#fff",
-								borderRadius: 10,
-								padding: 5,
-								anchorX: -45,
-								anchorY: -6
-							}
-							this.activeMarkersId = item.id
-						} else {
-							item.iconPath = CABINET_ICON_URL
-							item.label = {}
-						}
-					})
-				} else if (this.selectType == 'cabinet') {
-
-				}
-
-			},
-
-
-			 locationFn() {
+			locationFn() {
 				let _this = this
 				if (this.selectType === "store") {
 					this.loadCarRentalList();
@@ -207,7 +173,6 @@
 					this.loadNearCabinetList();
 				}
 			},
-
 			tapSelectType(e) {
 				const {
 					type