diff --git a/src/app/modules/admin/game/evolution/components/list.component.ts b/src/app/modules/admin/game/evolution/components/list.component.ts
index 845c4c6..b83ab3d 100644
--- a/src/app/modules/admin/game/evolution/components/list.component.ts
+++ b/src/app/modules/admin/game/evolution/components/list.component.ts
@@ -41,21 +41,20 @@ import { EvolutionService } from '../services/evolution.service';
`
.evolution-grid {
/* 상부 유저 게임 금액 최종 */
- grid-template-columns: 100px 140px auto 100px 100px;
-
+ grid-template-columns: 80px 100px 150px 80px 80px auto 100px 150px 120px;
@screen sm {
/* 상부 유저 게임 금액 최종 배팅 */
- grid-template-columns: 100px 140px auto 100px 100px 140px;
+ grid-template-columns: 80px 100px 150px 80px 80px auto 100px 150px 120px;
}
@screen md {
/* 상부 유저 게임 금액 최종 배팅 데이터 콤프 */
- grid-template-columns: 100px 140px auto 100px 100px 140px 100px 20px;
+ grid-template-columns: 80px 100px 150px 80px 80px auto 100px 150px 120px;
}
@screen lg {
- /* 상부 유저 게임 금액 최종 배팅 데이터 콤프 롤링 배팅시간 */
- grid-template-columns: 100px 140px auto 100px 100px 140px 100px 20px 140px 100px;
+ /* 상부 유저 게임 금액 최종 배팅 데이터&콤프 롤링 배팅시간 */
+ grid-template-columns: 80px 100px 150px 60px 60px auto 80px 150px 120px;
}
}
`,
diff --git a/src/app/modules/admin/game/evolution/evolution.module.ts b/src/app/modules/admin/game/evolution/evolution.module.ts
index 7fb584a..184f451 100644
--- a/src/app/modules/admin/game/evolution/evolution.module.ts
+++ b/src/app/modules/admin/game/evolution/evolution.module.ts
@@ -11,6 +11,8 @@ import { MatRippleModule } from '@angular/material/core';
import { MatSortModule } from '@angular/material/sort';
import { MatSelectModule } from '@angular/material/select';
import { MatTooltipModule } from '@angular/material/tooltip';
+import { MatDatepickerModule } from '@angular/material/datepicker';
+import { MatMomentDateModule } from '@angular/material-moment-adapter';
import { TranslocoModule } from '@ngneat/transloco';
@@ -37,6 +39,8 @@ import { evolutionRoutes } from './evolution.routing';
MatSortModule,
MatSelectModule,
MatTooltipModule,
+ MatDatepickerModule,
+ MatMomentDateModule,
],
})
export class EvolutionModule {}
diff --git a/src/app/modules/admin/game/evolution/models/evolution.ts b/src/app/modules/admin/game/evolution/models/evolution.ts
index b1b9a92..cc32f14 100644
--- a/src/app/modules/admin/game/evolution/models/evolution.ts
+++ b/src/app/modules/admin/game/evolution/models/evolution.ts
@@ -4,38 +4,49 @@ export interface Evolution {
highRank?: string;
gameId?: string;
nickname?: string;
+ vendorName?: string;
gameName?: string;
- gameInfo1?: string;
- gameInfo2?: string;
- gameInfo3?: string;
- betting?: number;
- winning?: number;
- profitLoss?: number;
- afterBetting?: number;
- beforeBetting?: number;
- finalMoney?: number;
- bettingInfo1?: string;
- bettingInfo2?: number;
- bettingInfo3?: number;
+ bettingId?: string;
+ betStatus?: string;
+ betMoney?: string;
+ betWinMoney?: string;
+ betBeforeMoney?: string;
+ betProfitLossMoney?: string;
+ betAfterMoney?: string;
+ totalMoney?: string;
comp?: string;
- mainofficeName?: string;
- mainofficePercent?: number;
- mainofficePoint?: number;
- branchName?: string;
- branchPercent?: number;
- branchPoint?: number;
- divisionName?: string;
- divisionPercent?: number;
- divisionPoint?: number;
- officeName?: string;
- officePercent?: number;
- officePoint?: number;
- storeName?: string;
- storePercent?: number;
- storePoint?: number;
- memberName?: string;
- memberPercent?: number;
- memberPoint?: number;
- bettingTime?: string;
+ betHistorys?: [
+ {
+ pickBetType?: string;
+ betMoney?: string;
+ betWinMoney?: string;
+ }
+ ];
+ mainInfo?: {
+ name?: string;
+ commissionRate?: string;
+ point?: string;
+ };
+ branchInfo?: {
+ name?: string;
+ commissionRate?: string;
+ point?: string;
+ };
+ divisionInfo?: {
+ name?: string;
+ commissionRate?: string;
+ point?: string;
+ };
+ officeInfo?: {
+ name?: string;
+ commissionRate?: string;
+ point?: string;
+ };
+ storeInfo?: {
+ name?: string;
+ commissionRate?: string;
+ point?: string;
+ };
+ bettingRegistDate?: string;
registrationDate?: string;
}
diff --git a/src/app/modules/admin/game/slot/components/list.component.html b/src/app/modules/admin/game/slot/components/list.component.html
index 607ab27..ab61417 100644
--- a/src/app/modules/admin/game/slot/components/list.component.html
+++ b/src/app/modules/admin/game/slot/components/list.component.html
@@ -27,6 +27,7 @@
@@ -156,6 +157,7 @@
상위
@@ -193,6 +195,7 @@
{{ slot.highRank }}
@@ -213,9 +216,9 @@
{{ slot.betStatus }}
- {{ slot.betPrevMoney }}
+ {{ slot.betBeforeMoney }}
- {{ slot.bettingMoney }}
+ {{ slot.betMoney }}
{{ slot.betAfterMoney }}
diff --git a/src/app/modules/admin/game/slot/models/slot.ts b/src/app/modules/admin/game/slot/models/slot.ts
index d46f32d..f5babb5 100644
--- a/src/app/modules/admin/game/slot/models/slot.ts
+++ b/src/app/modules/admin/game/slot/models/slot.ts
@@ -8,9 +8,9 @@ export interface Slot {
gameName?: string;
bettingId?: string;
betStatus?: string;
- betPrevMoney?: number;
- bettingMoney?: number;
- betAfterMoney?: number;
+ betBeforeMoney?: string;
+ betMoney?: string;
+ betAfterMoney?: string;
comp?: string;
mainInfo?: {
name?: string;
diff --git a/src/styles/styles.scss b/src/styles/styles.scss
index 416d855..15cab3f 100644
--- a/src/styles/styles.scss
+++ b/src/styles/styles.scss
@@ -3,10 +3,14 @@
/* @ Styles from this file will override 'vendors.scss' and Beteran's base styles.
/* ----------------------------------------------------------------------------------------------------- */
-.mat-form-field.bet-mat-form-field-wrapper-mb-0>.mat-form-field-wrapper {
+.mat-form-field.bet-mat-form-field-wrapper-mb-0 > .mat-form-field-wrapper {
margin-bottom: 0em;
}
.bet-mat-small-8 {
transform: scale(0.8);
}
+
+.bet-mat-small-6 {
+ transform: scale(0.6);
+}