Merge remote-tracking branch 'origin/master'

rk

2025-09-24 f3c59a17062fb0a89b5f89b7845341386952a6b1

 h5/pages/waybill/list.vue

@@ -19,9 +19,10 @@
      <scroll-view scroll-y="true" class="scroll_Y" @scrolltolower="scrolltolower">

         <view class="main_list">

            <view class="item" v-for="item,index in list" :key="index">

               <view class="head">

               <view class="head"

               :style="{ backgroundColor: item.orderStatus === 9 ? 'linear-gradient(270deg, #FEFEFF 0%, #FEE1E1 100%)' : 'linear-gradient(270deg, #FEFEFF 0%, #E1F7FE 100%)' }">

                  <view class="code">{{item.contractNumber}}</view>

                  <view class="status">{{item.orderStatusDesc }}</view>

                  <view :class="item.orderStatus === 9 ? 'error' : 'status'">{{item.orderStatusDesc }}</view>

               </view>

               <view class="content">

                  <view class="line">

@@ -347,7 +348,7 @@
               width: 690rpx;

               height: 84rpx;

               margin: 0 -30rpx;

               background: linear-gradient(270deg, #FEFEFF 0%, #E1F7FE 100%);

               // background: linear-gradient(270deg, #FEFEFF 0%, #E1F7FE 100%);



               .code {

                  font-weight: 500;

@@ -358,6 +359,10 @@
               .status {

                  color: $uni-color-primary;

               }

					
               .error {

                  color: #EE3821;

               }

            }



            .content {