Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

17 小时以前 cb6aca0642ac8dd5de877ade168066d85acb589c

 pda/pages/index/queueup.vue

@@ -17,6 +17,7 @@
          type="text"
          placeholder="搜索车辆牌照"
          placeholder-class="placeholder9"
               confirm-type="search"
          @confirm="handleQuery"
        />
      </view>
@@ -26,7 +27,7 @@
    </view>
    <!--  -->
    <view class="dataList">
      <view class="item" v-for="item in platformLineUpList" :key="item.id">
      <view class="item" v-for="item,i in platformLineUpList" :key="i">
        <view class="head">
          <view v-if="item.carCodeFront" class="code">
            <text>{{ item.carCodeFront.slice(0, 1) }}</text>
@@ -34,9 +35,10 @@
            <text>·</text>
            <text>{{ item.carCodeFront.slice(2) }}</text>
          </view>
          <view class="status" v-if="item.signDate"
            >签到时间：{{ item.signDate.slice(11, 16) }}</view
          >
          <!-- <view class="status green" v-if="item.status == 2">月台等待</view > -->
          <view class="status green" v-if="item.status == 2">等待叫号</view >
          <view class="status" v-if="item.status == 3">入园等待</view >
          <view class="status" v-if="item.status == 7">转移中</view >
        </view>
        <view class="line" v-if="item.billCode">
          <text class="label">运输单号</text>
@@ -66,6 +68,10 @@
          <text class="label">运输公司</text>
          <text class="value">{{ item.carrierName }}</text>
        </view>
            <view class="line">
              <text class="label primaryColor">签到时间</text>
              <text class="value primaryColor" v-if="item.signDate">{{ item.signDate.slice(5, 16) }}</text>
            </view>
        <!-- <view class="btns">
          <view class="btn active">入园</view>
        </view> -->
@@ -158,7 +164,13 @@
  },
   onReachBottom() {
      if(this.total > this.platformLineUpList.length){
         this.page ++
         this.getList()
      }else{
         uni.showToast({
            title:'暂无更多数据',
            icon: 'none'
         })
      }
   },
  methods: {
@@ -301,6 +313,9 @@
          font-size: 30rpx;
          color: $uni-color-primary;
        }
            .green{
               color: #00BA67;
            }
      }
      .line {
        display: flex;