From 546d496332c146dd402c4dceffe0864b4deb95e5 Mon Sep 17 00:00:00 2001
From: 819527061@qq.com <123456>
Date: 星期三, 03 七月 2024 14:19:45 +0800
Subject: [PATCH] 车牌的内容修改
---
store/index.js | 87 ++++++++++++++++++++++++++-----------------
1 files changed, 52 insertions(+), 35 deletions(-)
diff --git a/store/index.js b/store/index.js
index a7eed82..e9e5d0b 100644
--- a/store/index.js
+++ b/store/index.js
@@ -55,19 +55,22 @@
iconPath: '../../static/tabBar-icon/checking.png',
selectedIconPath: '../../static/tabBar-icon/checkingblue.png',
text: '楠岃川'
- },
- {
+ },{
+ pagePath: 'pages/customer-page/zhijian-bangfang/zhijian-bangfang',
+ iconPath: '../../static/tabBar-icon/bang.png',
+ selectedIconPath: '../../static/tabBar-icon/bangblue.png',
+ text: '纾呮埧'
+ },{
pagePath: 'pages/customer-page/customer-my/faYunstatistics/faYunstatistics',
iconPath: '../../static/tabBar-icon/statistics.png',
selectedIconPath: '../../static/tabBar-icon/statisticsactive.png',
text: '缁熻'
- },
- {
+ },{
pagePath: 'pages/tabbar-page/myPage-tabbar/myPage-tabbar',
iconPath: '../../static/tabBar-icon/Gmine10.png',
selectedIconPath: '../../static/tabBar-icon/Bmine57.png',
text: '鎴戠殑'
- }
+ },
]
}
const store = new Vuex.Store({
@@ -177,6 +180,7 @@
// 璁剧疆搴曢儴鏍�
setUserTabbar(state, roleType) {
state.roleType = roleType
+ console.log(roleType,'roledType===')
if (roleType === 1) {
state.userTabbar = userRoleTabbar.first
uni.setStorageSync('userTabbar', state.userTabbar)
@@ -220,6 +224,9 @@
state.globalisLogin = payload
console.log(state.globalisLogin, '鍏ㄥ眬鐧诲綍鐘舵�佹敼鍙樹簡')
},
+ changesocketTask(state, payload) {
+ state.socketTask = payload
+ },
setWebsocketData(state, data) {
state.websocketData = data
},
@@ -229,10 +236,14 @@
},
// 鏀瑰彉閲嶈繛娆℃暟
changereconnectNum(state, payload) {
- if (state.connectNum <= 6) {
- state.connectNum += payload
+ if (payload.isWeigh) {
+ state.connectNum = payload.connectNum
} else {
- state.connectNum = payload
+ if (state.connectNum < 6) {
+ state.connectNum += payload.connectNum
+ } else {
+ state.connectNum = payload.connectNum
+ }
}
},
// 鏀瑰彉绋冲畾鎬�
@@ -250,7 +261,8 @@
actions: {
websocketInit({ state, dispatch, commit }) {
let wsUrl = `${webSocketUrl}?access_token=${uni.getStorageSync('token')}`
- state.socketTast = uni.connectSocket({
+ // let wsUrl = `${webSocketUrl}?UUID=boyingtest`
+ state.socketTask = uni.connectSocket({
url: wsUrl,
header: { CLIENT_TOC: 'Y' },
success: res => {
@@ -268,17 +280,17 @@
}
})
- state.socketTast.onOpen(() => dispatch('websocketOnOpen'))
- state.socketTast.onMessage(result => dispatch('websocketOnMessage', result.data))
- state.socketTast.onClose(e => dispatch('websocketOnClose', e))
- state.socketTast.onError(e => dispatch('websocketOnError', e))
+ state.socketTask.onOpen(() => dispatch('websocketOnOpen'))
+ state.socketTask.onMessage(result => dispatch('websocketOnMessage', result.data))
+ state.socketTask.onClose(e => dispatch('websocketOnClose', e))
+ state.socketTask.onError(e => dispatch('websocketOnError', e))
},
websocketOnOpen({ state, commit }) {
console.log('ws鎵撳紑')
clearInterval(state.reconnectTimeOut)
clearInterval(state.globalIntervalId)
state.globalIntervalId = setInterval(() => {
- state.socketTast.send({
+ state.socketTask.send({
data: JSON.stringify({ type: 'ping' }),
success(e) {
console.log(e, '鍙戦�佸績璺虫垚鍔�')
@@ -287,24 +299,24 @@
}, 30000)
},
websocketOnClose({ state, commit, dispatch }, e) {
- if (!state.socketTast) return
+ if (!state.socketTask) return
console.log('ws鍏抽棴', e)
- state.socketTast.close(e => {
+ state.socketTask.close(e => {
commit('changeisconnect', false)
})
clearInterval(state.globalIntervalId)
clearInterval(state.reconnectTimeOut)
- state.socketTast = null
+ state.socketTask = null
commit('changereconnectState', false)
- if (state.connectNum <= 6 && state.globalisLogin) {
- uni.showToast({
- title: `杩炴帴澶辫触锛屾鍦ㄥ皾璇曠${state.connectNum}娆¤繛鎺,
- icon: 'none'
- })
- commit('changereconnectNum', 1)
+ if ((state.connectNum < 6 || state.connectNum.connectNum < 6) && state.globalisLogin) {
+ // uni.showToast({
+ // title: '杩炴帴澶辫触锛屾鍦ㄥ皾璇曢噸鏂拌繛鎺�',
+ // icon: 'none'
+ // })
+ commit('changereconnectNum', { connectNum: 1, isWeigh: false })
dispatch('reconnect')
- } else if (state.connectNum > 6 && state.globalisLogin) {
- commit('changereconnectNum', 1)
+ } else if (state.connectNum >= 6 && state.globalisLogin) {
+ commit('changereconnectNum', { connectNum: 1, isWeigh: false })
uni.showToast({
title: '缃戠粶寮傚父,璇风◢鍚庨噸璇�',
icon: 'none'
@@ -318,17 +330,17 @@
console.log('ws鎶ラ敊', e)
clearInterval(state.globalIntervalId)
clearInterval(state.reconnectTimeOut)
- state.socketTast = null
+ state.socketTask = null
commit('changereconnectState', false)
- if (state.connectNum < 6 && state.globalisLogin) {
- uni.showToast({
- title: `杩炴帴澶辫触锛屾鍦ㄥ皾璇曠${state.connectNum}娆¤繛鎺,
- icon: 'none'
- })
- commit('changereconnectNum', 1)
+ if (state.connectNum < 6 || state.connectNum.connectNum < 6 && state.globalisLogin) {
+ // uni.showToast({
+ // title: '杩炴帴澶辫触锛屾鍦ㄥ皾璇曢噸鏂拌繛鎺�',
+ // icon: 'none'
+ // })
+ commit('changereconnectNum', { connectNum: 1, isWeigh: false })
dispatch('reconnect')
- } else if (state.connectNum >= 6 && state.globalisLogin) {
- commit('changereconnectNum', 1)
+ } else if (state.connectNum > 6 && state.globalisLogin) {
+ commit('changereconnectNum', { connectNum: 1, isWeigh: false })
uni.showToast({
title: '缃戠粶寮傚父,璇风◢鍚庨噸璇�',
icon: 'none'
@@ -351,7 +363,12 @@
}, 5000)
}
}
+ },
+ getters: {
+ websocketData:(state) => state.websocketData,
+ globalweigh:(state) => state.globalweigh,
+ userTabbar: (state) => state.userTabbar
}
})
-export default store
\ No newline at end of file
+export default store
--
Gitblit v1.9.1