diff --git a/src/utils/websocket.js b/src/utils/websocket.js index e4644f0..c953ba3 100644 --- a/src/utils/websocket.js +++ b/src/utils/websocket.js @@ -139,19 +139,20 @@ function webSocketOnMessage(msg) { global_callback(result); } } - if (result.type == -1 || result.type == 8 || result.type == 9) { - // if(result.type == -1){ - // if(result.data && result.data.token){ - // tool.cookie.set("TOKEN", result.data.token); - // } - // }else{ + + if (result.type == -1 || result.type == 0 || result.type == 8 || result.type == 9) { + if(result.type == -1 || result.type == 0){ + if(result.data && result.data.token){ + tool.cookie.set("TOKEN", result.data.token); + } + }else{ showNot = ElNotification.error({ title: '系统退出', message: result.msg, duration:0 }); handleError('系统退出', result.msg); - // } + } } eventBus.$emit('sockBack',result); diff --git a/src/views/order/orderList/detailView.vue b/src/views/order/orderList/detailView.vue index 49f9e7c..9ac4fe5 100644 --- a/src/views/order/orderList/detailView.vue +++ b/src/views/order/orderList/detailView.vue @@ -6,7 +6,7 @@ 当前状态: - {{item.label}} diff --git a/src/views/order/orderList/index.vue b/src/views/order/orderList/index.vue index caaee54..4ecede7 100644 --- a/src/views/order/orderList/index.vue +++ b/src/views/order/orderList/index.vue @@ -38,24 +38,12 @@ - -