From 82a7eba143cc761b303b99889193f7aad2dc9d08 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期一, 28 八月 2023 08:56:08 +0800
Subject: [PATCH] 修改bug,称重页面增加历史和异常原因填写

---
 pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue |   37 +++++++++++++++++++------------------
 1 files changed, 19 insertions(+), 18 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 7042ecc..fae8472 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
@@ -39,19 +39,19 @@
 							<view class="concrete"
 								style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/skin.png') no-repeat;background-size: cover;">
 								鐨�</view>
-							<view class="num">{{ coalDetailsData.skin }}</view>
+							<view class="num">{{ coalDetailsData.skin||"" }}</view>
 						</view>
 						<view class="item">
 							<view class="concrete"
 								style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/hair.png') no-repeat;background-size: cover;">
 								姣�</view>
-							<view class="num">{{ coalDetailsData.hair }}</view>
+							<view class="num">{{ coalDetailsData.hair||""  }}</view>
 						</view>
 						<view class="item">
 							<view class="concrete"
 								style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/clean.png') no-repeat;background-size: cover;">
 								鍑�</view>
-							<view class="num">{{ coalDetailsData.clean }}</view>
+							<view class="num">{{ coalDetailsData.clean||""  }}</view>
 						</view>
 					</view>
 				</view>
@@ -143,6 +143,10 @@
 				this.getWeightHouseObj.overTmWaixiao = value.overTmWaixiao
 			}
 		},
+		onShow() {
+			this.init();
+
+		},
 		data() {
 			return {
 				orderPlanId: null,
@@ -175,7 +179,7 @@
 					openName: ''
 				},
 				coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅浠�', '鍑虹叅浠�', '鏀剧┖', '浣滃簾', '鍏ュ満鐢宠',
-					'杩涘叆鍦洪櫌'
+					'杩涘叆鍦洪櫌', '寮傚父瀹℃牳涓�'
 				], // 鐘舵��
 				weighHouseCode: '',
 				// 鏀剧┖寮圭獥鎺у埗鍙橀噺
@@ -210,9 +214,6 @@
 
 			};
 		},
-		onShow() {
-			this.init();
-		},
 		onHide() {
 			clearInterval(this.interval);
 		},
@@ -242,7 +243,7 @@
 				return this.coalDetailsData.hair !== 0 || this.coalDetailsData.skin !== 0;
 			},
 			isapproach() {
-				return this.currentPageCoalStatus <= 3;
+				return this.currentPageCoalStatus !== 3;
 			}
 		},
 		methods: {
@@ -265,21 +266,19 @@
 				});
 				this.coalDayPage(); //鑾峰彇鏃ュ織
 				this.getTakeCoal(); //鑾峰彇鎻愮叅鍗曡鎯�
-				this.getgetService(); //鑾峰彇瀹㈡湇
+
 			},
 			// 鑾峰彇瀹㈡湇openid
 			getgetService() {
 				this.$reqGet('getCallOutList', this.getServiceOpenid).then(res => {
 					console.log(res, '瀹㈡湇openid');
 					if (res.code != 0) {
-						this.$u.toast('鑾峰彇瀹㈡湇淇℃伅澶辫触');
+						this.$u.toast(res.msg ? res.msg : '鑾峰彇瀹㈡湇淇℃伅澶辫触');
 					} else {
-						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);
-						}
+						this.serviceInfoObj.openId = res.data.openId;
+						this.serviceInfoObj.openName = res.data.openName;
+						uni.setStorageSync('customeropenId', this.serviceInfoObj.openId);
+						uni.setStorageSync('customerName', this.serviceInfoObj.openName);
 					}
 				});
 			},
@@ -337,6 +336,8 @@
 							})
 						}
 					}
+				}).then(() => {
+					this.getgetService(); //鑾峰彇瀹㈡湇
 				})
 			},
 			// 鏃ュ織鏌ヨ
@@ -403,7 +404,7 @@
 						} else {
 							wx.join1v1Chat({
 								caller: {
-									nickname: uni.getStorageSync('name'),
+									nickname: uni.getStorageSync('username'),
 									openid: uni.getStorageSync(
 										'openid')
 								},
@@ -411,7 +412,7 @@
 									nickname: uni.getStorageSync('customerName'),
 									openid: uni.getStorageSync(
 										'customeropenId')
-								}, // 杩欓噷鐨刼penid鏄痜yy鐨勶紝鍏呭綋鍥哄畾鐨勫鏈峯penid
+								},
 								backgroundType: 2,
 								roomType: 'voice',
 								success() {

--
Gitblit v1.9.1