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/settlementDetails/settlementDetails.vue | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/bicycle/pages/settlementDetails/settlementDetails.vue b/bicycle/pages/settlementDetails/settlementDetails.vue
index 9683668..5f7a6a8 100644
--- a/bicycle/pages/settlementDetails/settlementDetails.vue
+++ b/bicycle/pages/settlementDetails/settlementDetails.vue
@@ -4,8 +4,8 @@
<view class="details_head_a">鍚堣娑堣垂锛�</view>
<view class="details_head_b">楼{{ (info.amount / 100).toFixed(2) }}</view>
<view class="details_head_c">
- <text>缁撶畻杞﹀瀷锛歿{info.bikeType}}</text>
- <text>璁¤垂鏃堕暱锛歿{ info.duration }}鍒嗛挓</text>
+ <text>缁撶畻杞﹀瀷锛歿{ info.bikeType ? info.bikeType : '-' }}</text>
+ <text>璁¤垂鏃堕暱锛歿{ info.duration ? info.duration : '-' }}鍒嗛挓</text>
</view>
</view>
<view class="details_list">
@@ -14,8 +14,11 @@
<text>{{ item.bikeType }}</text>
<text>缂栧彿锛歿{ item.bikeCode }}</text>
</view>
- <view class="details_list_item_b">
- 楠戣鏃堕棿锛歿{ item.rideStartTime }} ~ {{ item.rideEndTime }} | {{ item.rideTime }}鍒嗛挓
+ <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 }}鍒嗛挓
--
Gitblit v1.9.3