diff --git a/src/app/modules/admin/bank/deposit/components/list.component.html b/src/app/modules/admin/bank/deposit/components/list.component.html index a808ddd..5cf59f2 100644 --- a/src/app/modules/admin/bank/deposit/components/list.component.html +++ b/src/app/modules/admin/bank/deposit/components/list.component.html @@ -105,8 +105,8 @@
- - + +
- +
-
{{ deposit.highRank }}
+ +
test {{ idx }}
+
- {{ deposit.signinId }} + test {{ idx }}

- {{ deposit.nickname }} + test {{ idx }}
+
- {{ deposit.rank }} + test {{ idx }}
- LV{{ deposit.level }} + test {{ idx }}
- {{ deposit.state }} + test {{ idx }}
+ -
{{ deposit.calculateType }}
-
{{ deposit.note }}
-
{{ deposit.depositAmount }}
+ +
{{ idx % 2 === 0 ? "롤링" : "콤프" }}
+ +
test {{ idx }}
+ +
test {{ idx }}
+ + - + + +
+
+ +
+
+ +
+
+ +
+
+
-
- -
-
- -
-
- -
- - + +
-
상부
+
+ 구분 +
아이디
닉네임
-
- 등급 -
- 레벨 -
- 상태 -
- -
정산종류
-
비고
환전신청금액
+
정산종류
+
+ 은행명 +
+ 계좌번호 +
+ 예금주 +
+
비고
- - - + + +
- +
-
{{ withdraw.highRank }}
+
+ 회원 +
- {{ withdraw.signinId }} + test {{ idx }}

- {{ withdraw.nickname }} + test {{ idx }}
+ +
{{ withdraw.getAccountNumber() }}
+ +
{{ idx % 2 === 0 ? "롤링" : "콤프" }}
+
- {{ withdraw.rank }} + + {{ withdraw.getBankName() }}
- LV{{ withdraw.level }} + LV{{ withdraw.getAccountNumber() }}
- {{ withdraw.state }} + {{ withdraw.getName() }}
- -
{{ withdraw.calculateType }}
-
{{ withdraw.note }}
-
{{ withdraw.exchangeApplicationAmount }}
+ +
@
+ + + - - + + +
@@ -246,20 +278,5 @@
-
- -
-
- -
-
- -
diff --git a/src/app/modules/admin/bank/withdraw/components/list.component.ts b/src/app/modules/admin/bank/withdraw/components/list.component.ts index 1c4dc47..1bc2699 100644 --- a/src/app/modules/admin/bank/withdraw/components/list.component.ts +++ b/src/app/modules/admin/bank/withdraw/components/list.component.ts @@ -22,6 +22,7 @@ import { map, merge, Observable, + of, Subject, switchMap, takeUntil, @@ -32,7 +33,9 @@ import { FuseConfirmationService } from '@fuse/services/confirmation'; import { Withdraw } from '../models/withdraw'; import { WithdrawPagination } from '../models/withdraw-pagination'; import { WithdrawService } from '../services/withdraw.service'; -import { Router } from '@angular/router'; +import { ActivatedRoute, Router } from '@angular/router'; +import { ListMemberBankWithdrawsResponse } from 'app/modules/proto/c2se/member_bank_withdraw_pb'; +import { MemberBankWithdraw } from 'app/modules/proto/models/member_bank_withdraw_pb'; @Component({ selector: 'withdraw-list', @@ -52,9 +55,13 @@ import { Router } from '@angular/router'; } @screen lg { - grid-template-columns: 60px 60px auto 112px 96px 96px 72px; + grid-template-columns: 40px 140px auto 80px 140px 40px 120px 120px 120px 40px 40px; } } + + .mat-tooltip { + white-space: pre-line; + } `, ], encapsulation: ViewEncapsulation.None, @@ -65,7 +72,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { @ViewChild(MatPaginator) private _paginator!: MatPaginator; @ViewChild(MatSort) private _sort!: MatSort; - withdraws$!: Observable; + bankWithdraw$!: Observable; __isSearchOpened = false; isLoading = false; @@ -79,6 +86,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { * Constructor */ constructor( + private _activatedRoute: ActivatedRoute, private _changeDetectorRef: ChangeDetectorRef, private _fuseConfirmationService: FuseConfirmationService, private _formBuilder: FormBuilder, @@ -106,7 +114,22 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { }); // Get the products - this.withdraws$ = this._withdrawService.withdraws$; + + this._activatedRoute.data.subscribe((data) => { + let listBankWithdrawResult: ListMemberBankWithdrawsResponse.Result = + data['bankWithdraw']; + this.bankWithdraw$ = of( + listBankWithdrawResult.getMemberBankWithdrawsList() + ); + + console.log( + 'bankWithdraw: ', + listBankWithdrawResult.getMemberBankWithdrawsList() + ); + + // Mark for check + this._changeDetectorRef.markForCheck(); + }); } /** @@ -202,4 +225,13 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { __trackByFn(index: number, item: any): any { return item.id || index; } + + __getMemoTooltop(withdraw: MemberBankWithdraw): string { + if (!withdraw.getMemo() || withdraw.getMemo() === '') { + return '메모없음'; + } + + const resultMemoTooltip = withdraw.getMemo(); + return resultMemoTooltip; + } } diff --git a/src/app/modules/admin/bank/withdraw/resolvers/withdraw.resolver.ts b/src/app/modules/admin/bank/withdraw/resolvers/withdraw.resolver.ts index a3086e1..daaba39 100644 --- a/src/app/modules/admin/bank/withdraw/resolvers/withdraw.resolver.ts +++ b/src/app/modules/admin/bank/withdraw/resolvers/withdraw.resolver.ts @@ -5,6 +5,8 @@ import { Router, RouterStateSnapshot, } from '@angular/router'; +import { MemberBankWithdrawService } from 'app/modules/polyglot/member_bank_withdraw/services/member_bank_withdraw.service'; +import { ListMemberBankWithdrawsResponse } from 'app/modules/proto/c2se/member_bank_withdraw_pb'; import { catchError, Observable, throwError } from 'rxjs'; import { Withdraw } from '../models/withdraw'; @@ -85,3 +87,33 @@ export class WithdrawsResolver implements Resolve { return this._withdrawService.getWithdraws(); } } + +@Injectable({ + providedIn: 'root', +}) +export class BankWithdrawResolver implements Resolve { + /** + * Constructor + */ + constructor(private _bankWithdrawService: MemberBankWithdrawService) {} + + // ----------------------------------------------------------------------------------------------------- + // @ Public methods + // ----------------------------------------------------------------------------------------------------- + + /** + * Resolver + * + * @param route + * @param state + */ + resolve( + route: ActivatedRouteSnapshot, + state: RouterStateSnapshot + ): + | Observable + | Promise + | ListMemberBankWithdrawsResponse.Result { + return this._bankWithdrawService.listMemberBankWithdraws(); + } +} diff --git a/src/app/modules/admin/bank/withdraw/withdraw.routing.ts b/src/app/modules/admin/bank/withdraw/withdraw.routing.ts index 1090e0b..8315e42 100644 --- a/src/app/modules/admin/bank/withdraw/withdraw.routing.ts +++ b/src/app/modules/admin/bank/withdraw/withdraw.routing.ts @@ -3,7 +3,10 @@ import { Route } from '@angular/router'; import { ListComponent } from './components/list.component'; import { ViewComponent } from '../../member/user/components/view.component'; -import { WithdrawsResolver } from './resolvers/withdraw.resolver'; +import { + BankWithdrawResolver, + WithdrawsResolver, +} from './resolvers/withdraw.resolver'; import { UserResolver } from '../../dashboards/user/user.resolvers'; export const withdrawRoutes: Route[] = [ @@ -11,7 +14,7 @@ export const withdrawRoutes: Route[] = [ path: '', component: ListComponent, resolve: { - withdraws: WithdrawsResolver, + bankWithdraw: BankWithdrawResolver, }, }, { diff --git a/src/app/modules/admin/member/partner/components/list.component.html b/src/app/modules/admin/member/partner/components/list.component.html index efde2c9..f2298aa 100644 --- a/src/app/modules/admin/member/partner/components/list.component.html +++ b/src/app/modules/admin/member/partner/components/list.component.html @@ -149,12 +149,15 @@ - + diff --git a/src/app/modules/admin/member/partner/components/list.component.ts b/src/app/modules/admin/member/partner/components/list.component.ts index 357ea4b..c49d604 100644 --- a/src/app/modules/admin/member/partner/components/list.component.ts +++ b/src/app/modules/admin/member/partner/components/list.component.ts @@ -367,4 +367,10 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { `; return resultTooltip; } + + __getStateString(state: any): string { + console.log(state.getState()); + + return '정상'; + } } diff --git a/src/app/modules/admin/member/user/components/list.component.html b/src/app/modules/admin/member/user/components/list.component.html index 9ad4537..1704ba6 100644 --- a/src/app/modules/admin/member/user/components/list.component.html +++ b/src/app/modules/admin/member/user/components/list.component.html @@ -11,24 +11,21 @@
User
+
-
- 총회원수:38   - 진행중금액:0   - 총 보유머니:21,437,873   - 총 콤프:394,860   - 총 합계:21,832,733 -
+ 총회원수:38   + 진행중금액:0   + 총 보유머니:21,437,873   + 총 콤프:394,860   + 총 합계:21,832,733
-
-
+
-
관리
-
요율
-
상부
-
+
관리
+
요율
+
상부
+
아이디

@@ -175,23 +172,31 @@
연락처
-
+
등급
레벨
상태
- - - @@ -201,10 +206,10 @@
-
+
-