From 1bb17a6e080bf7b543ebc1f51f23cc6bd10fd08c Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Thu, 24 Feb 2022 15:25:01 +0800
Subject: [PATCH] +地图完善

---
 pages/grabOrders/map.vue                 |   36 +++++++++++++++++++-----------------
 pages/grabOrders/map/js/moveUniAppMap.js |    2 +-
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/pages/grabOrders/map.vue b/pages/grabOrders/map.vue
index 629183e..f85080e 100644
--- a/pages/grabOrders/map.vue
+++ b/pages/grabOrders/map.vue
@@ -7,8 +7,8 @@
 			:longitude="longitude" :latitude="latitude" :circles="circlesCom" :polyline="mypolylinesCom"
 			show-location="true">
 			<cover-view class="dingwBut" @click="mapControlsBack">
-				<cover-image :class="[beginFindDW?'dingwButImg':'']" src="./map/img/dingwei.png"
-					@click="mapControlsBack"></cover-image>
+				<cover-image src="./map/img/dingwei.png" @click="mapControlsBack">
+				</cover-image>
 			</cover-view>
 		</map>
 		<view id="Umain" :style="{ height: activeHeight}" @touchstart="touchstart" @touchend="touchend"
@@ -148,15 +148,12 @@
 					iconPath: "/static/tabbar/addSelectedIcon.png",
 					clickable: true,
 				}], //地图控件
-				beginFindDW: false, //是否旋转
 			}
 		},
 		methods: {
 			mapControlsBack() {
 				// console.log(1111)
-				this.beginFindDW = true;
 				this.getLocationInfo("notSet");
-
 			},
 			touchstart(e) {
 				// console.log(e.changedTouches[0].clientY)
@@ -414,8 +411,8 @@
 						// console.log(res, "当前位置");
 						that.latitude = res.latitude
 						that.longitude = res.longitude
-						console.log(that.latitude)
-						console.log(that.longitude)
+						// console.log(that.latitude)
+						// console.log(that.longitude)
 						that.map.moveToLocation({
 							latitude: res.latitude,
 							longitude: res.longitude
@@ -437,7 +434,6 @@
 							radius: 10, //半径
 							strokeWidth: 2 //描边的宽度
 						}]
-						that.beginFindDW = false;
 						if (val != "notSet") {
 							let d = {
 								id: that.ourData.id,
@@ -559,6 +555,12 @@
 
 			this.types = uni.getSystemInfoSync();
 
+			var animation = uni.createAnimation({
+				duration: 1000,
+				timingFunction: 'linear',
+			})
+
+			this.animation = animation;
 
 			let activeHeight = 0;
 			this.getDom("#Umain", (res) => {
@@ -694,7 +696,7 @@
 				toStrings(d);
 			}
 			toStrings(datas);
-			console.log(data)
+			// console.log(data)
 			if (data.team) {
 				data["teams"] = data.team.split(",");
 			}
@@ -854,10 +856,10 @@
 
 
 			//画线
-			console.log(data)
+			// console.log(data)
 			let line = data.line.split("(")[1].split(")")[0].split(",");
-			console.log(line[0].split(" ")[1])
-			console.log(line[0].split(" ")[0])
+			// console.log(line[0].split(" ")[1])
+			// console.log(line[0].split(" ")[0])
 			this.latitude = line[0].split(" ")[1];
 			this.longitude = line[0].split(" ")[0];
 			this.map.moveToLocation({
@@ -882,7 +884,7 @@
 				dottedLine: false, //是否虚线
 				arrowLine: false, //带箭头的线 开发者工具暂不支持该属性
 			}
-			console.log(this.mypolylines)
+			// console.log(this.mypolylines)
 			// }, 1000)
 			this.showWindow();
 			// this.getLocationInfo(data);
@@ -1098,10 +1100,10 @@
 		// &::after{
 		// 	content: url(map/img/dingwei.png);
 		// }
-		.dingwButImg {
-			animation: mymove 5s infinite;
-			animation-timing-function: linear;
-		}
+		// .dingwButImg {
+		// 	animation: mymove 5s infinite;
+		// 	animation-timing-function: linear;
+		// }
 	}
 
 
diff --git a/pages/grabOrders/map/js/moveUniAppMap.js b/pages/grabOrders/map/js/moveUniAppMap.js
index 9c494de..ac1c9c8 100644
--- a/pages/grabOrders/map/js/moveUniAppMap.js
+++ b/pages/grabOrders/map/js/moveUniAppMap.js
@@ -11,7 +11,7 @@
 				}
 			}).exec()
 		}
-		console.log(this.windowSize)
+		// console.log(this.windowSize)
 
 		this.start = 0;
 		this.end = 0;

--
Gitblit v1.9.3