From 7c522529aa98860f777b80eb2ca92a24f4440db5 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 21 Feb 2022 15:24:53 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/qfqk-android
---
leafletMapOur/grabOrdersMap/js/vueMain.js | 42 ++++++++++++++++++++++++++----------------
1 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/leafletMapOur/grabOrdersMap/js/vueMain.js b/leafletMapOur/grabOrdersMap/js/vueMain.js
index 1fb8810..ff22c89 100644
--- a/leafletMapOur/grabOrdersMap/js/vueMain.js
+++ b/leafletMapOur/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
+ type: "start",
+ data: {
+ id: that.data.id,
+ serid: that.data.serid
+ },
+ fn: function(val) {
+ if (val == "success") {
+ console.log("成功开启任务")
+ this.data.butCT = "beginUp";
+ this.data.rtype = '0';
+ this.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)
@@ -652,6 +654,14 @@
},
});
this.domMove.init();
+
+ window.parent.setIntLat({
+ rid: this.data.id,
+ fn: (out) => {
+ console.log(out);
+ that.addIcon(out);
+ }
+ })
},
wacth: {}
})
--
Gitblit v1.9.3