新增暂停时长
This commit is contained in:
@@ -142,7 +142,9 @@
|
||||
|
||||
// 格式化订单数据
|
||||
const formattedOrder = {
|
||||
orderNo: orderData.orderId,
|
||||
orderNo: orderData.orderNo || orderData.orderId,
|
||||
orderId: orderData.orderId,
|
||||
orderStatus: orderData.orderStatus,
|
||||
status: orderData.orderStatus,
|
||||
deviceId: orderData.deviceNo,
|
||||
payWay: orderData.payWay,
|
||||
@@ -150,7 +152,8 @@
|
||||
endTime: orderData.endTime || '',
|
||||
positionName: orderData.positionName || orderData.positionLocation || '',
|
||||
deviceName: orderData.deviceName || '',
|
||||
amount: orderData.payAmount || orderData.actualDeviceAmount || orderData.currentFee || orderData.residueAmount || '0.00'
|
||||
amount: orderData.payAmount || orderData.actualDeviceAmount || orderData.currentFee || orderData.residueAmount || '0.00',
|
||||
pauseTime: orderData.pauseTime != null ? orderData.pauseTime : orderData.pause_time
|
||||
};
|
||||
|
||||
// 将订单添加到列表开头
|
||||
@@ -207,7 +210,8 @@
|
||||
endTime: item.endTime || '',
|
||||
positionName: item.positionName || item.positionLocation || '',
|
||||
deviceName: item.deviceName || '',
|
||||
amount: item.payAmount || item.actualDeviceAmount || item.currentFee || item.residueAmount || '0.00'
|
||||
amount: item.payAmount || item.actualDeviceAmount || item.currentFee || item.residueAmount || '0.00',
|
||||
pauseTime: item.pauseTime != null ? item.pauseTime : item.pause_time
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user