Merge remote-tracking branch 'origin/master'

jiangping

2025-01-23 9adce67dc6af1c6cf4a0d0528eced986771c2d64

 h5/pages/wdata/list.vue

@@ -4,7 +4,7 @@
         <view class="name" v-if="driverInfo.realname || driverInfo.username">{{ driverInfo.realname || driverInfo.username }}，欢迎登录～</view>
         <view class="name" v-else>请先登录</view>
         <view class="btn" @click="loginOut">{{
            driverInfo.realname || driverInfo.username ? "退出登录" : "去登录"
            driverInfo.realname || driverInfo.username ? "账号解绑" : "去登录"
         }}</view>
      </view>

      <view class="head_wrap">

@@ -152,7 +152,8 @@
      align-items: center;
      background-color: #fff;
      margin: -10rpx -30rpx 0;
      padding: 16rpx 30rpx 0;
      padding: 20rpx 30rpx 6rpx;
      height: 90rpx;
      .name {
         font-weight: 600;
         font-size: 34rpx;
@@ -163,9 +164,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;