From 19d17f0f0fb02f46342d70b5180e40a0ad1b66d3 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 09 十一月 2023 18:16:13 +0800
Subject: [PATCH] MrShi
---
bicycle/pages/ridingDetails/ridingDetails.vue | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/bicycle/pages/ridingDetails/ridingDetails.vue b/bicycle/pages/ridingDetails/ridingDetails.vue
index 0004498..be1e4a3 100644
--- a/bicycle/pages/ridingDetails/ridingDetails.vue
+++ b/bicycle/pages/ridingDetails/ridingDetails.vue
@@ -2,10 +2,10 @@
<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">楼{{ Number((info.amount / 100).toFixed(2)) > price ? price : (info.amount / 100).toFixed(2) }}</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 +14,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 +39,13 @@
data() {
return {
id: '',
+ price: 0,
info: {}
};
},
onLoad(option) {
this.id = option.id
+ this.price = Number(option.price)
this.getInfo()
},
methods: {
--
Gitblit v1.9.3