Merge remote-tracking branch 'origin/master'

jiangping

2025-01-23 9adce67dc6af1c6cf4a0d0528eced986771c2d64

 h5/pages/waybill/list.vue

@@ -2,7 +2,7 @@
   <view class="main_app">
      <view class="title_wrap">
         <view class="name">{{ waybillInfo.realname || waybillInfo.username || waybillInfo.mobile }}，欢迎登录～</view>
         <view class="btn" @click="loginOut">退出登录</view>
         <view class="btn" @click="loginOut">账号解绑</view>
      </view>

      <view class="head_wrap" @click="openModal">

         <view class="search_box">

@@ -232,7 +232,7 @@
                  ...form

               },

               pager: {

                  rows: 10,

                  rows: 16,

                  page

               }

            }).then(res => {

@@ -256,9 +256,9 @@
      // align-items: center;
      background-color: #fff;
      width: 750rpx;
      height: 70rpx;
      height: 90rpx;
      margin: -10rpx -30rpx 0;
      padding: 12rpx 30rpx;
      padding: 24rpx 30rpx 0;
      .name {
         font-weight: 600;
         font-size: 34rpx;
@@ -269,9 +269,9 @@
         width: 144rpx;
         height: 56rpx;
         border-radius: 36rpx;
         border: 1rpx solid $uni-color-primary;
         border: 1rpx solid #B2B2B2;
         font-size: 26rpx;
         color: $uni-color-primary;
         color: #666666;
         display: flex;
         justify-content: center;
         align-items: center;