Merge remote-tracking branch 'origin/master'

zengh

2022-03-08 7fa0b67aa51407aa9a3e107d0d4f20c2c5f995d1

Merge remote-tracking branch 'origin/master'

 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: {

 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: {

 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: {