From fa9d6d873f252894b668aae8525a3d83b7175ca5 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期五, 28 七月 2023 15:56:33 +0800
Subject: [PATCH] 修改验质
---
store/index.js | 40 +++++++++++++++++++++++++++++++---------
1 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/store/index.js b/store/index.js
index ed0f27b..71899fe 100644
--- a/store/index.js
+++ b/store/index.js
@@ -105,7 +105,10 @@
globalIntervalId: null,
is_open_socket: false, //閬垮厤閲嶅杩炴帴
connectNum: 1, //閲嶈繛娆℃暟,
- reconnectTimeOut: null
+ reconnectTimeOut: null,
+ // 绉伴噸绋冲畾鎬� 0/绋冲畾 1/闈炵ǔ瀹� 闈炵ǔ瀹氭�佷笉鑳界偣绉伴噸
+ globalWarning: false,
+ globalShowWeigh: []
},
mutations: {
lengthchange(state, payload) {
@@ -169,12 +172,19 @@
},
// 鏀瑰彉閲嶈繛娆℃暟
changereconnectNum(state, payload) {
- if (state.connectNum < 6) {
+ if (state.connectNum <= 6) {
state.connectNum += payload
} else {
state.connectNum = payload
}
},
+ // 鏀瑰彉绋冲畾鎬�
+ changeWarning(state, payload) {
+ state.globalWarning = payload
+ },
+ changeglobalShowWeigh(state, payload) {
+ state.globalShowWeigh = payload
+ }
},
actions: {
websocketInit({ state, dispatch, commit }) {
@@ -225,12 +235,22 @@
clearInterval(state.reconnectTimeOut)
state.socketTast = null
commit('changereconnectState', false)
- if (state.connectNum < 6) {
- dispatch('reconnect')
- } else {
+ if (state.connectNum <= 6 && state.globalisLogin) {
+ uni.showToast({
+ title: `杩炴帴澶辫触锛屾鍦ㄥ皾璇曠${state.connectNum}娆¤繛鎺,
+ icon: 'none'
+ })
commit('changereconnectNum', 1)
+ dispatch('reconnect')
+ } else if (state.connectNum > 6 && state.globalisLogin) {
+ commit('changereconnectNum', 1)
+ uni.showToast({
+ title: '缃戠粶寮傚父,璇风◢鍚庨噸璇�',
+ icon: 'none'
+ })
+ } else {
+ return
}
-
},
websocketOnError({ state, commit, dispatch }, e) {
// 濡傛灉閲嶈繛鐘舵�佷负false鍒欎笉杩涜閲嶈繛锛屼负true鎵嶄細
@@ -239,19 +259,21 @@
clearInterval(state.reconnectTimeOut)
state.socketTast = null
commit('changereconnectState', false)
- if (state.connectNum < 6) {
+ if (state.connectNum < 6 && state.globalisLogin) {
uni.showToast({
title: `杩炴帴澶辫触锛屾鍦ㄥ皾璇曠${state.connectNum}娆¤繛鎺,
icon: 'none'
})
commit('changereconnectNum', 1)
dispatch('reconnect')
- } else {
+ } else if (state.connectNum >= 6 && state.globalisLogin) {
commit('changereconnectNum', 1)
uni.showToast({
title: '缃戠粶寮傚父,璇风◢鍚庨噸璇�',
icon: 'none'
})
+ } else {
+ return
}
},
// 鎺ユ敹鏁版嵁
@@ -262,7 +284,7 @@
reconnect({ state, commit, dispatch }) {
console.log(state.is_open_socket, '閲嶆柊杩炴帴socket鐘舵��');
clearInterval(state.globalIntervalId)
- if (!state.is_open_socket) {
+ if (!state.is_open_socket && state.globalisLogin) {
state.reconnectTimeOut = setInterval(() => {
dispatch('websocketInit')
}, 5000)
--
Gitblit v1.9.1