From b33b256a0e996df1e8ca1859ba538fe3ea085509 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 25 九月 2024 17:44:13 +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 f8350f4..7c535b4 100644
--- a/h5/pages/driver/index.vue
+++ b/h5/pages/driver/index.vue
@@ -40,10 +40,11 @@
 								</view>
 							</view>
 							<view class="sub">
-								<view class="time" v-if="item.arriveDate">{{ item.arriveDate.slice(5) }}</view>
+								<view class="time" v-if="item.arriveDate && item.type == 4">{{ 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>
-								<view v-if="item.status == 2" class="sub_btn">鏌ョ湅鎺掗槦</view>
+								<view v-if="item.status == 2" class="sub_btn" @click.stop="handleQueue(item)">鏌ョ湅鎺掗槦</view>
 							</view>
 						</view>
 					</view>
@@ -129,9 +130,11 @@
 			console.log(item);
 			if(status == 0){
 				uni.navigateTo({url: '/pages/driver/taskConfirm?id=' + item.id});
-			}else if(status == 2){
-				uni.navigateTo({url:'/pages/driver/queueUp?jobId=' + item.id})
-			}else{
+			}
+			// else if(status == 2){
+			// 	uni.navigateTo({url:'/pages/driver/queueUp?jobId=' + item.id})
+			// }
+			else{
 				uni.navigateTo({url: `/pages/driver/taskDetail?id=${item.id}&status=${item.status}`});
 			}
 		},
@@ -317,7 +320,8 @@
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
-				padding: 0 30rpx 24rpx;
+				height: 68rpx;
+				padding: 0 30rpx 0;
 				.time {
 					font-size: 26rpx;
 					color: #999999;

--
Gitblit v1.9.3