Merge branch 'feature/BETERAN-BACKEND-APP-BROWSER-init' of https://gitlab.loafle.net/bet/beteran-backend-app-browser into feature/BETERAN-BACKEND-APP-BROWSER-init
This commit is contained in:
commit
c2a2052998
|
|
@ -92,6 +92,7 @@ export class AuthService {
|
|||
|
||||
// Set the authenticated flag to true
|
||||
this._authenticated = true;
|
||||
resolve();
|
||||
})
|
||||
.catch((e) => {
|
||||
reject(e);
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ export const currentUsers = [
|
|||
currentLocation: '메인',
|
||||
gameMoney: 0,
|
||||
highRank: 'kgon5',
|
||||
index: 1,
|
||||
idx: 1,
|
||||
level: '4',
|
||||
ownCash: 67131,
|
||||
ownComp: 3111,
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@
|
|||
<div
|
||||
class="current-user-grid grid items-center gap-4 py-3 px-6 md:px-8 border-b"
|
||||
>
|
||||
<div>{{ currentUser.index }}</div>
|
||||
<div>{{ currentUser.idx }}</div>
|
||||
<div>{{ currentUser.highRank }}</div>
|
||||
<div>
|
||||
<div>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ export interface CurrentUser {
|
|||
currentLocation?: string;
|
||||
gameMoney?: number;
|
||||
highRank?: string;
|
||||
index?: number;
|
||||
idx?: number;
|
||||
level?: string;
|
||||
ownCash?: number;
|
||||
ownComp?: number;
|
||||
|
|
|
|||
|
|
@ -71,20 +71,46 @@
|
|||
<div
|
||||
class="partner-grid grid items-center gap-4 py-3 px-6 md:px-8 border-b"
|
||||
>
|
||||
<div>관리</div>
|
||||
<div>요율</div>
|
||||
<div>
|
||||
<button mat-button [matMenuTriggerFor]="menu">관리</button>
|
||||
<mat-menu #menu="matMenu">
|
||||
<button mat-menu-item>보유금지급/회수</button>
|
||||
<button mat-menu-item>수수료설정</button>
|
||||
<button mat-menu-item>콤프지급/회수</button>
|
||||
<button mat-menu-item>쿠폰머니지급/회수</button>
|
||||
<button mat-menu-item>쪽지보내기</button>
|
||||
<button mat-menu-item>배팅리스트</button>
|
||||
</mat-menu>
|
||||
</div>
|
||||
<div
|
||||
matTooltip="요율확인
|
||||
카지노-바카라:0%
|
||||
카지노-룰렛:0%
|
||||
카지노-드레곤타이거:0%
|
||||
카지노-그외:0%
|
||||
슬롯:0%
|
||||
카지노루징:0%
|
||||
슬롯루징:0%"
|
||||
>
|
||||
요율
|
||||
</div>
|
||||
<div>
|
||||
{{ partner.branchCount }}{{ partner.divisionCount
|
||||
}}{{ partner.officeCount }}{{ partner.storeCount
|
||||
}}{{ partner.memberCount }}
|
||||
</div>
|
||||
<div>
|
||||
<!-- 아이디/닉네임/연락처 -->
|
||||
<div
|
||||
(click)="viewUserDetail(partner.id)"
|
||||
style="cursor: pointer"
|
||||
>
|
||||
{{ partner.signinId }}
|
||||
<hr style="margin: 7px 0px" />
|
||||
{{ partner.nickname }}
|
||||
<hr style="margin: 7px 0px" />
|
||||
{{ partner.phoneNumber }}
|
||||
</div>
|
||||
<!-- 등급/레벨/상태 -->
|
||||
<div>
|
||||
{{ partner.rank }}
|
||||
<hr style="margin: 7px 0px" />
|
||||
|
|
@ -92,12 +118,15 @@
|
|||
<hr style="margin: 7px 0px" />
|
||||
{{ partner.state }}
|
||||
</div>
|
||||
<!-- 예금주 -->
|
||||
<div class="hidden sm:block">
|
||||
{{ partner.accountHolder }}
|
||||
</div>
|
||||
<!-- 정산종류 -->
|
||||
<div class="hidden md:block">
|
||||
{{ partner.calculateType }}
|
||||
</div>
|
||||
<!-- 보유금 -->
|
||||
<div class="hidden md:block">
|
||||
캐쉬{{ partner.ownCash }}
|
||||
<hr style="margin: 7px 0px" />
|
||||
|
|
@ -105,24 +134,29 @@
|
|||
<hr style="margin: 7px 0px" />
|
||||
쿠폰{{ partner.ownCoupon }}
|
||||
</div>
|
||||
<!-- 충전금 -->
|
||||
<div class="hidden lg:block">
|
||||
본인{{ partner.ownCharge }}
|
||||
<hr style="margin: 7px 0px" />
|
||||
하부{{ partner.bottomCharge }}
|
||||
</div>
|
||||
<!-- 환전금 -->
|
||||
<div class="hidden lg:block">
|
||||
본인{{ partner.ownExchange }}
|
||||
<hr style="margin: 7px 0px" />
|
||||
하부{{ partner.bottomExchange }}
|
||||
</div>
|
||||
<!-- 수익금 -->
|
||||
<div class="hidden lg:block">
|
||||
본인{{ partner.ownRevenue }}
|
||||
<hr style="margin: 7px 0px" />
|
||||
하부{{ partner.bottomRevenue }}
|
||||
</div>
|
||||
<!-- 가입날짜 -->
|
||||
<div class="hidden lg:block">
|
||||
{{ partner.registDate }}
|
||||
</div>
|
||||
<!-- 비고 -->
|
||||
<div class="hidden lg:block">
|
||||
<button
|
||||
mat-flat-button
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@ import {
|
|||
import { fuseAnimations } from '@fuse/animations';
|
||||
import { FuseConfirmationService } from '@fuse/services/confirmation';
|
||||
|
||||
import { User } from '../../user/models/user';
|
||||
import { Partner } from '../models/partner';
|
||||
import { PartnerPagination } from '../models/partner-pagination';
|
||||
import { PartnerService } from '../services/partner.service';
|
||||
|
|
@ -73,7 +72,6 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
|
|||
@ViewChild(MatSort) private _sort!: MatSort;
|
||||
|
||||
partners$!: Observable<Partner[] | undefined>;
|
||||
users$!: Observable<User[] | undefined>;
|
||||
|
||||
isLoading = false;
|
||||
searchInputControl = new FormControl();
|
||||
|
|
|
|||
|
|
@ -12,9 +12,7 @@ import { MatSortModule } from '@angular/material/sort';
|
|||
import { MatSelectModule } from '@angular/material/select';
|
||||
import { MatTooltipModule } from '@angular/material/tooltip';
|
||||
import { MatGridListModule } from '@angular/material/grid-list';
|
||||
import { MatSlideToggleModule } from '@angular/material/slide-toggle';
|
||||
import { MatRadioModule } from '@angular/material/radio';
|
||||
import { MatCheckboxModule } from '@angular/material/checkbox';
|
||||
import { MatMenuModule } from '@angular/material/menu';
|
||||
|
||||
import { TranslocoModule } from '@ngneat/transloco';
|
||||
|
||||
|
|
@ -43,9 +41,7 @@ import { partnerRoutes } from './partner.routing';
|
|||
MatSelectModule,
|
||||
MatTooltipModule,
|
||||
MatGridListModule,
|
||||
MatSlideToggleModule,
|
||||
MatRadioModule,
|
||||
MatCheckboxModule,
|
||||
MatMenuModule,
|
||||
],
|
||||
})
|
||||
export class PartnerModule {}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user