From 3eda379160dd1e80911a9c56ab394d1b88dcea89 Mon Sep 17 00:00:00 2001 From: Park Byung Eun Date: Mon, 15 Aug 2022 07:10:30 +0000 Subject: [PATCH 1/6] =?UTF-8?q?=EC=9D=80=ED=96=89=EC=A0=95=EB=B3=B4=20?= =?UTF-8?q?=EC=B6=9C=EB=A0=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/member/partner/components/list.component.html | 9 ++++++--- .../admin/member/partner/components/list.component.ts | 6 ++++++ 2 files changed, 12 insertions(+), 3 deletions(-) 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 '정상'; + } } From b1d18892102ea3e41156bb36a4c5effd8561471c Mon Sep 17 00:00:00 2001 From: Park Byung Eun Date: Mon, 15 Aug 2022 07:58:12 +0000 Subject: [PATCH 2/6] bug fix --- .../user/components/view.component.html | 68 +++++++++++++------ .../member/user/components/view.component.ts | 54 +++++++++++---- 2 files changed, 88 insertions(+), 34 deletions(-) diff --git a/src/app/modules/admin/member/user/components/view.component.html b/src/app/modules/admin/member/user/components/view.component.html index 6eb5c6b..04dca1e 100644 --- a/src/app/modules/admin/member/user/components/view.component.html +++ b/src/app/modules/admin/member/user/components/view.component.html @@ -111,9 +111,9 @@ 아이디 @@ -155,9 +155,9 @@ 핸드폰 @@ -166,17 +166,22 @@
레벨 - - - - cartegory option + + + {{ level.getName() }} - + 상태 - + brand option @@ -200,14 +205,28 @@
은행명 - - - - brand option + + + + {{ bank.getName() }} - + + + 계좌번호 사이트변경 - - - - vendor option + + + + {{ site.getUrl() }} - + + 추천횟수 = new Subject(); /** @@ -84,7 +94,10 @@ export class ViewComponent implements OnInit, AfterViewInit, OnDestroy { private _fuseConfirmationService: FuseConfirmationService, private _formBuilder: FormBuilder, private _userService: UserService, - private _memberService: MemberService + private _memberService: MemberService, + private _memberLevelService: MemberLevelService, + private _bankService: BankService, + private _siteService: SiteService ) {} // ----------------------------------------------------------------------------------------------------- @@ -97,18 +110,18 @@ export class ViewComponent implements OnInit, AfterViewInit, OnDestroy { ngOnInit(): void { this.memberViewForm = this._formBuilder.group({ id: [''], - signinId: [{ value: '', disabled: true }], + username: [{ value: '', disabled: true }], signinPw: [{ value: '' }], exchangePw: [''], description: [''], tags: [[]], nickname: [{ value: '', disabled: true }], ownCash: [''], - phoneNumber: [''], + mobilePhoneNumber: [''], level: [''], - status: [''], + state: [''], isExcahngeMoney: [''], - bankname: [''], + bankId: [''], accountNumber: [''], accountHolder: [''], comp: [''], @@ -143,6 +156,18 @@ export class ViewComponent implements OnInit, AfterViewInit, OnDestroy { /* this.user$ = this._userService.user$; */ + this._siteService + .listSites() + .then((result) => (this.sites = result.getSitesList())); + this._memberLevelService.listMemberLevels().then((result) => { + this.memberLevels = result + .getMemberLevelsList() + .filter((v) => !!v.getShow()); + }); + this._bankService + .listBanks() + .then((result) => (this.banks = result.getBanksList())); + this._activatedRoute.data.subscribe((data) => { let member: GetMemberResponse.Result = data['member']; @@ -150,13 +175,14 @@ export class ViewComponent implements OnInit, AfterViewInit, OnDestroy { /* console.log('dddd', listMemberResult.getMembersList()); */ this.memberViewForm.patchValue({ - signinId: this.selectedUser?.getUsername(), - signinPw: '1234', - exchangePw: '1234', - phoneNumber: this.selectedUser?.getMobilePhoneNumber(), - level: this.selectedUser?.getMemberLevel()?.getName(), - status: this.selectedUser?.getState(), + username: this.selectedUser?.getUsername(), + signinPw: '', + exchangePw: '', + mobilePhoneNumber: this.selectedUser?.getMobilePhoneNumber(), + levelId: this.selectedUser?.getMemberLevel()?.getId(), + state: this.selectedUser?.getState(), nickname: this.selectedUser?.getNickname(), + bankId: this.selectedUser?.getBankAccount()?.getId(), }); // Mark for check this._changeDetectorRef.markForCheck(); @@ -210,12 +236,12 @@ export class ViewComponent implements OnInit, AfterViewInit, OnDestroy { __modifyMember(): void { const valueForm = this.memberViewForm.value; console.log('v: ', valueForm); - this._memberService.updateMember( + /* this._memberService.updateMember( this.selectedUser!.getId(), this.selectedUser!.getSite()!.getId(), this.selectedUser!.getMemberLevel()!.getId(), 'beteran', - valueForm.phoneNumber - ); + valueForm.mobilePhoneNumber + ); */ } } From 18ab72488ec28b5909b8a4f6324f791a49e3c9fb Mon Sep 17 00:00:00 2001 From: JUNG YI DAM Date: Tue, 16 Aug 2022 05:04:48 +0000 Subject: [PATCH 3/6] =?UTF-8?q?user=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/components/list.component.html | 71 ++++++++++--------- .../modules/admin/member/user/user.module.ts | 2 + 2 files changed, 40 insertions(+), 33 deletions(-) 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 @@
-
+
-