From 4f940f90c4458bfa4e5f514eeca639ac97c71039 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 01 八月 2023 16:33:47 +0800
Subject: [PATCH] 修改抢单错误
---
store/index.js | 199 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 192 insertions(+), 7 deletions(-)
diff --git a/store/index.js b/store/index.js
index badfcb9..d556246 100644
--- a/store/index.js
+++ b/store/index.js
@@ -1,14 +1,21 @@
import Vue from 'vue'
import Vuex from 'vuex'
+import { webSocketUrl } from '@/api/request.js'
Vue.use(Vuex)
// 鍔ㄦ�佸簳閮╰abbar
const userRoleTabbar = {
first: [{
pagePath: 'pages/tabbar-page/index-tabbar/index-tabbar',
- iconPath: '../../static/tabBar-icon/Gfayun.png',
- selectedIconPath: '../../static/tabBar-icon/Bfayun1.png',
+ iconPath: '../../static/tabBar-icon/home.png',
+ selectedIconPath: '../../static/tabBar-icon/homeblue.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',
@@ -19,8 +26,27 @@
],
second: [{
pagePath: 'pages/tabbar-page/index-tabbar/index-tabbar',
- iconPath: '../../static/tabBar-icon/Ghome.png',
- selectedIconPath: '../../static/tabBar-icon/Bhome.png',
+ iconPath: '../../static/tabBar-icon/home.png',
+ selectedIconPath: '../../static/tabBar-icon/homeblue.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: '鎴戠殑'
+ }
+ ],
+ three: [{
+ pagePath: 'pages/tabbar-page/index-tabbar/index-tabbar',
+ iconPath: '../../static/tabBar-icon/home.png',
+ selectedIconPath: '../../static/tabBar-icon/homeblue.png',
text: '棣栭〉'
},
{
@@ -35,7 +61,7 @@
state: {
// 鐢ㄦ埗鐣岄潰鍒ゆ柗
userInfo: {},
- roleType: null, // 1瀹㈡埛锛�2璐т唬锛�3鍙告満
+ roleType: null, // 1瀹㈡埛锛�2璐т唬锛�3鍙告満 5瑁呭嵏鍛�
userTabbar: [], // 鐢ㄦ埛鎵�鍦ㄨ鑹插簳閮ㄨ彍鍗曪紝
// 绉伴噸鏃剁殑閲嶉噺
globalweigh: 0,
@@ -44,7 +70,30 @@
// 鍏ㄥ眬weihousecode
globalweighHouseCode: '',
// 鍏ㄥ眬绾㈠鐘舵��
- globalinfraredStatus: false
+ globalinfraredStatus: false,
+ // 鍙告満淇敼涓汉淇℃伅
+ globaluserInfo: {
+ phone: '',
+ name: '',
+ username: '',
+ type: 3,
+ idCard: '',
+ carNo: '',
+ carImg: '',
+ drivingImg: '',
+ axleNum: '',
+ weight: '',
+ userId: ''
+ },
+ globalisconnect: true,
+ globalisUploadimg: false,
+ globalisLogin: false,
+ socketTask: null,
+ websocketData: null, // 瀛樻斁浠庡悗绔帴鏀跺埌鐨剋ebsocket鏁版嵁
+ globalIntervalId: null,
+ is_open_socket: false, //閬垮厤閲嶅杩炴帴
+ connectNum: 1, //閲嶈繛娆℃暟,
+ reconnectTimeOut: null
},
mutations: {
lengthchange(state, payload) {
@@ -61,6 +110,9 @@
uni.setStorageSync('userTabbar', state.userTabbar)
} else if (roleType == 2 || roleType == 3) {
state.userTabbar = userRoleTabbar.second
+ uni.setStorageSync('userTabbar', state.userTabbar)
+ } else if (roleType == 5) {
+ state.userTabbar = userRoleTabbar.three
uni.setStorageSync('userTabbar', state.userTabbar)
}
},
@@ -81,8 +133,141 @@
// 鏀瑰彉绾㈠鐘舵��
changeinfraredStatus(state, payload) {
state.globalinfraredStatus = payload
+ },
+ changeuserInfo(state, payload) {
+ state.globaluserInfo = payload
+ },
+ // 鏀圭増鍏ㄥ眬websocket鐘舵��
+ changeisconnect(state, payload) {
+ state.globalisconnect = payload
+ },
+ changeisUploadimg(state, payload) {
+ state.globalisUploadimg = payload
+ },
+ changeisLogin(state, payload) {
+ state.globalisLogin = payload
+ console.log(state.globalisLogin, '鍏ㄥ眬鐧诲綍鐘舵�佹敼鍙樹簡')
+ },
+ setWebsocketData(state, data) {
+ state.websocketData = data
+ },
+ // 鏀瑰彉閲嶈繛鐘舵��
+ changereconnectState(state, payload) {
+ state.is_open_socket = payload
+ },
+ // 鏀瑰彉閲嶈繛娆℃暟
+ changereconnectNum(state, payload) {
+ if (state.connectNum < 6) {
+ state.connectNum += payload
+ } else {
+ state.connectNum = payload
+ }
+ },
+ },
+ actions: {
+ websocketInit({ state, dispatch, commit }) {
+ let wsUrl = `${webSocketUrl}?access_token=${uni.getStorageSync('token')}`
+ state.socketTast = uni.connectSocket({
+ url: wsUrl,
+ header: { CLIENT_TOC: 'Y' },
+ success: res => {
+ console.log(res, 'socketSuccess')
+ if (res.errMsg === 'connectSocket:ok') {
+ commit('changeisconnect', true)
+ commit('changereconnectState', true)
+ }
+ },
+ fail: res => {
+ console.log(res, 'socketFail')
+ console.log('ws澶辫触');
+ commit('changereconnectState', false)
+ dispatch('reconnect')
+ }
+ })
+ 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))
+ },
+ websocketOnOpen({ state, commit }) {
+ console.log('ws鎵撳紑')
+ clearInterval(state.reconnectTimeOut)
+ clearInterval(state.globalIntervalId)
+ state.globalIntervalId = setInterval(() => {
+ state.socketTast.send({
+ data: JSON.stringify({ type: 'ping' }),
+ success(e) {
+ console.log(e, '鍙戦�佸績璺虫垚鍔�')
+ }
+ })
+ }, 30000)
+ },
+ websocketOnClose({ state, commit, dispatch }, e) {
+ if (!state.socketTast) return
+ console.log('ws鍏抽棴', e)
+ state.socketTast.close(e => {
+ commit('changeisconnect', false)
+ })
+ clearInterval(state.globalIntervalId)
+ clearInterval(state.reconnectTimeOut)
+ state.socketTast = null
+ commit('changereconnectState', false)
+ 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鎵嶄細
+ console.log('ws鎶ラ敊', e)
+ clearInterval(state.globalIntervalId)
+ clearInterval(state.reconnectTimeOut)
+ state.socketTast = null
+ commit('changereconnectState', false)
+ 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
+ }
+ },
+ // 鎺ユ敹鏁版嵁
+ websocketOnMessage({ state, commit }, result) {
+ commit('setWebsocketData', result)
+ },
+ // 閲嶆柊杩炴帴
+ reconnect({ state, commit, dispatch }) {
+ console.log(state.is_open_socket, '閲嶆柊杩炴帴socket鐘舵��');
+ clearInterval(state.globalIntervalId)
+ if (!state.is_open_socket && state.globalisLogin) {
+ state.reconnectTimeOut = setInterval(() => {
+ dispatch('websocketInit')
+ }, 5000)
+ }
}
}
})
-export default store
+export default store
\ No newline at end of file
--
Gitblit v1.9.1