From eb49564ab17c6695d8928d5a63a57c58b3cfd79c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十二月 2024 18:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 h5/pages/driver/queueUpRecord.vue |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/h5/pages/driver/queueUpRecord.vue b/h5/pages/driver/queueUpRecord.vue
index de92b96..e70a000 100644
--- a/h5/pages/driver/queueUpRecord.vue
+++ b/h5/pages/driver/queueUpRecord.vue
@@ -6,11 +6,11 @@
 		</view>
 		<!--  -->
 		<view class="main_list">
-			<view class="item" :class="{ active: item.driverId == driverInfo.memberId }" v-for="item in dataList" :key="item.id">
+			<view class="item" :class="{ active: item.drivierPhone == driverInfo.mobile }" v-for="item in dataList" :key="item.id">
 				<view class="status padding" v-if="item.status == 2">鎺掗槦涓�</view>
 				<view class="status" v-else :class="{ padding: item.status != 5 }">{{ statusMap[item.status] }}</view>
-				<view v-if="item.driverId == driverInfo.memberId" class="me">鎴�</view>
-				<image v-if="item.driverId == driverInfo.memberId" class="avatar" src="@/static/driver/ic_truck_mine@2x.png" mode=""></image>
+				<view v-if="item.drivierPhone == driverInfo.mobile" class="me">鎴�</view>
+				<image v-if="item.drivierPhone == driverInfo.mobile" class="avatar" src="@/static/driver/ic_truck_mine@2x.png" mode=""></image>
 				<image v-else class="avatar" src="@/static/driver/ic_truck@2x.png" mode=""></image>
 				<view class="content">
 					<view class="id_card" v-if="item.carCodeFront">{{ item.carCodeFront.slice(0, 4) }}**{{ item.carCodeFront.slice(6) }}</view>
@@ -23,6 +23,7 @@
 					</view>
 				</view>
 			</view>
+			
 		</view>
 	</view>
 </template>
@@ -48,6 +49,9 @@
 		this.type = option.type;
 		this.platformId = option.platformId;
 		this.getData(option.jobId || '');
+		uni.setNavigationBarTitle({
+		  title: this.type == 0 ? '宸茬鍒拌溅杈�' : '浣滀笟涓溅杈�'
+		})
 	},
 	methods: {
 		getData(jobId) {

--
Gitblit v1.9.3