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/pages/consumptionDetails/consumptionDetails.vue |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/bicycle/pages/consumptionDetails/consumptionDetails.vue b/bicycle/pages/consumptionDetails/consumptionDetails.vue
index bc38368..0a3159d 100644
--- a/bicycle/pages/consumptionDetails/consumptionDetails.vue
+++ b/bicycle/pages/consumptionDetails/consumptionDetails.vue
@@ -3,12 +3,15 @@
 		<view class="list_item" v-for="(item, index) in list" :key="index" @click="jump(item.type, item.orderId)">
 			<view class="list_item_a">
 				<text>{{item.title}}</text>
-				<text v-if="item.type === 0">楼{{(item.money / 100).toFixed(2)}}</text>
-				<text style="color: #FC2525;" v-if="item.type === 1 || item.type === 2 || item.type === 3">-楼{{(item.money / 100).toFixed(2)}}</text>
+				<text v-if="[0,4].includes(item.type)">楼{{(item.money / 100).toFixed(2)}}</text>
+				<text style="color: #FC2525;" v-if="[1,2,3].includes(item.type)">-楼{{(item.money / 100).toFixed(2)}}</text>
+			</view>
+			<view class="list_item_e" v-if="item.type === 4">
+				<text>{{item.content}}</text>
 			</view>
 			<view class="list_item_b">
 				<text>{{item.doneDate}}</text>
-				<text v-if="item.type === 0">寰俊鏀粯</text>
+				<text v-if="[0,4].includes(item.type)">寰俊鏀粯</text>
 				<text v-if="item.type === 1">鏌ョ湅鏄庣粏</text>
 				<text v-if="item.type === 2">寰俊閫�娆�</text>
 				<text v-if="item.type === 3">寰俊閫�娆�</text>
@@ -128,6 +131,15 @@
 					color: #999999;
 				}
 			}
+			.list_item_e {
+				width: 100%;
+				margin-top: 20rpx;
+				text {
+					font-weight: 400;
+					font-size: 26rpx;
+					color: #666666;
+				}
+			}
 		}
 	}
 </style>

--
Gitblit v1.9.3