From cc6ab7021c3aef6ca3bbf05f8bcb5bfe0e6f6096 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 16:52:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
bicycle/pages/ridingDetails/ridingDetails.vue | 42 +++++++++++++++++++++++++++++++++---------
1 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/bicycle/pages/ridingDetails/ridingDetails.vue b/bicycle/pages/ridingDetails/ridingDetails.vue
index 0004498..dcaa2a7 100644
--- a/bicycle/pages/ridingDetails/ridingDetails.vue
+++ b/bicycle/pages/ridingDetails/ridingDetails.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">楼{{ Number((info.amount / 100).toFixed(2)) > price ? price : (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.duration }}鍒嗛挓</text>
</view>
</view>
<view class="details_list">
@@ -14,11 +17,20 @@
<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.rideEndTime">
+ 楠戣鏃堕棿锛歿{ item.rideStartTime.substring(5, 10) }} {{ item.rideStartTime.substring(11, 16) }} ~ 楠戣涓� | {{ item.rideTime }}鍒嗛挓
</view>
+ <template v-else>
+ <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>
+ </template>
+
<view class="details_list_item_b">
- 璁¤垂鏃堕暱锛歿{ (item.duration / 60).toFixed(1) }}鍒嗛挓
+ 璁¤垂鏃堕暱锛歿{ item.duration }}鍒嗛挓
</view>
</view>
</view>
@@ -30,11 +42,13 @@
data() {
return {
id: '',
+ price: 0,
info: {}
};
},
onLoad(option) {
this.id = option.id
+ this.price = Number(option.price)
this.getInfo()
},
methods: {
@@ -75,10 +89,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%;
--
Gitblit v1.9.3