From c79392fd51600783e5c5443c0f5a20f7826bfca5 Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Fri, 25 Feb 2022 18:13:45 +0800
Subject: [PATCH] +
---
store/websocket.js | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/store/websocket.js b/store/websocket.js
index 0be862c..37a2c84 100644
--- a/store/websocket.js
+++ b/store/websocket.js
@@ -60,7 +60,7 @@
state.socket = value;
},
setSocketValue(state, value) {
- // console.log(value)
+ console.log(value, 222222222222)
// if (value.router) { //正常数据返回
// //去除心跳数据
// if (value.router == 'share/heartbeat') {
@@ -72,12 +72,24 @@
// } else { //异常数据返回
// console.log(value, '异常')
// }
- if (state.socketValue.type === "start") {
+ let route;
+ let type;
+ let types111 = state.socketValue.type.split(",");
+ if (types111.length > 1) {
+ route = types111[0];
+ type = types111[1];
+
+ } else {
+ type = types111[0];
+ }
+ console.log()
+ if (type === "start") {
let types = uni.getSystemInfoSync().platform;
let
d = {
serid: uni.getStorageSync("ids") || $store.state.puserID,
type: 0,
+ tasktype: route == "grabOrdersZAXC" ? 0 : (route == "grabOrdersZAYWXC" ? 1 : 2)
};
let routes = getCurrentPages(); //获取当前页面栈
let curRoute = routes[routes.length - 1].route; //获取当前页面的路由
@@ -106,17 +118,20 @@
isOn: true
});
console.log(val)
-
+ let url = "/pages/grabOrders/map?data=" + JSON.stringify(val);
+ if (route) {
+ url = "/pages/grabOrders/" + route + "/map?data=" + JSON.stringify(val);
+ }
+ console.log(url)
// if (types == "android", curRoute != "pages/grabOrders/map") {
if (curRoute != "pages/grabOrders/map") {
uni.navigateTo({
- url: "/pages/grabOrders/map?data=" + JSON.stringify(
- val),
+ url: url,
});
return
}
uni.redirectTo({
- url: "/pages/grabOrders/map?data=" + JSON.stringify(val),
+ url: url,
});
} else {
continue;
--
Gitblit v1.9.3