From 65050768bf5662148e17a824e1e2495fb3cbdac5 Mon Sep 17 00:00:00 2001 From: qingyiay <2386314947@qq.com> Date: 星期五, 30 六月 2023 15:17:54 +0800 Subject: [PATCH] 完善称重页面逻辑 --- pages/tabbar-page/index-tabbar/index-tabbar.vue | 31 ++++++++++++++++++++++++++----- 1 files changed, 26 insertions(+), 5 deletions(-) diff --git a/pages/tabbar-page/index-tabbar/index-tabbar.vue b/pages/tabbar-page/index-tabbar/index-tabbar.vue index 78d1d35..1c4698e 100644 --- a/pages/tabbar-page/index-tabbar/index-tabbar.vue +++ b/pages/tabbar-page/index-tabbar/index-tabbar.vue @@ -13,7 +13,7 @@ </view> </view> </view> - <customer-index v-if="roleType == 1" + <customer-index v-if="roleType == 1||roleType == 4" ref="customerIndexRef" :orderPlanDataStore="orderPlanDataStore"></customer-index> <freight-forwarder-index v-if="roleType == 2" @@ -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> @@ -70,7 +70,7 @@ }); } // 瀹㈡埛鑾峰彇鏃ヨ鍒� - if (this.roleType == 1) { + if (this.roleType == 1 || this.roleType == 4) { this.$reqGet('GetOrderPlan').then(res => { if (res.data) { this.orderPlanDataStore = res.data; @@ -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']), @@ -202,6 +217,12 @@ this.$refs.driverIndexRef.init(); }); break; + case 4: + console.log('customerIndexRef'); + this.$nextTick(() => { + this.$refs.customerIndexRef.init(); + }); + break; default: break; } -- Gitblit v1.9.1