Merge branch 'master' of http://192.168.0.105:10010/r/qfqk-android

shuishen

2022-02-25 13d7349ea1beda3ebd48d27092aed0f17cd1c4b1

 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,17 +72,30 @@
         // } 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; //获取当前页面的路由
            // console.log(curRoute)
            // return
            // let 
            uni.request({
               url: $store.state.piAPI + "taskqd/selectLi",
               method: "POST",
@@ -105,16 +118,20 @@
                           isOn: true
                        });
                        console.log(val)

                        if (types == "android", curRoute != "pages/grabOrders/map") {
                        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;