From fc876fc5e1af83373558986f7e5abb222d18bfe1 Mon Sep 17 00:00:00 2001
From: JUNG YI DAM <breeze@loafle.com>
Date: Mon, 25 Jul 2022 09:09:05 +0000
Subject: [PATCH] =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EB=94=94?=
 =?UTF-8?q?=ED=85=8C=EC=9D=BC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mock-api/apps/bank/web-calculate/data.ts  |  4 +-
 .../member/partner-recommendation/data.ts     |  4 +-
 .../deposit/components/list.component.html    | 10 +--
 .../components/list.component.html            |  4 +
 .../web-calculate/models/web-calculate.ts     |  2 +
 .../withdraw/components/list.component.html   | 10 +--
 .../powerball/components/list.component.html  |  2 +-
 .../components/list.component.html            | 18 ++---
 .../coupon-log/components/list.component.html |  2 +-
 .../components/list.component.html            |  2 +-
 .../coupon/components/list.component.html     |  2 +-
 .../components/list.component.html            | 80 +++++++++----------
 .../components/list.component.html            | 16 +++-
 .../models/partner-recommendation.ts          |  2 +
 .../partner/components/list.component.html    | 16 ++--
 .../components/list.component.html            | 16 ++--
 .../user/components/list.component.html       | 20 +++--
 17 files changed, 110 insertions(+), 100 deletions(-)

diff --git a/src/app/mock-api/apps/bank/web-calculate/data.ts b/src/app/mock-api/apps/bank/web-calculate/data.ts
index 400cda1..73c782e 100644
--- a/src/app/mock-api/apps/bank/web-calculate/data.ts
+++ b/src/app/mock-api/apps/bank/web-calculate/data.ts
@@ -16,7 +16,9 @@ export const webCalculates = [
     webWithdrawId: 'aa100',
     webWithdrawNickname: 'aa100',
     webWithdrawRank: '회원',
-    accountHolder: '광주은행 예금주22 565656565656',
+    nameOfBank: '광주은행',
+    accountHolder: '예금주',
+    accountNumber: '2222229999-222',
     webWithdrawAmountOfPayment: 5000000,
     webWithdrawRegistrationDate: '2022-06-08 18:31',
     webWithdrawConfirmDate: '2022-06-12 20:13',
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 b79dab7..0c82595 100644
--- a/src/app/mock-api/apps/member/partner-recommendation/data.ts
+++ b/src/app/mock-api/apps/member/partner-recommendation/data.ts
@@ -7,7 +7,9 @@ export const partnerRecommendations = [
     nickname: '가가가',
     rank: '매장',
     highRank: 'on03',
-    accountHolder: '국민은행4444444',
+    accountHolder: '홍길동',
+    nameOfBank: '국민은행',
+    accountNumber: '1212121-2121212',
     holdingMoney: 0,
     ownComp: 1649,
     state: '정상',
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 130b52b..15d1aee 100644
--- a/src/app/modules/admin/bank/deposit/components/list.component.html
+++ b/src/app/modules/admin/bank/deposit/components/list.component.html
@@ -120,13 +120,13 @@
                 아이디
                 <hr style="margin: 7px 0px" />
                 닉네임
-                <hr style="margin: 7px 0px" />
-                상태
               </div>
               <div>
                 등급
                 <hr style="margin: 7px 0px" />
                 레벨
+                <hr style="margin: 7px 0px" />
+                상태
               </div>
               <div class="hidden sm:block">예금주</div>
               <div>정산종류</div>
@@ -160,13 +160,13 @@
                     {{ deposit.signinId }}
                     <hr style="margin: 7px 0px" />
                     {{ deposit.nickname }}
-                    <hr style="margin: 7px 0px" />
-                    {{ deposit.state }}
                   </div>
                   <div>
                     {{ deposit.rank }}
                     <hr style="margin: 7px 0px" />
                     LV{{ deposit.level }}
+                    <hr style="margin: 7px 0px" />
+                    {{ deposit.state }}
                   </div>
                   <div class="hidden sm:block">
                     {{ deposit.accountHolder }}
@@ -254,7 +254,7 @@
         <div
           class="p-8 sm:p-16 border-t text-4xl font-semibold tracking-tight text-center"
         >
-          There are no deposit!
+          There are no data!
         </div>
       </ng-template>
     </div>
diff --git a/src/app/modules/admin/bank/web-calculate/components/list.component.html b/src/app/modules/admin/bank/web-calculate/components/list.component.html
index e524791..4e3a4cd 100644
--- a/src/app/modules/admin/bank/web-calculate/components/list.component.html
+++ b/src/app/modules/admin/bank/web-calculate/components/list.component.html
@@ -185,7 +185,11 @@
                   </div>
                   <div>{{ webCalculate.webWithdrawRank }}</div>
                   <div class="hidden sm:block">
+                    {{ webCalculate.nameOfBank }}
+                    <hr style="margin: 7px 0px" />
                     {{ webCalculate.accountHolder }}
+                    <hr style="margin: 7px 0px" />
+                    {{ webCalculate.accountNumber }}
                   </div>
                   <div class="hidden md:block">
                     {{ webCalculate.webWithdrawAmountOfPayment }}원
diff --git a/src/app/modules/admin/bank/web-calculate/models/web-calculate.ts b/src/app/modules/admin/bank/web-calculate/models/web-calculate.ts
index 52a9b06..c3b7eca 100644
--- a/src/app/modules/admin/bank/web-calculate/models/web-calculate.ts
+++ b/src/app/modules/admin/bank/web-calculate/models/web-calculate.ts
@@ -14,6 +14,8 @@ export interface WebCalculate {
   webWithdrawNickname?: string; //  웹출금 닉네임
   webWithdrawRank?: string; //  웹출금 등급
   accountHolder?: string;
+  nameOfBank?: string;
+  accountNumber?: string;
   webWithdrawAmountOfPayment?: number; //  웹출금 결제금액
   webWithdrawRegistrationDate?: Date; //  웹출금 신청일
   webWithdrawConfirmDate?: Date; //  웹출금 확인일
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 039ad27..aa31f9b 100644
--- a/src/app/modules/admin/bank/withdraw/components/list.component.html
+++ b/src/app/modules/admin/bank/withdraw/components/list.component.html
@@ -125,13 +125,13 @@
                 아이디
                 <hr style="margin: 7px 0px" />
                 닉네임
-                <hr style="margin: 7px 0px" />
-                상태
               </div>
               <div>
                 등급
                 <hr style="margin: 7px 0px" />
                 레벨
+                <hr style="margin: 7px 0px" />
+                상태
               </div>
               <div class="hidden sm:block">예금주</div>
               <div>정산종류</div>
@@ -163,13 +163,13 @@
                     {{ withdraw.signinId }}
                     <hr style="margin: 7px 0px" />
                     {{ withdraw.nickname }}
-                    <hr style="margin: 7px 0px" />
-                    {{ withdraw.state }}
                   </div>
                   <div>
                     {{ withdraw.rank }}
                     <hr style="margin: 7px 0px" />
                     LV{{ withdraw.level }}
+                    <hr style="margin: 7px 0px" />
+                    {{ withdraw.state }}
                   </div>
                   <div class="hidden sm:block">
                     {{ withdraw.accountHolder }}
@@ -237,7 +237,7 @@
         <div
           class="p-8 sm:p-16 border-t text-4xl font-semibold tracking-tight text-center"
         >
-          There are no withdraw!
+          There are no data!
         </div>
       </ng-template>
     </div>
diff --git a/src/app/modules/admin/game/powerball/components/list.component.html b/src/app/modules/admin/game/powerball/components/list.component.html
index 75f78f1..edefd93 100644
--- a/src/app/modules/admin/game/powerball/components/list.component.html
+++ b/src/app/modules/admin/game/powerball/components/list.component.html
@@ -235,7 +235,7 @@
         <div
           class="p-8 sm:p-16 border-t text-4xl font-semibold tracking-tight text-center"
         >
-          There are no Data!
+          There are no data!
         </div>
       </ng-template>
     </div>
diff --git a/src/app/modules/admin/member/casino-money/components/list.component.html b/src/app/modules/admin/member/casino-money/components/list.component.html
index c8b4cfc..6a630f5 100644
--- a/src/app/modules/admin/member/casino-money/components/list.component.html
+++ b/src/app/modules/admin/member/casino-money/components/list.component.html
@@ -82,19 +82,15 @@
                 아이디
                 <hr style="margin: 7px 0px" />
                 닉네임
-                <!-- <hr style="margin: 7px 0px" />
-                상태 -->
+                <hr style="margin: 7px 0px" />
+                연락처
               </div>
               <div>
                 등급
                 <hr style="margin: 7px 0px" />
                 레벨
               </div>
-              <div class="hidden sm:block">
-                예금주
-                <hr style="margin: 7px 0px" />
-                연락처
-              </div>
+              <div class="hidden sm:block">예금주</div>
               <div class="hidden md:block">보유금</div>
               <div class="hidden md:block">
                 게임중머니
@@ -120,6 +116,8 @@
                     {{ casinoMoney.signinId }}
                     <hr style="margin: 7px 0px" />
                     {{ casinoMoney.nickname }}
+                    <hr style="margin: 7px 0px" />
+                    {{ casinoMoney.phoneNumber }}
                   </div>
                   <div>
                     {{ casinoMoney.rank }}
@@ -128,13 +126,11 @@
                   </div>
                   <div class="hidden sm:block">
                     {{ casinoMoney.accountHolder }}
-                    <hr style="margin: 7px 0px" />
-                    {{ casinoMoney.phoneNumber }}
                   </div>
                   <div class="hidden md:block">
                     캐쉬{{ casinoMoney.ownCash }}
                     <hr style="margin: 7px 0px" />
-                    콤프{{ casinoMoney.ownComp }}
+                    콤프{{ casinoMoney.ownComp }}P
                     <hr style="margin: 7px 0px" />
                     쿠폰{{ casinoMoney.ownCoupon }}
                   </div>
@@ -188,7 +184,7 @@
         <div
           class="p-8 sm:p-16 border-t text-4xl font-semibold tracking-tight text-center"
         >
-          There are no casino money data!
+          There are no data!
         </div>
       </ng-template>
     </div>
diff --git a/src/app/modules/admin/member/coupon-log/components/list.component.html b/src/app/modules/admin/member/coupon-log/components/list.component.html
index ec137c9..9b96452 100644
--- a/src/app/modules/admin/member/coupon-log/components/list.component.html
+++ b/src/app/modules/admin/member/coupon-log/components/list.component.html
@@ -134,7 +134,7 @@
             <div
               class="p-8 sm:p-16 border-t text-4xl font-semibold tracking-tight text-center"
             >
-              There are no coupon log!
+              There are no data!
             </div>
           </ng-template>
         </div>
diff --git a/src/app/modules/admin/member/coupon-money-log/components/list.component.html b/src/app/modules/admin/member/coupon-money-log/components/list.component.html
index 0ca9221..3858274 100644
--- a/src/app/modules/admin/member/coupon-money-log/components/list.component.html
+++ b/src/app/modules/admin/member/coupon-money-log/components/list.component.html
@@ -159,7 +159,7 @@
             <div
               class="p-8 sm:p-16 border-t text-4xl font-semibold tracking-tight text-center"
             >
-              There are no coupon money log!
+              There are no data!
             </div>
           </ng-template>
         </div>
diff --git a/src/app/modules/admin/member/coupon/components/list.component.html b/src/app/modules/admin/member/coupon/components/list.component.html
index 0bd9081..0f025c8 100644
--- a/src/app/modules/admin/member/coupon/components/list.component.html
+++ b/src/app/modules/admin/member/coupon/components/list.component.html
@@ -184,7 +184,7 @@
             <div
               class="p-8 sm:p-16 border-t text-4xl font-semibold tracking-tight text-center"
             >
-              There are no coupon!
+              There are no data!
             </div>
           </ng-template>
         </div>
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 934670f..212d28c 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
@@ -35,14 +35,13 @@
               아이디
               <hr style="margin: 7px 0px" />
               닉네임
-              <hr style="margin: 7px 0px" />
-              현재위치
             </div>
             <div>
               등급
               <hr style="margin: 7px 0px" />
               레벨
             </div>
+            <div>현재위치</div>
             <div class="hidden md:block">보유금</div>
             <div class="hidden md:block">게임중머니</div>
             <div class="hidden md:block">사이트</div>
@@ -74,6 +73,7 @@
                   <hr style="margin: 7px 0px" />
                   {{ currentUser.level }}
                 </div>
+                <div>{{ currentUser.currentLocation }}</div>
                 <div class="hidden md:block">
                   {{ currentUser.ownCash }}
                   <hr style="margin: 7px 0px" />
@@ -133,47 +133,47 @@
       <div
         class="p-8 sm:p-16 border-t text-4xl font-semibold tracking-tight text-center"
       >
-        There are no current user!
+        There are no data!
       </div>
     </ng-template>
   </div>
-</div>
-<!-- Budget details -->
-<div>
-  <div
-    class="sm:col-span-6 flex flex-col flex-auto p-6 bg-card shadow rounded-2xl overflow-hidden"
-  >
-    <div class="text-lg font-medium tracking-tight leading-6 truncate">
-      현재 접속자 & 전체회원 쪽지보내기
-    </div>
-    <div class="flex flex-col flex-auto">
-      <mat-card>
-        <mat-card-content>
-          <div class="flex">
-            <mat-form-field class="w-1/3 pr-2">
-              <mat-label>제목</mat-label>
-              <input matInput />
-            </mat-form-field>
-          </div>
-          <div class="flex">
-            <mat-form-field class="w-1/3 pr-2">
-              <mat-label>글쓴이</mat-label>
-              <input matInput placeholder="관리자" />
-            </mat-form-field>
-          </div>
-          <div class="flex">
-            <mat-form-field class="w-1/3 pr-2">
-              <mat-label>내용</mat-label>
-              <input matInput />
-            </mat-form-field>
-          </div>
-          <div class="flex">
-            <mat-form-field class="w-1/3 pr-2">
-              <input matInput />
-            </mat-form-field>
-          </div>
-        </mat-card-content>
-      </mat-card>
+  <!-- Budget details -->
+  <div>
+    <div
+      class="sm:col-span-6 flex flex-col flex-auto p-6 bg-card shadow rounded-2xl overflow-hidden"
+    >
+      <div class="text-lg font-medium tracking-tight leading-6 truncate">
+        현재 접속자 & 전체회원 쪽지보내기
+      </div>
+      <div class="flex flex-col flex-auto">
+        <mat-card>
+          <mat-card-content>
+            <div class="flex">
+              <mat-form-field class="w-1/3 pr-2">
+                <mat-label>제목</mat-label>
+                <input matInput />
+              </mat-form-field>
+            </div>
+            <div class="flex">
+              <mat-form-field class="w-1/3 pr-2">
+                <mat-label>글쓴이</mat-label>
+                <input matInput placeholder="관리자" />
+              </mat-form-field>
+            </div>
+            <div class="flex">
+              <mat-form-field class="w-1/3 pr-2">
+                <mat-label>내용</mat-label>
+                <input matInput />
+              </mat-form-field>
+            </div>
+            <div class="flex">
+              <mat-form-field class="w-1/3 pr-2">
+                <input matInput />
+              </mat-form-field>
+            </div>
+          </mat-card-content>
+        </mat-card>
+      </div>
     </div>
   </div>
 </div>
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 af699f6..cd6524d 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
@@ -129,7 +129,13 @@
                   <div>
                     {{ partnerRecommendation.rank }}
                   </div>
-                  <div>{{ partnerRecommendation.accountHolder }}</div>
+                  <div>
+                    {{ partnerRecommendation.nameOfBank }}
+                    <hr style="margin: 7px 0px" />
+                    {{ partnerRecommendation.accountHolder }}
+                    <hr style="margin: 7px 0px" />
+                    {{ partnerRecommendation.accountNumber }}
+                  </div>
                   <div class="hidden sm:block">
                     {{ partnerRecommendation.holdingMoney }}
                     <hr style="margin: 7px 0px" />
@@ -241,10 +247,12 @@
               아이디
               <hr style="margin: 7px 0px" />
               닉네임
+            </div>
+            <div>
+              등급
               <hr style="margin: 7px 0px" />
               상태
             </div>
-            <div>등급</div>
             <div class="hidden md:block">사용여부</div>
             <div class="hidden sm:block">회원수</div>
           </div>
@@ -269,11 +277,11 @@
                   {{ partnerRecommendation.signinId }}
                   <hr style="margin: 7px 0px" />
                   {{ partnerRecommendation.nickname }}
-                  <hr style="margin: 7px 0px" />
-                  {{ partnerRecommendation.state }}
                 </div>
                 <div>
                   {{ partnerRecommendation.rank }}
+                  <hr style="margin: 7px 0px" />
+                  {{ partnerRecommendation.state }}
                 </div>
                 <div>{{ partnerRecommendation.useOrNot }}</div>
                 <div class="hidden sm:block">
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 2057f59..a37db4c 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,6 +7,8 @@ export interface PartnerRecommendation {
   rank?: string;
   highRank?: string;
   accountHolder?: string;
+  nameOfBank?: string;
+  accountNumber?: string;
   holdingMoney?: number;
   ownComp?: number;
   state?: string;
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 65c5198..e5e4f73 100644
--- a/src/app/modules/admin/member/partner/components/list.component.html
+++ b/src/app/modules/admin/member/partner/components/list.component.html
@@ -45,18 +45,16 @@
                 <hr style="margin: 7px 0px" />
                 닉네임
                 <hr style="margin: 7px 0px" />
-                상태
+                연락처
               </div>
               <div>
                 등급
                 <hr style="margin: 7px 0px" />
                 레벨
-              </div>
-              <div class="hidden sm:block">
-                예금주
                 <hr style="margin: 7px 0px" />
-                연락처
+                상태
               </div>
+              <div class="hidden sm:block">예금주</div>
               <div class="hidden md:block">정산종류</div>
               <div class="hidden md:block">보유금</div>
               <div class="hidden lg:block">충전금</div>
@@ -85,17 +83,17 @@
                     <hr style="margin: 7px 0px" />
                     {{ partner.nickname }}
                     <hr style="margin: 7px 0px" />
-                    {{ partner.state }}
+                    {{ partner.phoneNumber }}
                   </div>
                   <div>
                     {{ partner.rank }}
                     <hr style="margin: 7px 0px" />
                     LV{{ partner.level }}
+                    <hr style="margin: 7px 0px" />
+                    {{ partner.state }}
                   </div>
                   <div class="hidden sm:block">
                     {{ partner.accountHolder }}
-                    <hr style="margin: 7px 0px" />
-                    {{ partner.phoneNumber }}
                   </div>
                   <div class="hidden md:block">
                     {{ partner.calculateType }}
@@ -156,7 +154,7 @@
         <div
           class="p-8 sm:p-16 border-t text-4xl font-semibold tracking-tight text-center"
         >
-          There are no partner!
+          There are no data!
         </div>
       </ng-template>
     </div>
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 8ebfa2e..9e2db1f 100644
--- a/src/app/modules/admin/member/unconnected/components/list.component.html
+++ b/src/app/modules/admin/member/unconnected/components/list.component.html
@@ -163,18 +163,16 @@
                 <hr style="margin: 7px 0px" />
                 닉네임
                 <hr style="margin: 7px 0px" />
-                상태
+                연락처
               </div>
               <div>
                 등급
                 <hr style="margin: 7px 0px" />
                 레벨
-              </div>
-              <div class="hidden sm:block">
-                예금주
                 <hr style="margin: 7px 0px" />
-                연락처
+                상태
               </div>
+              <div class="hidden sm:block">예금주</div>
               <div class="hidden md:block">정산종류</div>
               <div class="hidden md:block">보유금</div>
               <div class="hidden md:block">
@@ -211,17 +209,17 @@
                     <hr style="margin: 7px 0px" />
                     {{ unconnected.nickname }}
                     <hr style="margin: 7px 0px" />
-                    {{ unconnected.state }}
+                    {{ unconnected.phoneNumber }}
                   </div>
                   <div>
                     {{ unconnected.rank }}
                     <hr style="margin: 7px 0px" />
                     LV{{ unconnected.level }}
+                    <hr style="margin: 7px 0px" />
+                    {{ unconnected.state }}
                   </div>
                   <div class="hidden sm:block">
                     {{ unconnected.accountHolder }}
-                    <hr style="margin: 7px 0px" />
-                    {{ unconnected.phoneNumber }}
                   </div>
                   <div class="hidden md:block">
                     {{ unconnected.calculateType }}
@@ -274,7 +272,7 @@
         <div
           class="p-8 sm:p-16 border-t text-4xl font-semibold tracking-tight text-center"
         >
-          There are no unconnected user!
+          There are no data!
         </div>
       </ng-template>
     </div>
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 abce2e0..4a18d18 100644
--- a/src/app/modules/admin/member/user/components/list.component.html
+++ b/src/app/modules/admin/member/user/components/list.component.html
@@ -170,18 +170,16 @@
                 <hr style="margin: 7px 0px" />
                 닉네임
                 <hr style="margin: 7px 0px" />
-                상태
+                연락처
               </div>
               <div>
                 등급
                 <hr style="margin: 7px 0px" />
                 레벨
-              </div>
-              <div class="hidden sm:block">
-                예금주
                 <hr style="margin: 7px 0px" />
-                연락처
+                상태
               </div>
+              <div class="hidden sm:block">예금주</div>
               <div class="hidden md:block">보유금</div>
               <div class="hidden md:block">
                 게임중머니
@@ -213,22 +211,22 @@
                     <hr style="margin: 7px 0px" />
                     {{ user.nickname }}
                     <hr style="margin: 7px 0px" />
-                    {{ user.state }}
+                    {{ user.phoneNumber }}
                   </div>
                   <div>
                     {{ user.rank }}
                     <hr style="margin: 7px 0px" />
-                    {{ user.level }}
+                    LV{{ user.level }}
+                    <hr style="margin: 7px 0px" />
+                    {{ user.state }}
                   </div>
                   <div class="hidden sm:block">
                     {{ user.accountHolder }}
-                    <hr style="margin: 7px 0px" />
-                    {{ user.phoneNumber }}
                   </div>
                   <div class="hidden md:block">
                     캐쉬{{ user.ownCash }}
                     <hr style="margin: 7px 0px" />
-                    콤프{{ user.ownComp }}
+                    콤프{{ user.ownComp }}P
                     <hr style="margin: 7px 0px" />
                     쿠폰{{ user.ownCoupon }}
                   </div>
@@ -290,7 +288,7 @@
         <div
           class="p-8 sm:p-16 border-t text-4xl font-semibold tracking-tight text-center"
         >
-          There are no user!
+          There are no data!
         </div>
       </ng-template>
     </div>