From 3ac695aaee5aab01d8cb39a56388c2740913dbec Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 06 十二月 2024 17:18:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/driver/index.vue | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/h5/pages/driver/index.vue b/h5/pages/driver/index.vue
index 82c5cc7..e79d32a 100644
--- a/h5/pages/driver/index.vue
+++ b/h5/pages/driver/index.vue
@@ -16,7 +16,7 @@
<swiper-item v-for="item in taskList" :key="item.id" @click="taskClick(item)">
<view class="item">
<view class="head">
- <view class="name">杩愯緭鍗晎{ item.billCode }}</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>
@@ -25,8 +25,10 @@
<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="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 class="time" v-if="item.finishTimeStr && item.status == 5">棰勮瀹屾垚鏃堕棿锛歿{ item.finishTimeStr }}</view>
</view>
</view>
<view class="content">
@@ -41,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>
@@ -164,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