Merge remote-tracking branch 'origin/master'

renkang

2025-01-03 ccf28d1fed1aa2e5437dbe64b5133ba1cbde6ec7

 h5/pages/workOrder/list.vue

@@ -32,7 +32,7 @@
      <scroll-view scroll-y="true" class="scroll_Y" @scrolltolower="scrolltolower">

         <view class="list">

            <view class="item" v-for="item in list" @click="itemClick(item)">

               <image v-if="item.dealStatus == 0" src="@/static/side/workordered.png" class="icon"></image>

               <image v-if="item.dealStatus == 0 || item.dealStatus == 1" src="@/static/side/workordered.png" class="icon"></image>

               <image v-else src="@/static/side/workorder.png" class="icon"></image>

               <view class="content">

                  <view class="name_wrap line">

@@ -216,7 +216,7 @@


   }

   .scroll_Y{
      height: calc(100vh - 320rpx);
      height: calc(100vh - 250rpx);
   }

   .list {

      .item {

@@ -224,7 +224,7 @@
         // height: 290rpx;

         padding: 30rpx 0;

         border-bottom: 2rpx solid #E5E5E5;



		
         .icon {

            width: 80rpx;

            height: 80rpx;