From a25c7697644a40d3aa3a9746085a9a7618dd098a Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 10 十月 2023 08:15:09 +0800
Subject: [PATCH] 修改称重提示错误 修改判断

---
 pages/tabbar-page/index-tabbar/index-tabbar.vue |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/pages/tabbar-page/index-tabbar/index-tabbar.vue b/pages/tabbar-page/index-tabbar/index-tabbar.vue
index 859715a..d6216d9 100644
--- a/pages/tabbar-page/index-tabbar/index-tabbar.vue
+++ b/pages/tabbar-page/index-tabbar/index-tabbar.vue
@@ -124,8 +124,10 @@
 			clearInterval(this.globalIntervalId);
 			this.changeisconnect(false)
 		},
-		onLoad() {
+		onShow() {
 			this.init();
+		},
+		onLoad() {
 			this.$store.dispatch('websocketInit')
 			this.$store.commit('changeisLogin', true)
 			console.log(this.globalisconnect, 'index鐨剋s鏁版嵁');
@@ -189,16 +191,20 @@
 					}
 				} else if (v.startsWith('wsg')) {
 					let wsgObj = JSON.parse(v.slice(5));
-					if (uni.getStorageInfoSync('carNo') === wsgObj.carNo) {
-						changewsgVisiable(true)
-						changewsgContent(wsgObj.content)
+					if (uni.getStorageSync('carNo') === wsgObj.carNo && !wsgObj.peopleWeigh) {
+						this.changewsgVisiable(true)
+						this.changewsgContent(wsgObj.content)
+					}
+					if (uni.getStorageSync('carNo') === wsgObj.carNo && wsgObj.peopleWeigh === 2) {
+						this.changeconfirmWeighVisiable(true)
+						this.changeconfirmWeighContent(wsgObj.content)
 					}
 				}
 			}
 		},
 		methods: {
 			...mapMutations(['pushMessage', 'changeWeigh', 'changeinfraredStatus', 'changeisconnect', 'websocketInit',
-				'changewsgVisiable', 'changewsgContent'
+				'changewsgVisiable', 'changewsgContent', 'changeconfirmWeighVisiable', 'changeconfirmWeighContent'
 			]),
 			messagePage() {
 				uni.navigateTo({

--
Gitblit v1.9.1