b2894lxlx/yunxinwei-uniapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
weicw
2023-11-21 20:51:51 +08:00
parent 686c1ae304
commit e12bdecc5a
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
pages/order/detail.vue
View File

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

2
pages/order/index.vue
View File

@@ -125,7 +125,7 @@
<block <block
v-if="item.orderStatus == OrderStatusEnum.COMPLETED.value && item.isComment == 0 && item.receiptStatus != 30"> v-if="item.orderStatus == OrderStatusEnum.COMPLETED.value && item.isComment == 0 && item.receiptStatus != 30">
<view class="btn-item" @click="handleTargetDetail(item.orderId)" <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> </block>
</view> </view>