From c502a1e37ea372b52140e8913f636c9d57b56e23 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期一, 26 六月 2023 14:25:05 +0800
Subject: [PATCH] 删除无用页面

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

diff --git a/pages/tabbar-page/index-tabbar/index-tabbar.vue b/pages/tabbar-page/index-tabbar/index-tabbar.vue
index 78d1d35..7fe7a38 100644
--- a/pages/tabbar-page/index-tabbar/index-tabbar.vue
+++ b/pages/tabbar-page/index-tabbar/index-tabbar.vue
@@ -29,7 +29,7 @@
 			:title="messageList.title"
 			@confirm="messageconfirm"
 			confirm-text="鍓嶅幓鏌ョ湅">
-			<view class="slot-content"><rich-text :nodes="messageList.content"></rich-text></view>
+			<view class="slot-content"><u-parse :content="messageList.content"></u-parse></view>
 		</u-modal>
 		<!-- <view class="white-block"></view> -->
 	</view>
@@ -132,7 +132,10 @@
 				indexHistoryCoalData: [],
 				indexdriverBillOfLoadingData: {},
 				messagePushShow: false,
-				messageList: {},
+				messageList: {
+					title: '',
+					content: "",
+				},
 				isconnect: false,
 				dotShow: false,
 				appHide: false
@@ -153,15 +156,26 @@
 						}
 					}
 				} else if (v.startsWith('msg')) {
+					function removeTags(str) {
+						return str.replace(/<\/?[^>]+>/gi, '');
+					}
 					this.messageList = JSON.parse(v.slice(5));
+					this.messageList = {
+						...this.messageList,
+						title: this.messageList.title.slice(0, 8) + '...',
+						content: removeTags(this.messageList.content).trim().slice(0, 8) + '...'
+					}
 					this.messagePushShow = true;
 				} else {}
 			}
 		},
 		onShow() {
 			this.init();
-			if (!this.globalisconnect) {
+			console.log(this.globalisconnect);
+			if (this.globalisconnect) {
 				this.$store.dispatch('websocketInit')
+				this.changeisconnect(false)
+				console.log(this.globalisconnect, 'index鐨剋s蹇冧簨鈥�');
 			}
 			this.userAuthorization();
 			this.messageReq();
@@ -173,6 +187,7 @@
 			console.log('椤甸潰鍗歌浇');
 			this.$store.dispatch('websocketOnClose')
 			clearInterval(this.globalIntervalId);
+			this.changeisconnect(true)
 		},
 		methods: {
 			...mapMutations(['pushMessage', 'changeWeigh', 'changeinfraredStatus', 'changeisconnect', 'websocketInit']),

--
Gitblit v1.9.1