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/consumptionDetails/consumptionDetails.wxml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/bicycle/unpackage/dist/dev/mp-weixin/pages/consumptionDetails/consumptionDetails.wxml b/bicycle/unpackage/dist/dev/mp-weixin/pages/consumptionDetails/consumptionDetails.wxml
index 229413c..f928540 100644
--- a/bicycle/unpackage/dist/dev/mp-weixin/pages/consumptionDetails/consumptionDetails.wxml
+++ b/bicycle/unpackage/dist/dev/mp-weixin/pages/consumptionDetails/consumptionDetails.wxml
@@ -1 +1 @@
-<view class="list data-v-e7356a34"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['jump',['$0','$1'],[[['list','',index,'type']],[['list','',index,'orderId']]]]]]]}}" class="list_item data-v-e7356a34" bindtap="__e"><view class="list_item_a data-v-e7356a34"><text class="data-v-e7356a34">{{item.$orig.title}}</text><block wx:if="{{item.$orig.type===0}}"><text class="data-v-e7356a34">{{"楼"+item.g0}}</text></block><block wx:if="{{item.$orig.type===1||item.$orig.type===2||item.$orig.type===3}}"><text style="color:#FC2525;" class="data-v-e7356a34">{{"-楼"+item.g1}}</text></block></view><view class="list_item_b data-v-e7356a34"><text class="data-v-e7356a34">{{item.$orig.doneDate}}</text><block wx:if="{{item.$orig.type===0}}"><text class="data-v-e7356a34">寰俊鏀粯</text></block><block wx:if="{{item.$orig.type===1}}"><text class="data-v-e7356a34">鏌ョ湅鏄庣粏</text></block><block wx:if="{{item.$orig.type===2}}"><text class="data-v-e7356a34">寰俊閫�娆�</text></block><block wx:if="{{item.$orig.type===3}}"><text class="data-v-e7356a34">寰俊閫�娆�</text></block></view></view></block></view>
\ No newline at end of file
+<view class="list data-v-e7356a34"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['jump',['$0','$1'],[[['list','',index,'type']],[['list','',index,'orderId']]]]]]]}}" class="list_item data-v-e7356a34" bindtap="__e"><view class="list_item_a data-v-e7356a34"><text class="data-v-e7356a34">{{item.$orig.title}}</text><block wx:if="{{item.g0}}"><text class="data-v-e7356a34">{{"楼"+item.g1}}</text></block><block wx:if="{{item.g2}}"><text style="color:#FC2525;" class="data-v-e7356a34">{{"-楼"+item.g3}}</text></block></view><block wx:if="{{item.$orig.type===4}}"><view class="list_item_e data-v-e7356a34"><text class="data-v-e7356a34">{{item.$orig.content}}</text></view></block><view class="list_item_b data-v-e7356a34"><text class="data-v-e7356a34">{{item.$orig.doneDate}}</text><block wx:if="{{item.g4}}"><text class="data-v-e7356a34">寰俊鏀粯</text></block><block wx:if="{{item.$orig.type===1}}"><text class="data-v-e7356a34">鏌ョ湅鏄庣粏</text></block><block wx:if="{{item.$orig.type===2}}"><text class="data-v-e7356a34">寰俊閫�娆�</text></block><block wx:if="{{item.$orig.type===3}}"><text class="data-v-e7356a34">寰俊閫�娆�</text></block></view></view></block></view>
\ No newline at end of file

--
Gitblit v1.9.3