From 99bbd2f96dfa2b4ff94c183d2eda3f1b740f3933 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sat, 19 Feb 2022 17:46:54 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/qfqk-android

---
 leafletMapOur/grabOrdersMap/js/vueMain.js |   27 +++++++++++++++++++++------
 1 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/leafletMapOur/grabOrdersMap/js/vueMain.js b/leafletMapOur/grabOrdersMap/js/vueMain.js
index 72c6676..1fb8810 100644
--- a/leafletMapOur/grabOrdersMap/js/vueMain.js
+++ b/leafletMapOur/grabOrdersMap/js/vueMain.js
@@ -39,6 +39,19 @@
 		onPosition: false, //持续定位指示
 	},
 	methods: {
+		setUniAppMsg(data) {
+			// console.log(data)
+			// console.log(uni)
+			uni.postMessage({
+				data: {
+					action: 'message'
+				}
+			});
+			uni.getEnv(function(res) {
+				console.log('当前环境:' + JSON.stringify(res));
+			});
+
+		},
 		openAPP(type) {
 			// console.log(type)
 			let that = this;
@@ -50,9 +63,10 @@
 					});
 				} else if (that.data.butCT == "begin") {
 					// 开始任务
-					// uni.navigateTo({
-					// 	url: '/pages/grabOrders/feedback?data=' + JSON.stringify(this.data)
-					// });
+					this.setUniAppMsg({
+						type: "begin",
+						data: that.data
+					})
 				}
 			} else {
 				this.$confirm('是否参与活动:' + this.data.rname + "?", '提示', {
@@ -103,7 +117,7 @@
 				district: "西湖区",
 				id: 37,
 				integral: "222",
-				iscation: "0",
+				iscation: "1",
 				jnum: 3,
 				line: "LINESTRING(115.8995839881188 28.687205773173343,115.89391916267935 28.678966027079593,115.90404718391959 28.673644524394046,115.91211526863638 28.681369286356936)",
 				num: 1,
@@ -116,7 +130,7 @@
 				serid: "1123598821738675201,",
 				team: "你,他,它",
 				time: "2022-02-18 14:15:52",
-				type: "0",
+				type: "2",
 				url: "http://223.82.109.183:2081/zhba/upload/20220218/67f0c8bf3e7b5024c64133691f265072.ico",
 			}
 			//url解码
@@ -633,7 +647,8 @@
 				if (res.state === true || res.state === false) {
 					that.map.invalidateSize(true);
 				}
-				document.getElementsByClassName("dingwei")[0].style.bottom = res.height + 10 + "px";
+				document.getElementsByClassName("dingwei")[0].style.bottom = res.height +
+					10 + "px";
 			},
 		});
 		this.domMove.init();

--
Gitblit v1.9.3