From e8a54d02091da6674054d9c3c176ef012df3751e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 08 十月 2024 10:39:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/task/driverDetail.vue | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/admin/src/views/task/driverDetail.vue b/admin/src/views/task/driverDetail.vue
index 3833e48..2856745 100644
--- a/admin/src/views/task/driverDetail.vue
+++ b/admin/src/views/task/driverDetail.vue
@@ -78,12 +78,11 @@
<div v-if="item.checkInfo" class="remark">
{{ item.checkInfo }}
</div>
- <div v-if="item.approveType == 1" class="carbon">
+ <div v-if="item.approveType == 0 || item.type == 1 || item.approveType == 1" class="carbon">
<div class="carbon_item" v-for="child in item.approveList" :key="child.id">
- <img :src="child.faceImg
- ? child.faceImg
- : require('@/assets/avatar/man.png')
- "></img>
+ <img v-if="child.faceImg != null && child.faceImg != ''" :src="child.faceImg" class="avatar" alt="" />
+ <img v-if="child.faceImg == null || child.faceImg == ''" src="@/assets/avatar/man.png" class="avatar"
+ alt="" />
<div class="text">{{ child.memberName }}</div>
</div>
</div>
--
Gitblit v1.9.3