Merge remote-tracking branch 'origin/master'

jiangping

2024-06-03 ee010e7160f0a4dee5e0c2fde55d488f4f2f9788

 h5/pages/driver/taskDetail.vue

@@ -37,7 +37,7 @@
            <view class="value">
               <view class="">0 公里</view>
               <view class="btn" @click="getLocation">
                  <u-icon name="map" color="#279BAA" class="mr6"></u-icon>
                  <u-icon name="map" :color="$store.state.primaryColor" class="mr6"></u-icon>
                  重新定位
               </view>
            </view>
@@ -183,7 +183,7 @@
            }
            .btn{
               font-size: 28rpx;
               color: #279BAA;
               color: $uni-color-primary;
               display: flex;
            }
         }
@@ -255,7 +255,7 @@
         padding: 0 24rpx;
         border-radius: 34rpx 0rpx 0rpx 34rpx;
         font-size: 26rpx;
         color: #279BAA;
         color: $uni-color-primary;
         
      }
   }
@@ -283,8 +283,8 @@
         border: 1rpx solid #999999;
      }
      .check{
         background: #279BAA;
         border: 1rpx solid #279BAA;
         background: $uni-color-primary;
         border: 1rpx solid $uni-color-primary;
         color: #fff;
      }
   }
@@ -324,7 +324,7 @@
      .title{
         font-weight: 500;
         font-size: 30rpx;
         color: #279BAA;
         color: $uni-color-primary;
         margin-bottom: 12rpx;
      }
      .address{