From 71e4f7cff32d1381cbbee6eb4a9e0e41567579f4 Mon Sep 17 00:00:00 2001 From: JUNG YI DAM Date: Mon, 25 Jul 2022 06:28:34 +0000 Subject: [PATCH] =?UTF-8?q?=EC=B6=9C=EA=B8=88=EA=B4=80=EB=A6=AC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/mock-api/apps/bank/withdraw/api.ts | 4 +- src/app/mock-api/apps/bank/withdraw/data.ts | 6 +- .../withdraw/components/list.component.html | 370 +++++++----------- .../withdraw/components/list.component.ts | 9 + .../admin/bank/withdraw/models/withdraw.ts | 6 +- .../admin/bank/withdraw/withdraw.module.ts | 2 + 6 files changed, 169 insertions(+), 228 deletions(-) diff --git a/src/app/mock-api/apps/bank/withdraw/api.ts b/src/app/mock-api/apps/bank/withdraw/api.ts index b328d3c..812ec26 100644 --- a/src/app/mock-api/apps/bank/withdraw/api.ts +++ b/src/app/mock-api/apps/bank/withdraw/api.ts @@ -33,7 +33,7 @@ export class BankWithdrawMockApi { .reply(({ request }) => { // Get available queries const search = request.params.get('search'); - const sort = request.params.get('sort') || 'name'; + const sort = request.params.get('sort') || 'signinId'; const order = request.params.get('order') || 'asc'; const page = parseInt(request.params.get('page') ?? '1', 10); const size = parseInt(request.params.get('size') ?? '10', 10); @@ -42,7 +42,7 @@ export class BankWithdrawMockApi { let withdraws: any[] | null = cloneDeep(this._withdraws); // Sort the withdraws - if (sort === 'sku' || sort === 'name' || sort === 'active') { + if (sort === 'signinId' || sort === 'nickname' || sort === 'state') { withdraws.sort((a, b) => { const fieldA = a[sort].toString().toUpperCase(); const fieldB = b[sort].toString().toUpperCase(); diff --git a/src/app/mock-api/apps/bank/withdraw/data.ts b/src/app/mock-api/apps/bank/withdraw/data.ts index 72ff135..e6e1369 100644 --- a/src/app/mock-api/apps/bank/withdraw/data.ts +++ b/src/app/mock-api/apps/bank/withdraw/data.ts @@ -5,7 +5,7 @@ export const withdraws = [ rank: '회원', id: 'aa100', nickname: 'aa100', - exchangeApplication: 14000000, + applicationForCurrencyExchange: 14000000, calculateType: '롤링', accountHolder: '광주은행121212121212sss', note: '@', @@ -21,7 +21,7 @@ export const withdraws = [ rank: '회원', id: 'aa100', nickname: 'aa100', - exchangeApplication: 5000000, + applicationForCurrencyExchange: 5000000, calculateType: '롤링', accountHolder: '광주은행121212121212sss', note: '@', @@ -37,7 +37,7 @@ export const withdraws = [ rank: '회원', id: 'qwer12', nickname: '하하하', - exchangeApplication: 10000, + applicationForCurrencyExchange: 10000, calculateType: '롤링', accountHolder: '하나은행000210654151테스트', note: '', diff --git a/src/app/modules/admin/bank/withdraw/components/list.component.html b/src/app/modules/admin/bank/withdraw/components/list.component.html index dc01a8d..2a8f01e 100644 --- a/src/app/modules/admin/bank/withdraw/components/list.component.html +++ b/src/app/modules/admin/bank/withdraw/components/list.component.html @@ -10,16 +10,39 @@ -
Withdraw
+
출금관리
- - - - - + + + +
+ + + +
+ + + + +
+ + +
+ +
- + 카지노콤프 슬롯콤프 @@ -27,8 +50,9 @@ 첫충콤프 - - + + + 전체 아이디 닉네임 입금자이름 @@ -37,7 +61,8 @@ - +
- + + +
-
-
- - - - - - - - - - - - - - + +
정산종류
+
비고
+
환전신청금액
+ + + + +
@@ -119,185 +155,67 @@
- - - +
+ + +
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 5b9c012..d57dbaa 100644 --- a/src/app/modules/admin/bank/withdraw/components/list.component.ts +++ b/src/app/modules/admin/bank/withdraw/components/list.component.ts @@ -68,6 +68,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { withdraws$!: Observable; users$!: Observable; + __isSearchOpened = false; isLoading = false; searchInputControl = new FormControl(); selectedWithdraw?: Withdraw; @@ -180,6 +181,14 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { */ __toggleDetails(productId: string): void {} + /** + * toggle the search + * Used in 'bar' + */ + __onClickSearch(): void { + this.__isSearchOpened = !this.__isSearchOpened; + } + /** * Track by function for ngFor loops * diff --git a/src/app/modules/admin/bank/withdraw/models/withdraw.ts b/src/app/modules/admin/bank/withdraw/models/withdraw.ts index 46ae2d2..1555450 100644 --- a/src/app/modules/admin/bank/withdraw/models/withdraw.ts +++ b/src/app/modules/admin/bank/withdraw/models/withdraw.ts @@ -1,8 +1,10 @@ export interface Withdraw { + id: string; + signinId?: string; rank?: string; - id?: string; + level?: string; nickname?: string; - exchangeApplication?: number; + applicationForCurrencyExchange?: number; // 환전신청금액 calculateType?: string; accountHolder?: string; note?: string; diff --git a/src/app/modules/admin/bank/withdraw/withdraw.module.ts b/src/app/modules/admin/bank/withdraw/withdraw.module.ts index 58a3049..2136026 100644 --- a/src/app/modules/admin/bank/withdraw/withdraw.module.ts +++ b/src/app/modules/admin/bank/withdraw/withdraw.module.ts @@ -11,6 +11,7 @@ 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 { MatCheckboxModule } from '@angular/material/checkbox'; import { TranslocoModule } from '@ngneat/transloco'; @@ -37,6 +38,7 @@ import { withdrawRoutes } from './withdraw.routing'; MatSortModule, MatSelectModule, MatTooltipModule, + MatCheckboxModule, ], }) export class WithdrawModule {}