Mauve/mgm-daylight-mcrm-mobile-ios
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge limo to daylight

Browse Source
This commit is contained in:
Mauve
2026-09-22 16:37:00 +08:00
parent 0c92868836
commit a7359d443b
73 changed files with 11614 additions and 1040 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pages/playerDetail/playerDetail.vue
+25 -3
View File
@@ -370,7 +370,7 @@
const currentRoom = this.roomList[this.currentRoomIndex];
if (currentRoom && currentRoom.id) {
const approvalData = this.approvalGamingDataList.find(
item => item.bookingId == currentRoom.id
item => (item.bookingId != null ? item.bookingId : item.BookingId) == currentRoom.id
);
return approvalData || {};
}
@@ -401,6 +401,26 @@
return value;
},
// 将形如：2025-03-18 +12 (W +2) | 2025-03-16 + 16 ... 按日期升序排序
normalizeApprovalGamingData(item) {
if (!item) return {};
return {
bookingId: item.bookingId != null ? item.bookingId : item.BookingId,
playerId: item.playerId != null ? item.playerId : item.PlayerId,
currentTripTheoWinAmount: item.currentTripTheoWinAmount != null ? item.currentTripTheoWinAmount : item.CurrentTripTheoWinAmount,
last2DayTheoWinAmount: item.last2DayTheoWinAmount != null ? item.last2DayTheoWinAmount : item.Last2DayTheoWinAmount,
r3TheoWin: item.r3TheoWin != null ? item.r3TheoWin : item.R3TheoWin,
r3TPD: item.r3TPD != null ? item.r3TPD : item.R3TPD,
r3ActualWin: item.r3ActualWin != null ? item.r3ActualWin : item.R3ActualWin,
r6TheoWin: item.r6TheoWin != null ? item.r6TheoWin : item.R6TheoWin,
r6TPD: item.r6TPD != null ? item.r6TPD : item.R6TPD,
r6ActualWin: item.r6ActualWin != null ? item.r6ActualWin : item.R6ActualWin,
r12TheoWin: item.r12TheoWin != null ? item.r12TheoWin : item.R12TheoWin,
r12TPD: item.r12TPD != null ? item.r12TPD : item.R12TPD,
r12ActualWin: item.r12ActualWin != null ? item.r12ActualWin : item.R12ActualWin,
overlapBooking: item.overlapBooking != null ? item.overlapBooking : item.OverlapBooking,
roomCount: item.roomCount != null ? item.roomCount : item.RoomCount
};
},
sortRoomCountByDate(roomCountValue) {
if (roomCountValue === null || roomCountValue === undefined || roomCountValue === '') return '-';
const input = String(roomCountValue).trim();
@@ -524,7 +544,9 @@
if (res.success == true) {
if (res.data !== null) {
this.bookingListData = res.data.bookingsViewList;
this.approvalGamingDataList = res.data.approvalGamingData || [];
this.approvalGamingDataList = Array.isArray(res.data.approvalGamingData)
? res.data.approvalGamingData.map(item => this.normalizeApprovalGamingData(item))
: [];
const routingList = res.data.cfgApprovalRoutingList;
if (Array.isArray(routingList) && routingList.length > 0) {
this.approvalRoutingList = routingList;
@@ -983,4 +1005,4 @@
.dataMargin {
margin-bottom: 3px;
}
</style>
</style>