Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

jiangping

2025-03-18 cc6ab7021c3aef6ca3bbf05f8bcb5bfe0e6f6096

 bicycle/pages/settlementDetails/settlementDetails.vue

@@ -2,10 +2,13 @@
   <view class="details">
      <view class="details_head">
         <view class="details_head_a">合计消费：</view>
         <view class="details_head_b">¥{{ (info.amount / 100).toFixed(2) }}</view>
         <view class="details_head_b">
            <text class="details_head_b_a">¥{{ (info.amount / 100).toFixed(2) }}</text>
            <text class="details_head_b_b" v-if="info.haveDisCount === 1">骑行卡抵扣：¥{{Number((info.disCountMoney / 100).toFixed(2))}}</text>
         </view>
         <view class="details_head_c">
            <text>结算车型：{{info.bikeType}}</text>
            <text>计费时长：{{ (info.duration / 60).toFixed(1) }}分钟</text>
            <text>结算车型：{{ info.bikeType ? info.bikeType : '-' }}</text>
            <text>计费时长：{{ info.duration ? String(info.duration) : '-' }}分钟</text>
         </view>
      </view>
      <view class="details_list">
@@ -14,11 +17,14 @@
               <text>{{ item.bikeType }}</text>
               <text>编号：{{ item.bikeCode }}</text>
            </view>
            <view class="details_list_item_b">
               骑行时间：{{ item.rideStartTime }} ~ {{ item.rideEndTime }} | {{ (item.rideTime / 60).toFixed(1) }}分钟
            <view class="details_list_item_b" v-if="item.rideStartTime.substring(5, 10) === item.rideEndTime.substring(5, 10)">
               骑行时间：{{ item.rideStartTime.substring(5, 10) }} {{ item.rideStartTime.substring(11, 16) }} ~ {{ item.rideEndTime.substring(11, 16) }} | {{ item.rideTime }}分钟
            </view>
            <view class="details_list_item_b" v-else>
               骑行时间：{{ item.rideStartTime.substring(5, 10) }} {{ item.rideStartTime.substring(11, 16) }} ~ {{ item.rideEndTime.substring(5, 10) }} {{ item.rideEndTime.substring(11, 16) }} | {{ item.rideTime }}分钟
            </view>
            <view class="details_list_item_b">
               计费时长：{{ (item.duration / 60).toFixed(1) }}分钟
               计费时长：{{ item.duration }}分钟
            </view>
         </view>
      </view>
@@ -73,10 +79,20 @@
         color: #FFFFFF;
      }
      .details_head_b {
         font-size: 40rpx;
         font-family: PingFangSC-Regular, PingFang SC;
         font-weight: 400;
         color: #FFFFFF;
         width: 100%;
         display: flex;
         align-items: center;
         .details_head_b_a {
            font-size: 40rpx;
            font-weight: 400;
            color: #FFFFFF;
         }
         .details_head_b_b {
            font-weight: 400;
            font-size: 26rpx;
            color: #FFFFFF;
            margin-left: 16rpx;
         }
      }
      .details_head_c {
         width: 100%;