From 66dcc0a49022cf23198f399f274abee89d876991 Mon Sep 17 00:00:00 2001 From: yangan <yangan0921@163.com> Date: 星期四, 25 四月 2024 09:58:55 +0800 Subject: [PATCH] feat:客户注册增加字段 --- store/index.js | 32 +++++++++++++++++++------------- 1 files changed, 19 insertions(+), 13 deletions(-) diff --git a/store/index.js b/store/index.js index ec18080..f9aa732 100644 --- a/store/index.js +++ b/store/index.js @@ -93,8 +93,8 @@ globalIntervalId: null, is_open_socket: false, //閬垮厤閲嶅杩炴帴 connectNum: 1, //閲嶈繛娆℃暟, - reconnectTimeOut: null, - // 鎵撳嵃鍑哄叆闂ㄨ瘉 涓�娆″氨鍙互鏈夋墦鍗板叆闂ㄨ瘉锛� 涓ゆ鍙互鏈夊叆闂ㄨ瘉 鍑洪棬璇� 0娆′竴寮犻兘娌℃湁 + reconnectTimeOut: null, //閲嶆柊閾炬帴鐨勫畾鏃跺櫒 + // 鎵撳嵃鍑哄叆闂ㄨ瘉 涓�娆″氨鍙互鏈夋墦鍗板叆闂ㄨ瘉锛� 涓ゆ鍙互鏈夊叆闂ㄨ瘉 鍑洪棬璇� 0娆′竴寮犻兘娌℃湁 ablePrintInduction: false, //鍏ラ棬璇� ablePrintOut: false, //鍑洪棬璇� driverTourImgList: ['https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj1.png', @@ -147,12 +147,11 @@ wsgContent: '', globalIsFirstWeighing: 1, //鏄惁鏄涓�娆′笂纾� confirmWeighVisiable: false, //纾呮埧绠$悊纭绉伴噸瀹屾垚鎻愮ず寮圭獥 - confirmWeighContent: '' + confirmWeighContent: '', + // 绉伴噸绋冲畾鎬� 0/绋冲畾 1/闈炵ǔ瀹� 闈炵ǔ瀹氭�佷笉鑳界偣绉伴噸 + globalWarning: false, }, mutations: { - lengthchange(state, payload) { - state.fleetDriverDataLength = payload - }, setUserInfo(state, identity) { state.userInfo = userObj[identity] }, @@ -194,7 +193,7 @@ changesocketTask(state, payload) { state.socketTask = payload }, - // 鏀圭増鍏ㄥ眬websocket鐘舵�� + // 鏀圭増鍏ㄥ眬websocket鐘舵�侊紙鍒ゆ柇鏄惁姝e父閾炬帴锛� changeisconnect(state, payload) { state.globalisconnect = payload }, @@ -244,14 +243,21 @@ }, changeconfirmWeighContent(state, payload) { state.confirmWeighContent = payload - } + }, + // 鏀瑰彉绋冲畾鎬� + changeWarning(state, payload) { + state.globalWarning = payload + }, }, actions: { websocketInit({ state, dispatch, commit }) { let wsUrl = `${webSocketUrl}?access_token=${uni.getStorageSync('token')}` state.socketTask = uni.connectSocket({ url: wsUrl, - header: { CLIENT_TOC: 'Y' }, + header: { + clientToc: 'Y' , + 'CLIENT_TOC': 'Y', + }, success: res => { console.log(res, 'socketSuccess') if (res.errMsg === 'connectSocket:ok') { @@ -274,8 +280,8 @@ }, websocketOnOpen({ state, commit }) { console.log('ws鎵撳紑') - clearInterval(state.reconnectTimeOut) - clearInterval(state.globalIntervalId) + clearInterval(state.reconnectTimeOut) //娓呴櫎涓婁竴娆$殑瀹氭椂鍣� + clearInterval(state.globalIntervalId) //娓呴櫎蹇冭烦 state.globalIntervalId = setInterval(() => { state.socketTask.send({ data: JSON.stringify({ type: 'ping' }), @@ -295,7 +301,7 @@ clearInterval(state.reconnectTimeOut) state.socketTask = null commit('changereconnectState', false) - if (state.connectNum < 6 || state.connectNum.connectNum < 6 && state.globalisLogin) { + if ((state.connectNum < 6 || state.connectNum.connectNum < 6) && state.globalisLogin) { uni.showToast({ title: '杩炴帴澶辫触锛屾鍦ㄥ皾璇曢噸鏂拌繛鎺�', icon: 'none' @@ -353,4 +359,4 @@ } }) -export default store \ No newline at end of file +export default store -- Gitblit v1.9.1