From e7b0b34176549cfec809c6b89c4cab0999e488b9 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 28 三月 2023 16:40:56 +0800
Subject: [PATCH] 修改大部分问题

---
 pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
index 0080b04..b4bcb74 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
@@ -52,7 +52,7 @@
 			yyId: null,
 			dayRZ: [],
 			coalDetailsData: {}, // 鎻愮叅鍗曡鎯�
-			currentPageCoalStatus:0,// 褰撳墠椤甸潰鎻愮叅鍗曠姸鎬�
+			currentPageCoalStatus: 0, // 褰撳墠椤甸潰鎻愮叅鍗曠姸鎬�
 			// 鑾峰彇鎵�鍦ㄧ鎴垮弬鏁�
 			getWeightHouseObj: {
 				deptId: '',
@@ -77,8 +77,7 @@
 				openId: null,
 				openName: ''
 			},
-			coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅鍦�', '鍑虹叅浠�'] ,// 鐘舵��
-			
+			coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅鍦�', '鍑虹叅浠�'] // 鐘舵��
 		};
 	},
 	onShow() {
@@ -108,6 +107,8 @@
 					if (res.data.length > 0) {
 						this.serviceInfoObj.openId = res.data[0].openId;
 						this.serviceInfoObj.openName = res.data[0].openName;
+						uni.setStorageSync('customeropenId', this.serviceInfoObj.openId);
+						uni.setStorageSync('customerName', this.serviceInfoObj.openName);
 					}
 				}
 			});
@@ -131,7 +132,7 @@
 					this.getServiceOpenid.deptId = this.coalDetailsData.deptId;
 					this.getServiceOpenid.filedId = this.coalDetailsData.filedId;
 					// 鑾峰彇鎻愮叅鍗曠姸鎬�
-					this.currentPageCoalStatus = this.coalDetailsData.status
+					this.currentPageCoalStatus = this.coalDetailsData.status;
 				}
 			});
 		},
@@ -152,7 +153,9 @@
 		// 绛惧埌
 		arriveClick() {
 			uni.navigateTo({
-				url: `/pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock?orderPlanId=${this.orderPlanId}&coalStatus=${this.currentPageCoalStatus}`
+				url: `/pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock?orderPlanId=${this.orderPlanId}&coalStatus=${
+					this.currentPageCoalStatus
+				}&tmId=${this.getWeightHouseObj.tmId}`
 			});
 		},
 		// 鍏ュ満鐢宠
@@ -184,7 +187,7 @@
 					} else {
 						wx.join1v1Chat({
 							caller: { nickname: uni.getStorageSync('name'), openid: uni.getStorageSync('openid') },
-							listener: { nickname: '浠樺欢浣�', openid: 'oZjXk5e7G9uIvOzaTO6nFV51ALwk' }, // 杩欓噷鐨刼penid鏄痜yy鐨勶紝鍏呭綋鍥哄畾鐨勫鏈峯penid
+							listener: { nickname: uni.getStorageSync('customerName'), openid: uni.getStorageSync('customeropenId') }, // 杩欓噷鐨刼penid鏄痜yy鐨勶紝鍏呭綋鍥哄畾鐨勫鏈峯penid
 							backgroundType: 2,
 							roomType: 'voice',
 							success() {
@@ -215,9 +218,9 @@
 				console.log(res, '鑾峰彇纾呮埧');
 				if (res.code == 0) {
 					uni.navigateTo({
-						url: `/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice?takeCoalId=${this.orderPlanId}&sceneId=${res.data.id}&gateCameraId=${
-							res.data.lastEquipmentId
-						}&gateCameraCode=${res.data.lastEquipmentCode}&weighHouseCode=${res.data.code}`
+						url: `/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice?takeCoalId=${this.orderPlanId}&sceneId=${
+							res.data.id
+						}&gateCameraId=${res.data.lastEquipmentId}&gateCameraCode=${res.data.lastEquipmentCode}&weighHouseCode=${res.data.code}`
 					});
 				} else {
 					this.$u.toast('鏈湪纾呮埧锛岃鍓嶅線纾呮埧鍚庡啀璇曪紒锛�');

--
Gitblit v1.9.1