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/unpackage/dist/dev/mp-weixin/pages/ridingDetails/ridingDetails.wxml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/bicycle/unpackage/dist/dev/mp-weixin/pages/ridingDetails/ridingDetails.wxml b/bicycle/unpackage/dist/dev/mp-weixin/pages/ridingDetails/ridingDetails.wxml
index c0d7f61..ecb2c92 100644
--- a/bicycle/unpackage/dist/dev/mp-weixin/pages/ridingDetails/ridingDetails.wxml
+++ b/bicycle/unpackage/dist/dev/mp-weixin/pages/ridingDetails/ridingDetails.wxml
@@ -1 +1 @@
-<view class="details data-v-69af90bc"><view class="details_head data-v-69af90bc"><view class="details_head_a data-v-69af90bc">棰勮娑堣垂锛�</view><view class="details_head_b data-v-69af90bc">{{"楼"+($root.m0>price?price:$root.g0)}}</view><view class="details_head_c data-v-69af90bc"><text class="data-v-69af90bc">{{"缁撶畻杞﹀瀷锛�"+info.bikeType}}</text><text class="data-v-69af90bc">{{"璁¤垂鏃堕暱锛�"+info.duration+"鍒嗛挓"}}</text></view></view><view class="details_list data-v-69af90bc"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="details_list_item data-v-69af90bc"><view class="details_list_item_a data-v-69af90bc"><text class="data-v-69af90bc">{{item.$orig.bikeType}}</text><text class="data-v-69af90bc">{{"缂栧彿锛�"+item.$orig.bikeCode}}</text></view><block wx:if="{{!item.$orig.rideEndTime}}"><view class="details_list_item_b data-v-69af90bc">{{'楠戣鏃堕棿锛�'+item.g1+" "+item.g2+" ~ 楠戣涓� | "+item.$orig.rideTime+'鍒嗛挓'}}</view></block><block wx:else><block wx:if="{{item.g3===item.g4}}"><view class="details_list_item_b data-v-69af90bc">{{'楠戣鏃堕棿锛�'+item.g5+" "+item.g6+" ~ "+item.g7+" | "+item.$orig.rideTime+'鍒嗛挓'}}</view></block><block wx:else><view class="details_list_item_b data-v-69af90bc">{{'楠戣鏃堕棿锛�'+item.g8+" "+item.g9+" ~ "+item.g10+" "+item.g11+" | "+item.$orig.rideTime+'鍒嗛挓'}}</view></block></block><view class="details_list_item_b data-v-69af90bc">{{'璁¤垂鏃堕暱锛�'+item.$orig.duration+'鍒嗛挓'}}</view></view></block></view></view>
\ No newline at end of file
+<view class="details data-v-69af90bc"><view class="details_head data-v-69af90bc"><view class="details_head_a data-v-69af90bc">棰勮娑堣垂锛�</view><view class="details_head_b data-v-69af90bc"><text class="details_head_b_a data-v-69af90bc">{{"楼"+($root.m0>price?price:$root.g0)}}</text><block wx:if="{{info.haveDisCount===1}}"><text class="details_head_b_b data-v-69af90bc">{{"楠戣鍗℃姷鎵ｏ細楼"+$root.m1}}</text></block></view><view class="details_head_c data-v-69af90bc"><text class="data-v-69af90bc">{{"缁撶畻杞﹀瀷锛�"+info.bikeType}}</text><text class="data-v-69af90bc">{{"璁¤垂鏃堕暱锛�"+info.duration+"鍒嗛挓"}}</text></view></view><view class="details_list data-v-69af90bc"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="details_list_item data-v-69af90bc"><view class="details_list_item_a data-v-69af90bc"><text class="data-v-69af90bc">{{item.$orig.bikeType}}</text><text class="data-v-69af90bc">{{"缂栧彿锛�"+item.$orig.bikeCode}}</text></view><block wx:if="{{!item.$orig.rideEndTime}}"><view class="details_list_item_b data-v-69af90bc">{{'楠戣鏃堕棿锛�'+item.g1+" "+item.g2+" ~ 楠戣涓� | "+item.$orig.rideTime+'鍒嗛挓'}}</view></block><block wx:else><block wx:if="{{item.g3===item.g4}}"><view class="details_list_item_b data-v-69af90bc">{{'楠戣鏃堕棿锛�'+item.g5+" "+item.g6+" ~ "+item.g7+" | "+item.$orig.rideTime+'鍒嗛挓'}}</view></block><block wx:else><view class="details_list_item_b data-v-69af90bc">{{'楠戣鏃堕棿锛�'+item.g8+" "+item.g9+" ~ "+item.g10+" "+item.g11+" | "+item.$orig.rideTime+'鍒嗛挓'}}</view></block></block><view class="details_list_item_b data-v-69af90bc">{{'璁¤垂鏃堕暱锛�'+item.$orig.duration+'鍒嗛挓'}}</view></view></block></view></view>
\ No newline at end of file

--
Gitblit v1.9.3