Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2025-03-12 908ce43ff21c2068ef5148b0a417423c8ed9eae5

 h5/pages/driver/reservedDetail.vue

@@ -3,7 +3,9 @@
    <view class="status_wrap">
      <view class="name">{{info.driverName}}的入园预约</view>
      <view class="desc">{{info.carCodeFront}}</view>
      <view class="status">{{ statusMap[info.status] }}</view>
      <view class="status" v-if="info.status != 2 && info.status != 3">{{ statusMap[info.status] }}</view>
         <image v-if="info.status == 2" class="icon" src="../../static/ic_passed@2x.png" mode=""></image>
         <image v-if="info.status == 3" class="icon" src="../../static/ic_refused@2x.png" mode=""></image>
    </view>
    <!--  -->
    <view class="emyty"></view>
@@ -26,6 +28,7 @@
               <image
                  v-if="info.transportImg"
                 class="avatar_wrap"
                  @click="priviewImage(info.prefixUrl + info.transportImg)"
                 :src="info.prefixUrl + info.transportImg"
               ></image>
            </view>
@@ -89,7 +92,7 @@
            <view class="name_wrap">
              <text>{{item.memberName}}<text v-if="item.statusInfo" class="status">({{item.statusInfo}})</text></text>
            </view>
                <view v-if="item.approveType == 1" class="carbon">
                <view v-if="item.approveType == 1 || item.approveType == 0" class="carbon">
                  <view class="carbon_item" v-for="child in item.approveList"
                :key="child.id">
                    <image :src="
@@ -123,16 +126,22 @@
         statusMap: {
            0: '待审批',
            1: '审批中',
            2: '审批通过',
            3: '审批不通过',
            2: '已通过',
            3: '已拒绝',
            4: '已取消',
         },
    }
  },
   onLoad(option) {
      uni.setStorageSync('ywinfo',{})
      this.getDetail(option.id)
   },
  methods: {
      priviewImage(url) {
         uni.previewImage({
            urls: [url]
         })
      },
      handleCancel(){
         const { info } = this
         uni.showModal({
@@ -142,6 +151,8 @@
               if (res.confirm) {
                  driverCarRevoke({
                     id: info.id, info: ''
                  }).then(() => {
                     this.getDetail(info.id)
                  })
               } else if (res.cancel) {
                  console.log('用户点击取消');
@@ -293,6 +304,7 @@
              width: 60rpx;
              height: 60rpx;
              margin: 0 auto;
                     border-radius: 50%;
            }
            view {
              font-size: 26rpx;
@@ -348,7 +360,6 @@
  .status_wrap {
    position: relative;
    padding: 30rpx 0;

    .name {
      font-weight: 600;
      font-size: 32rpx;
@@ -372,6 +383,15 @@
      background-color: #e9edff;
      color: $uni-color-primary;
    }
      .icon{
         width: 120rpx;
         height: 120rpx;
         border-radius: 50%;
         position: absolute;
         right: 0rpx;
         top: 20rpx;
			
      }
  }

  .main_footer {