From 17efddc6a667670dca682bf36b51a43e99615e6d Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 16 十月 2024 15:59:38 +0800
Subject: [PATCH] 代码初始化
---
h5/pages/driver/index.vue | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/h5/pages/driver/index.vue b/h5/pages/driver/index.vue
index f8350f4..82c5cc7 100644
--- a/h5/pages/driver/index.vue
+++ b/h5/pages/driver/index.vue
@@ -16,16 +16,17 @@
<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.billCode }}</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="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,10 +41,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>
@@ -54,7 +56,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>
@@ -129,9 +131,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 +321,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