From d8974c0d693b51760ba5ab935aa240512a873a93 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 25 四月 2023 08:37:29 +0800
Subject: [PATCH] 修改样式，修复已知bug
---
pages/tabbar-page/index-tabbar/index-tabbar.vue | 50 ++++++++++++++++++++++++++++++--------------------
1 files changed, 30 insertions(+), 20 deletions(-)
diff --git a/pages/tabbar-page/index-tabbar/index-tabbar.vue b/pages/tabbar-page/index-tabbar/index-tabbar.vue
index a42f5ec..83b66ea 100644
--- a/pages/tabbar-page/index-tabbar/index-tabbar.vue
+++ b/pages/tabbar-page/index-tabbar/index-tabbar.vue
@@ -13,7 +13,9 @@
<driver-index v-if="roleType == 3" ref="driverIndexRef" :indexdriverBillOfLoadingData="indexdriverBillOfLoadingData"></driver-index>
<tab-bar :current="0"></tab-bar>
<!-- 鎺ㄩ�佹秷鎭脊绐� -->
- <u-modal :show="messagePushShow" :title="messageList.title" :content="messageList.content" @confirm="messageconfirm"></u-modal>
+ <u-modal :show="messagePushShow" :title="messageList.title" @confirm="messageconfirm">
+ <view class="slot-content"><rich-text :nodes="messageList.content"></rich-text></view>
+ </u-modal>
</view>
</template>
@@ -115,9 +117,6 @@
isconnect: false
};
},
- beforeDestroy() {
- this.closeSocket();
- },
onShow() {
this.init();
if (!this.isconnect) {
@@ -125,8 +124,16 @@
}
this.userAuthorization();
},
- onBackPress() {
- this.closeSocket();
+ onHide() {
+ console.log('椤甸潰闅愯棌');
+ if (!this.isconnect) {
+ this.initWebsocket();
+ }
+ },
+ onUnload() {
+ console.log('椤甸潰鍗歌浇');
+ socket.close();
+ clearInterval(this.intervalId);
},
methods: {
...mapMutations(['pushMessage', 'changeWeigh', 'changeinfraredStatus']),
@@ -214,10 +221,19 @@
});
socket.onOpen(() => {
console.log('onOpen');
+ this.intervalId = setInterval(() => {
+ socket.send({
+ data: JSON.stringify({ type: 'ping' }),
+ success(e) {
+ console.log(e, '鍙戦�佸績璺虫垚鍔�');
+ }
+ });
+ }, 30000);
});
+
// 鑾峰彇鏈嶅姟鍣ㄤ紶鏉ョ殑鏁版嵁锛屽仛鐩稿簲澶勭悊
socket.onMessage(res => {
- console.log('socketWeigh', res);
+ console.log('message', res);
if (res.data.startsWith('weigh')) {
let nowWeighObj = JSON.parse(res.data.slice(7));
if (this.globalweighHouseCode && nowWeighObj.eqCode == this.globalweighHouseCode) {
@@ -229,27 +245,21 @@
this.changeWeigh(nowWeighObj.weigh);
}
}
- } else {
+ } else if (res.data.startsWith('msg')) {
this.messageList = JSON.parse(res.data.slice(5));
this.messagePushShow = true;
+ } else {
+ console.log('websocket鍚姩涓�');
}
});
- socket.onClose(() => {
- console.log('webSocketClose');
+ socket.onClose(e => {
+ console.log('webSocketClose', e);
+ // this.$u.toast('杩炴帴宸叉柇寮�锛岃閲嶆柊杩涘叆璇ラ〉闈紝閲嶈瘯锛侊紒');
+ this.isconnect = false;
});
socket.onError(err => {
console.log('socket鎶ラ敊', err);
this.$u.toast('鍑虹幇閿欒锛岃閲嶆柊杩涘叆璇ラ〉闈紝閲嶈瘯锛侊紒');
- });
- },
- closeSocket() {
- socket.close({
- success(res) {
- console.log('鍏抽棴鎴愬姛', res);
- },
- fail(err) {
- console.log('鍏抽棴澶辫触', err);
- }
});
},
messageconfirm() {
--
Gitblit v1.9.1