From 6705f7d8f96eb6283ebc7b01dae0f9d1ba0ac93f Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 21 Feb 2022 15:37:52 +0800
Subject: [PATCH] 反馈问题修复

---
 public/grabOrdersMap/js/vueMain.js |   70 ++++++++++++++++++++++------------
 1 files changed, 45 insertions(+), 25 deletions(-)

diff --git a/public/grabOrdersMap/js/vueMain.js b/public/grabOrdersMap/js/vueMain.js
index 1fb8810..414c977 100644
--- a/public/grabOrdersMap/js/vueMain.js
+++ b/public/grabOrdersMap/js/vueMain.js
@@ -40,17 +40,7 @@
 	},
 	methods: {
 		setUniAppMsg(data) {
-			// console.log(data)
-			// console.log(uni)
-			uni.postMessage({
-				data: {
-					action: 'message'
-				}
-			});
-			uni.getEnv(function(res) {
-				console.log('当前环境:' + JSON.stringify(res));
-			});
-
+			window.parent.hBackMsg(data)
 		},
 		openAPP(type) {
 			// console.log(type)
@@ -59,13 +49,25 @@
 				if (that.data.butCT == "beginUp") {
 					// 反馈
 					uni.navigateTo({
-						url: '/pages/grabOrders/feedback?data=' + JSON.stringify(this.data)
+						url: '/pages/grabOrders/feedback?data=' + JSON.stringify(this.data) +
+							'&other="11111"'
 					});
 				} else if (that.data.butCT == "begin") {
 					// 开始任务
-					this.setUniAppMsg({
-						type: "begin",
-						data: that.data
+					that.setUniAppMsg({
+						type: "start",
+						data: {
+							id: that.data.id,
+							serid: that.data.serid
+						},
+						fn: function(val) {
+							if (val == "success") {
+								// console.log("成功开启任务")
+								that.data.butCT = "beginUp";
+								that.data.rtype = '0';
+								that.data.type = "0";
+							}
+						}
 					})
 				}
 			} else {
@@ -135,10 +137,10 @@
 			}
 			//url解码
 			this.data = this.getQueryVariable('data') || data;
-			if (this.data.team) {
+			console.log(this.data)
+			if (typeof this.data.team === "string") {
 				this.data.team = this.data.team.split(',');
 			}
-			console.log(this.data)
 			let lines = this.data.line
 			let position = lines.slice(lines.indexOf("(") + 1, lines.indexOf(",")).split(" ");
 			// console.log(position)
@@ -352,21 +354,30 @@
 				this.oncePosition = new $getPositions({
 					id: 1,
 					fn: function(res) {
-						console.log(res);
+						// console.log(res);
 						that.mapPositionLoding = res.state;
 						if (!res.state) {
-							that.addIcon(res.intlat);
+							console.log(res)
+							if (typeof res.intlat === "string") {
+								window.parent.showTip("获取定位失败")
+							} else {
+								that.addIcon([res.intlat[1], res.intlat[0]]);
+							}
 						}
 					}
 				}).init();
-			}
-			if (!this.onPosition) {
-				this.oncePosition.continuedTime();
-				this.onPosition = !this.onPosition;
+				this.oncePosition.once();
 			} else {
-				this.oncePosition.overContinued();
-				this.onPosition = !this.onPosition;
+				this.oncePosition.once();
 			}
+
+			// if (!this.onPosition) {
+			// 	this.oncePosition.continuedTime();
+			// 	this.onPosition = !this.onPosition;
+			// } else {
+			// 	this.oncePosition.overContinued();
+			// 	this.onPosition = !this.onPosition;
+			// }
 		},
 		//添加图标
 		addIcon(intlat) {
@@ -652,6 +663,15 @@
 			},
 		});
 		this.domMove.init();
+		// console.log(window.parent.setIntLat)
+		window.parent.setIntLat({
+			rid: this.data.id,
+			fn: (out) => {
+				// console.log(out,"1111");
+				// that.addIcon(out);
+				that.addIcon([out[1], out[0]]);
+			}
+		})
 	},
 	wacth: {}
 })

--
Gitblit v1.9.3