diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts index 69dfa78..4cdfe4c 100644 --- a/src/app/core/auth/auth.service.ts +++ b/src/app/core/auth/auth.service.ts @@ -92,6 +92,7 @@ export class AuthService { // Set the authenticated flag to true this._authenticated = true; + resolve(); }) .catch((e) => { reject(e); diff --git a/src/app/mock-api/apps/member/current-user/data.ts b/src/app/mock-api/apps/member/current-user/data.ts index 1bcc183..128b3ff 100644 --- a/src/app/mock-api/apps/member/current-user/data.ts +++ b/src/app/mock-api/apps/member/current-user/data.ts @@ -8,7 +8,7 @@ export const currentUsers = [ currentLocation: '메인', gameMoney: 0, highRank: 'kgon5', - index: 1, + idx: 1, level: '4', ownCash: 67131, ownComp: 3111, diff --git a/src/app/modules/admin/member/current-user/components/list.component.html b/src/app/modules/admin/member/current-user/components/list.component.html index 5ce1596..5e411f9 100644 --- a/src/app/modules/admin/member/current-user/components/list.component.html +++ b/src/app/modules/admin/member/current-user/components/list.component.html @@ -69,7 +69,7 @@
-
{{ currentUser.index }}
+
{{ currentUser.idx }}
{{ currentUser.highRank }}
diff --git a/src/app/modules/admin/member/current-user/models/current-user.ts b/src/app/modules/admin/member/current-user/models/current-user.ts index 8864686..9e19477 100644 --- a/src/app/modules/admin/member/current-user/models/current-user.ts +++ b/src/app/modules/admin/member/current-user/models/current-user.ts @@ -5,7 +5,7 @@ export interface CurrentUser { currentLocation?: string; gameMoney?: number; highRank?: string; - index?: number; + idx?: number; level?: string; ownCash?: number; ownComp?: number; 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 014a548..1cadf41 100644 --- a/src/app/modules/admin/member/partner/components/list.component.html +++ b/src/app/modules/admin/member/partner/components/list.component.html @@ -71,20 +71,46 @@
-
관리
-
요율
+
+ + + + + + + + + +
+
+ 요율 +
{{ partner.branchCount }}{{ partner.divisionCount }}{{ partner.officeCount }}{{ partner.storeCount }}{{ partner.memberCount }}
-
+ +
{{ partner.signinId }}
{{ partner.nickname }}
{{ partner.phoneNumber }}
+
{{ partner.rank }}
@@ -92,12 +118,15 @@
{{ partner.state }}
+ + + + + + + +