From 700c025aa912047fbd71975d4c6f8bb930ba82f8 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期四, 16 十一月 2023 17:12:49 +0800
Subject: [PATCH] 司机日计划通知单增加创建时间，称重页面样式优化
---
store/index.js | 172 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 155 insertions(+), 17 deletions(-)
diff --git a/store/index.js b/store/index.js
index 5b11172..0878a06 100644
--- a/store/index.js
+++ b/store/index.js
@@ -43,12 +43,13 @@
text: '鎴戠殑'
}
],
- three: [{
- pagePath: 'pages/tabbar-page/index-tabbar/index-tabbar',
- iconPath: '../../static/tabBar-icon/home.png',
- selectedIconPath: '../../static/tabBar-icon/homeblue.png',
- text: '棣栭〉'
- },
+ three: [
+ // {
+ // pagePath: 'pages/tabbar-page/index-tabbar/index-tabbar',
+ // iconPath: '../../static/tabBar-icon/home.png',
+ // selectedIconPath: '../../static/tabBar-icon/homeblue.png',
+ // text: '棣栭〉'
+ // },
{
pagePath: 'pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan',
iconPath: '../../static/tabBar-icon/checking.png',
@@ -103,6 +104,59 @@
socketTask: null,
websocketData: null, // 瀛樻斁浠庡悗绔帴鏀跺埌鐨剋ebsocket鏁版嵁
globalIntervalId: null,
+ is_open_socket: false, //閬垮厤閲嶅杩炴帴
+ connectNum: 1, //閲嶈繛娆℃暟,
+ reconnectTimeOut: null,
+ // 绉伴噸绋冲畾鎬� 0/绋冲畾 1/闈炵ǔ瀹� 闈炵ǔ瀹氭�佷笉鑳界偣绉伴噸
+ globalWarning: false,
+ globalShowWeigh: [],
+ isFirstLogin: true,
+ driverTourImgList: ['https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj1.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj2.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj3.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj4.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj5.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj6.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj7.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj8.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj9.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj10.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj11.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj12.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj13.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj14.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj15.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj16.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj17.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj18.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj19.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj20.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj21.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj22.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj23.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj24.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj25.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj26.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj27.jpg',
+ ],
+ customerTourImgList: ['https://mx.jzeg.cn:9095/appimg/image/tour/quality/quality1.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/quality/quality2.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/quality/quality3.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/quality/quality4.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/quality/quality5.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/quality/quality6.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/quality/quality7.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/quality/quality8.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/quality/quality9.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/quality/quality10.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/quality/quality11.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/quality/quality12.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/quality/quality13.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/quality/quality14.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/quality/quality15.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/quality/quality16.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/quality/quality17.jpg',
+ ],
},
mutations: {
lengthchange(state, payload) {
@@ -114,13 +168,13 @@
// 璁剧疆搴曢儴鏍�
setUserTabbar(state, roleType) {
state.roleType = roleType
- if (roleType == 1) {
+ if (roleType === 1) {
state.userTabbar = userRoleTabbar.first
uni.setStorageSync('userTabbar', state.userTabbar)
- } else if (roleType == 2 || roleType == 3) {
+ } else if (roleType === 2 || roleType === 3) {
state.userTabbar = userRoleTabbar.second
uni.setStorageSync('userTabbar', state.userTabbar)
- } else if (roleType == 4) {
+ } else if (roleType === 4) {
state.userTabbar = userRoleTabbar.three
uni.setStorageSync('userTabbar', state.userTabbar)
}
@@ -159,6 +213,29 @@
},
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
+ }
+ },
+ // 鏀瑰彉绋冲畾鎬�
+ changeWarning(state, payload) {
+ state.globalWarning = payload
+ },
+ changeglobalShowWeigh(state, payload) {
+ state.globalShowWeigh = payload
+ },
+ changeisFirstLogin(state, payload) {
+ state.isFirstLogin = payload
+ console.log(state.isFirstLogin, '绗竴娆＄櫥褰�');
}
},
actions: {
@@ -167,20 +244,30 @@
state.socketTast = uni.connectSocket({
url: wsUrl,
header: { CLIENT_TOC: 'Y' },
- complete: res => {
- console.log(res, 'socket缁撴灉')
+ 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'))
+ state.socketTast.onError(e => dispatch('websocketOnError', e))
},
websocketOnOpen({ state, commit }) {
- console.log('onOpen')
+ console.log('ws鎵撳紑')
+ clearInterval(state.reconnectTimeOut)
+ clearInterval(state.globalIntervalId)
state.globalIntervalId = setInterval(() => {
state.socketTast.send({
data: JSON.stringify({ type: 'ping' }),
@@ -190,19 +277,70 @@
})
}, 30000)
},
- websocketOnClose({ state, commit }) {
+ websocketOnClose({ state, commit, dispatch }, e) {
if (!state.socketTast) return
+ console.log('ws鍏抽棴', e)
state.socketTast.close(e => {
commit('changeisconnect', false)
})
- console.log('ws鍏抽棴')
+ 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(e) {
- console.log('socket鎶ラ敊', e)
+ 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)
+ }
}
}
})
--
Gitblit v1.9.1