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

---
 pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
index f294eaf..db2e681 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
@@ -29,7 +29,7 @@
 				<view class="main-information"
 					v-if="weighList.orderType=='杞叆'||weighList.orderType=='杞嚭'">
 					<view class="prefix">
-						鍙戣揣鍦扮叅鍦�:
+						鍙戣揣鍦板熀鍦�:
 					</view>
 					<view class="suffix">
 						{{ weighList.filedName || '' }}
@@ -38,7 +38,7 @@
 				<view class="main-information"
 					v-if="weighList.orderType=='杞叆'||weighList.orderType=='杞嚭'">
 					<view class="prefix">
-						鏀惰揣鍦扮叅鍦�:
+						鏀惰揣鍦板熀鍦�:
 					</view>
 					<view class="suffix">
 						{{ weighList.toFiledName || '' }}
@@ -251,12 +251,26 @@
 				deep: true
 			}
 		},
+		onPullDownRefresh() {
+			if (!this.globalisconnect && !this.globalisUploadimg && this.globalisLogin) {
+				if (!this.is_open_socket) {
+					this.$store.dispatch('websocketInit')
+					this.changeisconnect(false);
+					console.log('绉伴噸鐨剋s');
+					uni.stopPullDownRefresh();
+				} else {
+					uni.stopPullDownRefresh();
+				}
+			}
+		},
 		onShow() {
 			this.init();
 			// this.realTimeWeigh = 0
 		},
 		computed: {
-			...mapState(['globalweigh', 'globalinfraredStatus', 'globalWarning']),
+			...mapState(['globalweigh', 'globalinfraredStatus', 'globalWarning', 'globalisconnect', 'globalisUploadimg',
+				'globalisLogin', 'is_open_socket'
+			]),
 			token() {
 				return uni.getStorageSync('token');
 			},

--
Gitblit v1.9.1