From 812caa3a1405ff0d6615f0bb68f732a21db3e3e2 Mon Sep 17 00:00:00 2001 From: JUNG YI DAM Date: Mon, 8 Aug 2022 06:12:50 +0000 Subject: [PATCH 1/3] =?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/modules/admin/member/user/models/user.ts | 2 +- .../settings/domain/components/list.component.html | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/app/modules/admin/member/user/models/user.ts b/src/app/modules/admin/member/user/models/user.ts index 831a351..d4b7fd0 100644 --- a/src/app/modules/admin/member/user/models/user.ts +++ b/src/app/modules/admin/member/user/models/user.ts @@ -24,7 +24,7 @@ export interface User { signinPw: string; exchangePw: string; nickname?: string; // 사용자 닉네임 - highRank?: string; // 상위 + highRank?: string; // 상부 rank?: string; // 매장/총판/부본/대본/본사/ level?: string; // LV1, LV2, LV3, LV4 accountHolder?: string; // 예금주 diff --git a/src/app/modules/admin/settings/domain/components/list.component.html b/src/app/modules/admin/settings/domain/components/list.component.html index c0766e5..a5fbf40 100644 --- a/src/app/modules/admin/settings/domain/components/list.component.html +++ b/src/app/modules/admin/settings/domain/components/list.component.html @@ -216,6 +216,19 @@ +
+ -도메인 www.을 빼고 등록해야 합니다.(ex:demo.com) + -만료일은 도메인 구입처(구입당시)에서 확인가능합니다. (등록하지 + 않으면 등록날짜 기준으로 365 남은기간이 설정됩니다.) + -메모란을 등록하셔서 도메인을 관리하시면 좋습니다. (150자 이하로 + 등록해주세요.) +
From 53fa292fcf7785bd77c8b8f985494b5ca3c57a53 Mon Sep 17 00:00:00 2001 From: JUNG YI DAM Date: Mon, 8 Aug 2022 07:03:26 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=EB=B3=80=EC=88=98=EB=AA=85=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mock-api/apps/member/unconnected/data.ts | 40 +++++++++---------- .../components/list.component.html | 2 +- .../member/unconnected/models/unconnected.ts | 2 +- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/app/mock-api/apps/member/unconnected/data.ts b/src/app/mock-api/apps/member/unconnected/data.ts index 065ea1a..7954a52 100644 --- a/src/app/mock-api/apps/member/unconnected/data.ts +++ b/src/app/mock-api/apps/member/unconnected/data.ts @@ -20,7 +20,7 @@ export const unconnecteds = [ ownCharge: 0, ownExchange: 0, balance: 0, - members: 1, + memberCount: 1, }, { id: '8fcce528-d878-4cc8-99f7-bd3451ed5405', @@ -41,7 +41,7 @@ export const unconnecteds = [ ownCharge: 0, ownExchange: 0, balance: 0, - members: 5, + memberCount: 5, }, { id: 'd7a47d7c-4cdf-4319-bbaa-37ade38c622c', @@ -62,7 +62,7 @@ export const unconnecteds = [ ownCharge: 0, ownExchange: 0, balance: 0, - members: 1, + memberCount: 1, }, { id: 'ecf0b3df-38c3-45dc-972b-c509a3dc053e', @@ -83,7 +83,7 @@ export const unconnecteds = [ ownCharge: 0, ownExchange: 0, balance: 0, - members: 1, + memberCount: 1, }, { id: '5765080a-aaee-40b9-86be-c18b9d79c73c', @@ -104,7 +104,7 @@ export const unconnecteds = [ ownCharge: 0, ownExchange: 0, balance: 0, - members: 2, + memberCount: 2, }, { id: '6e71be88-b225-474c-91e5-111ced7d6220', @@ -125,7 +125,7 @@ export const unconnecteds = [ ownCharge: 0, ownExchange: 0, balance: 0, - members: 1, + memberCount: 1, }, { id: '51242500-6983-4a78-bff3-d278eb4e3a57', @@ -146,7 +146,7 @@ export const unconnecteds = [ ownCharge: 0, ownExchange: 0, balance: 0, - members: 1, + memberCount: 1, }, { id: '844a4395-233f-4ffb-85bd-7baa0e490a88', @@ -167,7 +167,7 @@ export const unconnecteds = [ ownCharge: 0, ownExchange: 0, balance: 0, - members: 1, + memberCount: 1, }, { id: '7520f1b6-3c45-46ef-a4d5-881971212d1e', @@ -188,7 +188,7 @@ export const unconnecteds = [ ownCharge: 0, ownExchange: 0, balance: 0, - members: 1, + memberCount: 1, }, { id: '683e41d8-6ebc-4e6a-a7c1-9189ca52ef19', @@ -209,7 +209,7 @@ export const unconnecteds = [ ownCharge: 0, ownExchange: 0, balance: 0, - members: 1, + memberCount: 1, }, { id: 'd4e52238-292d-462b-b9bb-1751030132e2', @@ -230,7 +230,7 @@ export const unconnecteds = [ ownCharge: 0, ownExchange: 0, balance: 0, - members: 1, + memberCount: 1, }, { id: '98861dfc-0d21-4fd5-81aa-49785d003d95', @@ -251,7 +251,7 @@ export const unconnecteds = [ ownCharge: 0, ownExchange: 0, balance: 0, - members: 1, + memberCount: 1, }, { id: 'a71f9b10-e884-4aad-9810-29fe10ce6d42', @@ -272,7 +272,7 @@ export const unconnecteds = [ ownCharge: 0, ownExchange: 0, balance: 0, - members: 1, + memberCount: 1, }, { id: '149e6db5-4ecc-4021-bc56-08b27514a746', @@ -293,7 +293,7 @@ export const unconnecteds = [ ownCharge: 0, ownExchange: 0, balance: 0, - members: 1, + memberCount: 1, }, { id: '655287de-2e24-41f3-a82f-8b08548ecc39', @@ -314,7 +314,7 @@ export const unconnecteds = [ ownCharge: 0, ownExchange: 0, balance: 0, - members: 1, + memberCount: 1, }, { id: 'c215b427-d840-4537-aea1-a9bdfa49441b', @@ -335,7 +335,7 @@ export const unconnecteds = [ ownCharge: 0, ownExchange: 0, balance: 0, - members: 1, + memberCount: 1, }, { id: '8b1d9366-891e-49cd-aafb-ac65ce2741e2', @@ -356,7 +356,7 @@ export const unconnecteds = [ ownCharge: 0, ownExchange: 0, balance: 0, - members: 1, + memberCount: 1, }, { id: '54e29534-518b-4006-b72a-f21fac6c4d5e', @@ -377,7 +377,7 @@ export const unconnecteds = [ ownCharge: 0, ownExchange: 0, balance: 0, - members: 1, + memberCount: 1, }, { id: '6a5726e8-c467-45ea-92ab-d83235a06405', @@ -398,7 +398,7 @@ export const unconnecteds = [ ownCharge: 0, ownExchange: 0, balance: 0, - members: 1, + memberCount: 1, }, { id: 'd7d1d6df-e91f-4c53-982a-2720bc2b4cdd', @@ -419,6 +419,6 @@ export const unconnecteds = [ ownCharge: 0, ownExchange: 0, balance: 0, - members: 1, + memberCount: 1, }, ]; diff --git a/src/app/modules/admin/member/unconnected/components/list.component.html b/src/app/modules/admin/member/unconnected/components/list.component.html index 13a48a5..122d583 100644 --- a/src/app/modules/admin/member/unconnected/components/list.component.html +++ b/src/app/modules/admin/member/unconnected/components/list.component.html @@ -202,7 +202,7 @@ 상부{{ unconnected.highRank }}
{{ unconnected.signinId }} diff --git a/src/app/modules/admin/member/unconnected/models/unconnected.ts b/src/app/modules/admin/member/unconnected/models/unconnected.ts index 0aa795f..6332b78 100644 --- a/src/app/modules/admin/member/unconnected/models/unconnected.ts +++ b/src/app/modules/admin/member/unconnected/models/unconnected.ts @@ -17,5 +17,5 @@ export interface Unconnected { ownCharge?: number; ownExchange?: number; balance?: number; // 차익, 수익 - members?: number; + memberCount?: number; } From d70faa865f9a0c74640272186bb060c7f82eb51b Mon Sep 17 00:00:00 2001 From: JUNG YI DAM Date: Mon, 8 Aug 2022 07:07:08 +0000 Subject: [PATCH 3/3] =?UTF-8?q?=EB=B3=80=EC=88=98=EB=AA=85=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apps/member/partner-recommendation/data.ts | 16 ++++++++-------- .../components/list.component.html | 2 +- .../models/partner-recommendation.ts | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/app/mock-api/apps/member/partner-recommendation/data.ts b/src/app/mock-api/apps/member/partner-recommendation/data.ts index 64afd70..b7283b3 100644 --- a/src/app/mock-api/apps/member/partner-recommendation/data.ts +++ b/src/app/mock-api/apps/member/partner-recommendation/data.ts @@ -8,7 +8,7 @@ export const partnerRecommendations = [ rank: '매장', highRank: '[총판]on03', accountHolder: '홍길동', - nameOfBank: '국민은행', + bankName: '국민은행', accountNumber: '1212121-2121212', holdingMoney: 0, ownComp: 1649, @@ -24,7 +24,7 @@ export const partnerRecommendations = [ rank: '매장', highRank: '[총판]test44', accountHolder: 'ttest07', - nameOfBank: '국민은행', + bankName: '국민은행', accountNumber: '15453-2121212', holdingMoney: 100000, ownComp: 238908, @@ -40,7 +40,7 @@ export const partnerRecommendations = [ rank: '매장', highRank: '[총판]test44', accountHolder: 'test', - nameOfBank: '국민은행', + bankName: '국민은행', accountNumber: '11', holdingMoney: 0, ownComp: 0, @@ -56,7 +56,7 @@ export const partnerRecommendations = [ rank: '매장', highRank: '[총판]test44', accountHolder: '', - nameOfBank: '', + bankName: '', accountNumber: '', holdingMoney: 118, ownComp: 0, @@ -72,7 +72,7 @@ export const partnerRecommendations = [ rank: '매장', highRank: '[총판]test44', accountHolder: '테스트매장', - nameOfBank: '농협', + bankName: '농협', accountNumber: '12312312331', holdingMoney: 0, ownComp: 0, @@ -88,7 +88,7 @@ export const partnerRecommendations = [ rank: '매장', highRank: '[총판]kgon4', accountHolder: '매장', - nameOfBank: '국민은행', + bankName: '국민은행', accountNumber: '0000000000', holdingMoney: 37195, ownComp: 28182, @@ -104,7 +104,7 @@ export const partnerRecommendations = [ rank: '매장', highRank: '[총판]kgon4', accountHolder: '매장', - nameOfBank: '국민은행', + bankName: '국민은행', accountNumber: '0000000000', holdingMoney: 712, ownComp: 28182, @@ -120,7 +120,7 @@ export const partnerRecommendations = [ rank: '매장', highRank: '[총판]test44', accountHolder: '매장', - nameOfBank: '국민은행', + bankName: '국민은행', accountNumber: '0000000000', holdingMoney: 712, ownComp: 6192, diff --git a/src/app/modules/admin/member/partner-recommendation/components/list.component.html b/src/app/modules/admin/member/partner-recommendation/components/list.component.html index cc53318..5c226da 100644 --- a/src/app/modules/admin/member/partner-recommendation/components/list.component.html +++ b/src/app/modules/admin/member/partner-recommendation/components/list.component.html @@ -130,7 +130,7 @@ {{ partnerRecommendation.rank }}
- {{ partnerRecommendation.nameOfBank }} + {{ partnerRecommendation.bankName }}
{{ partnerRecommendation.accountHolder }}
diff --git a/src/app/modules/admin/member/partner-recommendation/models/partner-recommendation.ts b/src/app/modules/admin/member/partner-recommendation/models/partner-recommendation.ts index a37db4c..fc868e5 100644 --- a/src/app/modules/admin/member/partner-recommendation/models/partner-recommendation.ts +++ b/src/app/modules/admin/member/partner-recommendation/models/partner-recommendation.ts @@ -7,7 +7,7 @@ export interface PartnerRecommendation { rank?: string; highRank?: string; accountHolder?: string; - nameOfBank?: string; + bankName?: string; accountNumber?: string; holdingMoney?: number; ownComp?: number;