From 7fa0b67aa51407aa9a3e107d0d4f20c2c5f995d1 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 08 Mar 2022 10:28:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 pages/grabOrders/grabOrdersZAXC/grabOrders.vue   |    2 +-
 pages/grabOrders/grabOrdersZAFFPX/grabOrders.vue |    2 +-
 pages/grabOrders/grabOrdersZAYWXC/grabOrders.vue |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/grabOrders/grabOrdersZAFFPX/grabOrders.vue b/pages/grabOrders/grabOrdersZAFFPX/grabOrders.vue
index c089ba3..c1af3ee 100644
--- a/pages/grabOrders/grabOrdersZAFFPX/grabOrders.vue
+++ b/pages/grabOrders/grabOrdersZAFFPX/grabOrders.vue
@@ -118,7 +118,7 @@
 			this.getGrabOrders(this.current);
 
 			if (options.from == "feedback") {
-				that.useWebScoketApi(item.id, item.serid, "stop");
+				this.useWebScoketApi(item.id, item.serid, "stop");
 			}
 		},
 		methods: {
diff --git a/pages/grabOrders/grabOrdersZAXC/grabOrders.vue b/pages/grabOrders/grabOrdersZAXC/grabOrders.vue
index 051a9f8..f17a68b 100644
--- a/pages/grabOrders/grabOrdersZAXC/grabOrders.vue
+++ b/pages/grabOrders/grabOrdersZAXC/grabOrders.vue
@@ -115,7 +115,7 @@
 			this.getGrabOrders(this.current);
 
 			if (options.from == "feedback") {
-				that.useWebScoketApi(item.id, item.serid, "stop");
+				this.useWebScoketApi(item.id, item.serid, "stop");
 			}
 		},
 		methods: {
diff --git a/pages/grabOrders/grabOrdersZAYWXC/grabOrders.vue b/pages/grabOrders/grabOrdersZAYWXC/grabOrders.vue
index c6685ba..0406897 100644
--- a/pages/grabOrders/grabOrdersZAYWXC/grabOrders.vue
+++ b/pages/grabOrders/grabOrdersZAYWXC/grabOrders.vue
@@ -118,7 +118,7 @@
 			this.getGrabOrders(this.current);
 
 			if (options.from == "feedback") {
-				that.useWebScoketApi(item.id, item.serid, "stop");
+				this.useWebScoketApi(item.id, item.serid, "stop");
 			}
 		},
 		methods: {

--
Gitblit v1.9.3