From aafe1e531397b892d15b95b62ec4a754d8bf6ce9 Mon Sep 17 00:00:00 2001
From: "geng.tang@qq.com" <foxes2004>
Date: Tue, 23 Apr 2024 15:57:39 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E7=A7=9F=E6=8F=90=E9=86=92=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/detail.vue | 2 +-
 pages/order/index.vue  | 6 +++---
 pages/user/user.vue    | 5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index 133ef82..67759ee 100755
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -964,7 +964,7 @@
 				const app = this
 				uni.showModal({
 					title: '提示',
-					content: '是否退租',
+					content: '是否确认退租（如有逾期退租，将收取10元/天逾期费用）',
 					success: (result) => {
 						if (result.confirm) {
 							EquipmentApi.rentingOut({
diff --git a/pages/order/index.vue b/pages/order/index.vue
index e9b52ee..1b7ff84 100755
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -104,10 +104,10 @@
 								<view class="btn-item" @click="handleRentingOut(item)"
 									v-if="item.equipmentGoods.equipmentCategory != '10' && item.receiptStatus != 21 && item.receiptStatus != 30">我要退租</view>
 								<view class="btn-item" @click="handleRentingOutCancel(item)"
-									v-if="item.equipmentGoods.equipmentCategory != '10' && item.receiptStatus == 21 && !orderEnd">取消退租</view>
+									v-if="item.equipmentGoods.equipmentCategory != '10' && item.receiptStatus == 21">取消退租</view>
 									
 								<view class="btn-item" @click="handleHireEquipment(item.orderId)"
-									v-if="item.equipmentGoods.equipmentCategory != '10' && item.receiptStatus != 30 && item.receiptStatus != 21 && !orderEnd && item.orderId >= 28804 && order.deliveryStatus == 40">我要续费</view>
+									v-if="item.equipmentGoods.equipmentCategory != '10' && item.receiptStatus != 30 && item.receiptStatus != 21 && item.orderId >= 28804 && item.deliveryStatus == 40">我要续费</view>
 
 								<block v-if="item.orderStatus == OrderStatusEnum.COMPLETED.value && item.isComment == 0">
 									<view class="btn-item" v-if="item.equipmentGoods.equipmentCategory == '40' && item.deliveryStatus == DeliveryStatusEnum.ACCEPT.value"
@@ -570,7 +570,7 @@
 				const app = this
 				uni.showModal({
 					title: '提示',
-					content: "是否退租",
+					content: "是否确认退租（如有逾期退租，将收取10元/天逾期费用）",
 					success: (result) => {
 						if (result.confirm) {
 							EquipmentApi.rentingOut({
diff --git a/pages/user/user.vue b/pages/user/user.vue
index e2c7bd2..8771222 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -84,13 +84,12 @@
 			</view>
 		</view>
 		
-		<view class="my-service">
+		<!-- <view class="my-service">
 			<view class="service-title">本月收入</view>
 			<view class="service-content clearfix">
 				<view class="service-info">
 					<view class="item">
 						<view class="desc">已到账收入</view>
-						<!-- <u-icon name="question"></u-icon> -->
 						<view><text class="money">0.00</text>元</view>
 					</view>
 					<view class="item">
@@ -99,7 +98,7 @@
 					</view>
 				</view>
 			</view>
-		</view>
+		</view> -->
 		
 		<view class="my-service" @click="navTo('pages/dealer/team')">
 			<view class="service-title">我的邀请</view>