From 623ec0ef9d86812885839e7fbe6380a8f162bd18 Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Wed, 23 Feb 2022 12:45:47 +0800
Subject: [PATCH] +路由处理放入websocket
---
store/websocket.js | 48 ++++++++++++
App.vue | 140 +++++++++++++++++-----------------
2 files changed, 118 insertions(+), 70 deletions(-)
diff --git a/App.vue b/App.vue
index 38daff1..c42ed80 100644
--- a/App.vue
+++ b/App.vue
@@ -27,77 +27,77 @@
}
}
},
- computed: {
- socketValue() {
- return this.$store.state.socketValue;
- }
- },
- watch: {
- socketValue() {
- console.log(this.socketValue);
- let that = this;
- if (that.socketValue.type === "start") {
- // console.log("任务开启vuevueveu")
- // this.$store.commit("addTask", this.socketValue.rid);
- // uni.request({
- // url: this.$store.state.piAPI + "taskqd/selectLi?id=" + this.socketValue.rid,
- // method: "get",
- // header: {
- // "content-type": "application/x-www-form-urlencoded",
- // },
- // success(res) {
- // let vals = res.data.data.records[0];
- let types = uni.getSystemInfoSync().platform;
- let that = this,
- d = {
- serid: uni.getStorageSync("ids") || that.$store.state.puserID,
- type: 0,
- };
- uni.request({
- url: this.$store.state.piAPI + "taskqd/selectLi",
- method: "POST",
- data: d,
- header: {
- "content-type": "application/x-www-form-urlencoded",
- },
- success(res) {
- const data = res.data.data;
- for (let k in data) {
- if (data[k].id == that.socketValue.rid) {
- let val = JSON.stringify({
- ...data[k],
- butCT: "beginUp",
- buttype: 0,
- myid: d.serid,
- myName: uni.getStorageSync("name") || that.$store.state.puserName,
- appenUrl: that.$store.state.piAPI,
- isOn: true
- });
- if(types == "android"){
- uni.navigateTo({
- url: "/pages/grabOrders/map?data=" + JSON.stringify(val),
- });
- return
- }
- uni.redirectTo({
- url: "/pages/grabOrders/map?data=" + JSON.stringify(val),
- });
- } else {
- continue;
- }
- }
- },
- });
+ // computed: {
+ // socketValue() {
+ // return this.$store.state.socketValue;
+ // }
+ // },
+ // watch: {
+ // socketValue() {
+ // console.log(this.socketValue);
+ // let that = this;
+ // if (that.socketValue.type === "start") {
+ // // console.log("任务开启vuevueveu")
+ // // this.$store.commit("addTask", this.socketValue.rid);
+ // // uni.request({
+ // // url: this.$store.state.piAPI + "taskqd/selectLi?id=" + this.socketValue.rid,
+ // // method: "get",
+ // // header: {
+ // // "content-type": "application/x-www-form-urlencoded",
+ // // },
+ // // success(res) {
+ // // let vals = res.data.data.records[0];
+ // let types = uni.getSystemInfoSync().platform;
+ // let that = this,
+ // d = {
+ // serid: uni.getStorageSync("ids") || that.$store.state.puserID,
+ // type: 0,
+ // };
+ // uni.request({
+ // url: this.$store.state.piAPI + "taskqd/selectLi",
+ // method: "POST",
+ // data: d,
+ // header: {
+ // "content-type": "application/x-www-form-urlencoded",
+ // },
+ // success(res) {
+ // const data = res.data.data;
+ // for (let k in data) {
+ // if (data[k].id == that.socketValue.rid) {
+ // let val = JSON.stringify({
+ // ...data[k],
+ // butCT: "beginUp",
+ // buttype: 0,
+ // myid: d.serid,
+ // myName: uni.getStorageSync("name") || that.$store.state.puserName,
+ // appenUrl: that.$store.state.piAPI,
+ // isOn: true
+ // });
+ // if(types == "android"){
+ // uni.navigateTo({
+ // url: "/pages/grabOrders/map?data=" + JSON.stringify(val),
+ // });
+ // return
+ // }
+ // uni.redirectTo({
+ // url: "/pages/grabOrders/map?data=" + JSON.stringify(val),
+ // });
+ // } else {
+ // continue;
+ // }
+ // }
+ // },
+ // });
- } else if (that.socketValue.type === "stop") {
- // console.log("任务结束vuevueveu")
- // this.$store.commit("stopTask", this.socketValue.rid);
- // uni.reLaunch({
- // url: "/pages/home/home"
- // });
- }
- }
- },
+ // } else if (that.socketValue.type === "stop") {
+ // // console.log("任务结束vuevueveu")
+ // // this.$store.commit("stopTask", this.socketValue.rid);
+ // // uni.reLaunch({
+ // // url: "/pages/home/home"
+ // // });
+ // }
+ // }
+ // },
mounted() {
// console.log("登入状态", this.$store.state.loging)
// if (this.$store.state.loging) {
diff --git a/store/websocket.js b/store/websocket.js
index d8c740b..e868231 100644
--- a/store/websocket.js
+++ b/store/websocket.js
@@ -72,10 +72,58 @@
// } else { //异常数据返回
// console.log(value, '异常')
// }
+ if (state.socketValue.type === "start") {
+ let types = uni.getSystemInfoSync().platform;
+ let
+ d = {
+ serid: uni.getStorageSync("ids") || $store.state.puserID,
+ type: 0,
+ };
+ uni.request({
+ url: $store.state.piAPI + "taskqd/selectLi",
+ method: "POST",
+ data: d,
+ header: {
+ "content-type": "application/x-www-form-urlencoded",
+ },
+ success(res) {
+ const data = res.data.data;
+ for (let k in data) {
+ if (data[k].id == state.socketValue.rid) {
+ let val = JSON.stringify({
+ ...data[k],
+ butCT: "beginUp",
+ buttype: 0,
+ myid: d.serid,
+ myName: uni.getStorageSync("name") || $store.state
+ .puserName,
+ appenUrl: $store.state.piAPI,
+ isOn: true
+ });
+ console.log(val)
+ if (types == "android") {
+ uni.navigateTo({
+ url: "/pages/grabOrders/map?data=" + JSON.stringify(val),
+ });
+ return
+ }
+ uni.redirectTo({
+ url: "/pages/grabOrders/map?data=" + JSON.stringify(val),
+ });
+ } else {
+ continue;
+ }
+ }
+ },
+ });
+
+ }
},
//本地建造数据传递
setMyvalue(state, value) {
state.socketValue = value;
+
+
},
setsocketStateMY(state, value) {
state.socketStateMY = value;
--
Gitblit v1.9.3