From e12bdecc5a5e2b35a40f362c64c7904ed5864ee4 Mon Sep 17 00:00:00 2001
From: weicw <594098497@qq.com>
Date: Tue, 21 Nov 2023 20:51:51 +0800
Subject: [PATCH] 1

---
 pages/order/detail.vue | 36 ++++++++++++++++++------------------
 pages/order/index.vue  |  2 +-
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index 0f1a2a8..1fdc125 100755
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -492,7 +492,7 @@
 					v-if="order.orderStatus == OrderStatusEnum.COMPLETED.value && order.isComment == 0 && order.receiptStatus != 30">
 					<view class="btn-item" @click="handleTargetEquipment(order.equipmentId)">查看电池</view>
 					<view class="btn-item" @click="handleHireEquipment(order.orderId)"
-						v-if="equipmentGoods.equipmentCategory != '10' && !orderEnd">我要续费</view>
+						v-if="equipmentGoods.equipmentCategory != '10' && !orderEnd && order.orderId >= 28804">我要续费</view>
 					<view class="btn-item" @click="handleRentingOut(order)"
 						v-if="equipmentGoods.equipmentCategory != '10' && order.receiptStatus != 21">我要退租</view>
 					<view class="btn-item" @click="handleRentingOut(order)"
@@ -683,15 +683,15 @@
 							app.orderPrice = order.equipmentGoods.batteryRent
 						}
 						// 计算逾期
-						if (order.expirationTime) {
-							const setTime = new Date(order.expirationTime);
-							const nowTime = new Date();
-							const restSec = setTime.getTime() - nowTime.getTime();
-							// 剩余天数
-							const day = parseInt(restSec / (60 * 60 * 24 * 1000));
-							console.log("逾期天数: ", Math.abs(day));
-							order.expirationDay = day
-						}
+						// if (order.expirationTime) {
+						// 	const setTime = new Date(order.expirationTime);
+						// 	const nowTime = new Date();
+						// 	const restSec = setTime.getTime() - nowTime.getTime();
+						// 	// 剩余天数
+						// 	const day = parseInt(restSec / (60 * 60 * 24 * 1000));
+						// 	console.log("逾期天数: ", Math.abs(day));
+						// 	order.expirationDay = day
+						// }
 						// 读取历史续费订单
 						app.getRenewOrder()
 						app.isLoading = false
@@ -720,14 +720,14 @@
 							app.orderEnd = true
 						}
 						// 计算逾期
-						res.data.map((d, index) => {
-							const setTime = new Date(d.expirationTime);
-							const nowTime = new Date(d.payTime);
-							const restSec = setTime.getTime() - nowTime.getTime();
-							// 剩余天数
-							const day = parseInt(restSec / (60 * 60 * 24 * 1000));
-							app.renewOrderList[index].expirationDay = day
-						})
+						// res.data.map((d, index) => {
+						// 	const setTime = new Date(d.expirationTime);
+						// 	const nowTime = new Date(d.payTime);
+						// 	const restSec = setTime.getTime() - nowTime.getTime();
+						// 	// 剩余天数
+						// 	const day = parseInt(restSec / (60 * 60 * 24 * 1000));
+						// 	app.renewOrderList[index].expirationDay = day
+						// })
 					})
 			},
 
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 826bee3..325b06d 100755
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -125,7 +125,7 @@
 							<block
 								v-if="item.orderStatus == OrderStatusEnum.COMPLETED.value && item.isComment == 0 && item.receiptStatus != 30">
 								<view class="btn-item" @click="handleTargetDetail(item.orderId)"
-									v-if="item.equipmentGoods.equipmentCategory != '10' && !orderEnd">我要续费 </view>
+									v-if="item.equipmentGoods.equipmentCategory != '10' && !orderEnd && item.orderId >= 28804">我要续费 </view>
 
 							</block>
 						</view>