diff --git a/src/app/mock-api/apps/member/coupon/data.ts b/src/app/mock-api/apps/member/coupon/data.ts index 6b24003..d767bcb 100644 --- a/src/app/mock-api/apps/member/coupon/data.ts +++ b/src/app/mock-api/apps/member/coupon/data.ts @@ -2,32 +2,20 @@ export const coupons = [ { - id: 'on00', - totalPartnerCount: '5', - totalHoldingMoney: 303675, - totalComp: 108933, - total: 412608, - branchCount: 1, - divisionCount: 1, - officeCount: 1, - storeCount: 1, - memberCount: 1, - nickname: 'on00', - accountHolder: '11', - phoneNumber: '010-1111-1111', - calculateType: '롤링', - ownCash: 50000, - ownComp: 1711, - ownCoupon: 50000, - gameMoney: 0, - todayComp: 0, - totalDeposit: 0, - totalWithdraw: 0, - balance: 0, - registDate: '2022-06-12 15:38', - finalSigninDate: '', - ip: '', - state: '정상', - note: '', + id: '7eb7c859-1347-4317-96b6-9476a7e2ba3c', + issuedCouponId: 'on04', + issuedCouponNickname: 'on04', + receiveCouponId: 'onon6', + receiveCouponNickname: '가가가', + couponGroupNumber: '6L03ER50103AZOVS', + couponSerialNumber: '3GWL2T6RQJ4WJLRTQMBIRFEO', + issuedCoupons: '1/1', + issuedCouponPrice: 50000, + couponStartDate: '2022-06-12 00:00', + couponFinishDate: '2022-07-12 23:59', + useOrNot: 'Y', + issuedCouponDate: '2022-06-12 16:22', + modifyCouponDate: '2022-06-12 16:22', + useCouponDate: '', }, ]; 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 0da6106..0e07a8d 100644 --- a/src/app/modules/admin/member/coupon/components/list.component.html +++ b/src/app/modules/admin/member/coupon/components/list.component.html @@ -13,343 +13,172 @@
쿠폰발행리스트
- - - - - - - 40 - 60 - 80 - 100 - - - - - LV.1 - LV.2 - LV.3 - LV.4 - - - - - 정상 - 대기 - 탈퇴 - 휴면 - 블랙 - 정지 - - - - - 카지노제한 - 슬롯제한 - - - - - 계좌입금 - - - - - 카지노콤프 - 슬롯콤프 - 배팅콤프 - 첫충콤프 - - - - - - - - - - - -
- - - -
- -
- - -
- -
- - - - - - - - - - - - - - - - - - - - -
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- - - - - - -
- There are no coupons! + +
+ + + + 전체 + 생성아이디 + 생성닉네임 + 지급아이디 + 지급닉네임 + 그룹번호 + 쿠폰시리얼번호 + 사용가능쿠폰 + 사용완료쿠폰 + + + + + 등록일 + 쿠폰금액 + 쿠폰시작일 + 쿠폰종료일 + + + + + 내림차순 + 오름차순 + + + + + + + + +
- +
+ + +
+ +
+ + +
+ +
+
그룹번호
+
쿠폰시리얼번호
+
+ 생성아이디 +
+ 닉네임 +
+
발행수
+ + + + +
+ + + +
+
{{ coupon.couponGroupNumber }}
+
{{ coupon.couponSerialNumber }}
+
+
+ {{ coupon.issuedCouponId }} +
+
+ {{ coupon.issuedCouponNickname }} +
+
+ {{ coupon.issuedCoupons }} +
+ + + + +
+ + +
+ + + + + + +
+ There are no coupon! +
+ +
+
diff --git a/src/app/modules/admin/member/coupon/components/list.component.ts b/src/app/modules/admin/member/coupon/components/list.component.ts index f817b90..0e18bca 100644 --- a/src/app/modules/admin/member/coupon/components/list.component.ts +++ b/src/app/modules/admin/member/coupon/components/list.component.ts @@ -42,18 +42,22 @@ import { Router } from '@angular/router'; /* language=SCSS */ ` .inventory-grid { - grid-template-columns: 60px auto 40px; + /* 그룹 시리얼 생성 발행수 지급 */ + grid-template-columns: 140px 140px auto 100px 140px; @screen sm { - grid-template-columns: 60px 60px 60px 60px 60px 60px auto 60px; + /* 그룹 시리얼 생성 발행수 지급 시작 */ + grid-template-columns: 140px 140px auto 100px 140px 140px; } @screen md { - grid-template-columns: 60px 60px 60px 60px 60px 60px auto 60px 60px; + /* 그룹 시리얼 생성 발행수 지급 시작 사용 등록 */ + grid-template-columns: 140px 140px auto 100px 140px 140px 40px 140px; } @screen lg { - grid-template-columns: 60px 70px 70px 70px 70px 100px 60px 60px auto 60px 60px 60px 60px; + /* 그룹 시리얼 생성 발행수 지급 시작 사용 등록 */ + grid-template-columns: 140px 140px auto 100px 140px 140px 40px 140px; } } `, @@ -69,6 +73,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { coupons$!: Observable; users$!: Observable; + __isSearchOpened = false; isLoading = false; searchInputControl = new FormControl(); selectedCoupon?: Coupon; diff --git a/src/app/modules/admin/member/coupon/models/coupon.ts b/src/app/modules/admin/member/coupon/models/coupon.ts index d21561e..b80da2d 100644 --- a/src/app/modules/admin/member/coupon/models/coupon.ts +++ b/src/app/modules/admin/member/coupon/models/coupon.ts @@ -1,29 +1,17 @@ export interface Coupon { - id?: string; - totalPartnerCount?: number; - totalHoldingMoney?: number; - totalComp?: number; - total?: number; - branchCount?: number; - divisionCount?: number; - officeCount?: number; - storeCount?: number; - memberCount?: number; - nickname?: string; - accountHolder?: string; - phoneNumber?: string; - calculateType?: string; - ownCash?: number; - ownComp?: number; - ownCoupon?: number; - gameMoney?: number; - todayComp?: number; - totalDeposit?: number; - totalWithdraw?: number; - balance?: number; - registDate?: string; - finalSigninDate?: string; - ip?: string; - state?: string; - note?: string; + id: string; + issuedCouponId?: string; // 쿠폰생성아이디 + issuedCouponNickname?: string; // 쿠폰생성닉네임 + receiveCouponId?: string; // 쿠폰지급아이디 + receiveCouponNickname?: string; // 쿠폰지급닉네임 + couponGroupNumber?: string; // 쿠폰그룹번호 + couponSerialNumber?: string; // 쿠폰시리얼넘버 + issuedCoupons?: string; // 쿠폰발행수 + issuedCouponPrice?: number; // 발행금액 + couponStartDate?: Date; // 쿠폰시작일 + couponFinishDate?: Date; // 쿠폰종료일 + useOrNot?: string; + issuedCouponDate?: Date; // 쿠폰발행일 + modifyCouponDate?: Date; // 쿠폰수정일 + useCouponDate?: Date; // 쿠폰사용일 }