From 491249bdf736a5f7d50417c889ad2db734b12383 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期四, 07 九月 2023 10:22:07 +0800
Subject: [PATCH] 操作指引修改

---
 pages/tabbar-page/index-tabbar/index-tabbar.vue |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/pages/tabbar-page/index-tabbar/index-tabbar.vue b/pages/tabbar-page/index-tabbar/index-tabbar.vue
index 81d8858..44b4ce4 100644
--- a/pages/tabbar-page/index-tabbar/index-tabbar.vue
+++ b/pages/tabbar-page/index-tabbar/index-tabbar.vue
@@ -41,7 +41,6 @@
 	import freightForwarderIndex from '@/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue';
 	import { mapState, mapMutations } from 'vuex';
 	import { webSocketUrl } from '@/api/request.js';
-
 	let socket = null;
 	export default {
 		components: {
@@ -57,7 +56,7 @@
 		//棣栭〉涓嬫媺鍒锋柊
 		onPullDownRefresh() {
 			uni.showLoading({ title: '鍔犺浇涓�...' });
-			// 鑾峰彇鍘嗗彶鎻愮叅鍗�
+			// 鑾峰彇鍘嗗彶閫氱煡鍗�
 			if (this.roleType == 1 || this.roleType == 2) {
 				this.$reqGet('getJhOrderPlanDataPage', { current: 1, size: 10 }).then(res => {
 					if (res.data.records) {
@@ -138,7 +137,8 @@
 				},
 				isconnect: false,
 				dotShow: false,
-				appHide: false
+				appHide: false,
+				phone: ''
 			};
 		},
 		watch: {
@@ -150,9 +150,13 @@
 						if (nowWeighObj.eqInfraredStatus) {
 							this.changeinfraredStatus(true);
 							this.changeWeigh(nowWeighObj.weigh);
+							let warningState = nowWeighObj.warning == 1
+							this.changeWarning(warningState)
 						} else {
 							this.changeinfraredStatus(false);
 							this.changeWeigh(nowWeighObj.weigh);
+							let warningState = nowWeighObj.warning == 1
+							this.changeWarning(warningState)
 						}
 					}
 				} else if (v.startsWith('msg')) {
@@ -171,10 +175,10 @@
 		},
 		onShow() {
 			this.init();
-			console.log(this.globalisconnect);
 			if (this.globalisconnect) {
 				this.$store.dispatch('websocketInit')
 				this.changeisconnect(false)
+				this.changeisLogin(true)
 				console.log(this.globalisconnect, 'index鐨剋s鏁版嵁鈥�');
 			}
 			this.userAuthorization();
@@ -187,7 +191,9 @@
 			this.changeisconnect(true)
 		},
 		methods: {
-			...mapMutations(['pushMessage', 'changeWeigh', 'changeinfraredStatus', 'changeisconnect', 'websocketInit']),
+			...mapMutations(['pushMessage', 'changeWeigh', 'changeinfraredStatus', 'changeisconnect', 'websocketInit',
+				'changeisLogin', 'changeWarning'
+			]),
 			messagePage() {
 				uni.navigateTo({
 					url: '/pages/public-page/message/message'
@@ -275,7 +281,7 @@
 						this.dotShow = filtermessage.length > 0;
 					}
 				});
-			}
+			},
 		}
 	};
 </script>

--
Gitblit v1.9.1