From 86baa8ff948d2e79588e0dd7efa16f6b8ac3b157 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 06 十二月 2024 15:29:15 +0800
Subject: [PATCH] ll

---
 h5/pages/driver/index.vue |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/h5/pages/driver/index.vue b/h5/pages/driver/index.vue
index 7c535b4..e79d32a 100644
--- a/h5/pages/driver/index.vue
+++ b/h5/pages/driver/index.vue
@@ -16,16 +16,19 @@
 				<swiper-item v-for="item in taskList" :key="item.id" @click="taskClick(item)">
 					<view class="item">
 						<view class="head">
-							<view class="name">杩愯緭鍗晎{ item.contractNum }}</view>
+							<view class="name">{{ item.contractNum ? '鍚堝悓鍗�' : '杩愯緭鍗�' }}{{ item.billCode || item.contractNum}}</view>
 							<view class="status">
 								<view class="text" v-if="item.status == 0">璇风‘璁や换鍔�</view>
 								<view class="text" v-if="item.status == 1">璇蜂簬{{item.arriveDate.slice(5,11)}}鐜板満绛惧埌</view>
 								<view class="text" v-if="item.status == 2">鍓嶆柟鎺掗槦锛歿{item.lineUpNum}}杈�</view>
 								<view class="text" v-if="item.status == 3">璇峰叆鍥繘鍏ョ瓑寰呭尯</view>
-								<view class="text" v-if="item.status == 4">璇峰叆鍥仠闈�1鍙锋湀鍙颁綔涓�</view>
-								<view class="text" v-if="item.status == 5">1鍙锋湀鍙颁綔涓氫腑</view>
+								<view class="text" v-if="item.status == 4">璇峰叆鍥仠闈爗{item.platformName}}浣滀笟</view>
+								<view class="text" v-if="item.status == 5">{{item.platformName}}浣滀笟涓�</view>
 								<view class="text" v-if="item.status == 6">浣滀笟宸插畬鎴�</view>
-								<view class="time" v-if="item.waitTime">{{ item.waitTime }}</view>
+								<view class="text" v-if="item.status == 7">杞Щ涓�</view>
+								<view class="text red" v-if="item.status == 8">寮傚父鎸傝捣</view>
+								<view class="time" v-if="item.waitTime && item.status == 2">{{ item.waitTime }}</view>
+								<view class="time" v-if="item.finishTimeStr && item.status == 5">棰勮瀹屾垚鏃堕棿锛歿{ item.finishTimeStr }}</view>
 							</view>
 						</view>
 						<view class="content">
@@ -40,7 +43,7 @@
 								</view>
 							</view>
 							<view class="sub">
-								<view class="time" v-if="item.arriveDate && item.type == 4">{{ item.arriveDate.slice(5) }}</view>
+								<view class="time" v-if="item.arriveDate && item.contractNum">{{ item.arriveDate.slice(5) }}</view>
 								<view class="time" v-if="item.type != 4 && item.platformWmsJob && item.platformWmsJob.ioCreatedate">{{ item.platformWmsJob.ioCreatedate.slice(5, 19) }}</view>
 								<view v-if="item.status == 0" class="sub_btn">纭浠诲姟</view>
 								<view v-if="item.status == 1" class="sub_btn">绔嬪嵆绛惧埌</view>
@@ -55,7 +58,7 @@
 		<view class="title_wrap"><view class="name">涓氬姟鍔炵悊</view></view>
 		<view class="container1">
 			<view class="left">
-				<view class="img_wrap img1" @click="$jump('/pages/driver/reserved')">
+				<view class="img_wrap img1" @click="$jump('/pages/driver/notice')">
 					<image src="@/static/driver/wuliu_ic_ruyuanyuyue@2x.png" class="img"></image>
 					<view class="h1">鍏ュ洯椤荤煡</view>
 					<view class="h2">RESERVATION</view>
@@ -163,6 +166,7 @@
 	justify-content: space-between;
 	align-items: center;
 	margin-bottom: 24rpx;
+	padding-top: 10rpx;
 	.name {
 		font-weight: 600;
 		font-size: 34rpx;

--
Gitblit v1.9.3