Merge remote-tracking branch 'origin/master'

k94314517

2024-10-12 51e18e190dafdec70dc1f4a3a9ecd76fb2116726

 admin/src/views/task/driverDetail.vue

@@ -69,7 +69,7 @@
            <div class="content">
              <div class="head">
                <div class="event">{{ item.title }}</div>
                <div class="time">{{ item.createDate }}</div>
                <div class="time">{{ item.checkDate }}</div>
              </div>
              <div class="name_wrap">
                <span>{{ item.memberName }}<span v-if="item.statusInfo" class="status">({{ item.statusInfo
@@ -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>
@@ -135,7 +134,7 @@
      id: '',
      type: '',

      title: '访客预约详情',
      title: '物流车预约详情',
      isShowModal: false,
      info: {},
      isShowAppr: false,
@@ -270,7 +269,6 @@
    border-radius: 8px;
    overflow: hidden;
    height: 100%;

    .title {
      font-weight: 600;
      font-size: 18px;