From 2e3adf807c3c198746d3d51fbab4d71bdf22af81 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 10 十一月 2023 10:14:20 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev
---
bicycle/pages/ridingDetails/ridingDetails.vue | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/bicycle/pages/ridingDetails/ridingDetails.vue b/bicycle/pages/ridingDetails/ridingDetails.vue
index de0c1a8..be1e4a3 100644
--- a/bicycle/pages/ridingDetails/ridingDetails.vue
+++ b/bicycle/pages/ridingDetails/ridingDetails.vue
@@ -2,7 +2,7 @@
<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 }}鍒嗛挓</text>
@@ -17,9 +17,15 @@
<view class="details_list_item_b" v-if="!item.rideEndTime">
楠戣鏃堕棿锛歿{ item.rideStartTime.substring(5, 10) }} {{ item.rideStartTime.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(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 }}鍒嗛挓
</view>
@@ -33,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