diff --git a/src/app/pages/specials/special/component/roulette-coupon.component.html b/src/app/pages/specials/special/component/roulette-coupon.component.html index bf50878..50c1691 100644 --- a/src/app/pages/specials/special/component/roulette-coupon.component.html +++ b/src/app/pages/specials/special/component/roulette-coupon.component.html @@ -1,4 +1,8 @@ -
+
- 고정보너스 + 룰렛 금액관리
- - 타입 + + 순위 {{ fixBonus.gameType }}{{ rouletteCoupon.id }} - - 설명 + + 금액 - {{ fixBonus.gameDescription }} + + + - - 설명 + + 확률 - + formControlName="rate" + /> % - + 배당설정 - - - - - - - 폴더설정 - - - - - - - - - - 허용불가 - - - @@ -146,7 +121,7 @@ > diff --git a/src/app/pages/specials/special/component/roulette-coupon.component.scss b/src/app/pages/specials/special/component/roulette-coupon.component.scss index 8f8f166..7952b5a 100644 --- a/src/app/pages/specials/special/component/roulette-coupon.component.scss +++ b/src/app/pages/specials/special/component/roulette-coupon.component.scss @@ -1,7 +1,7 @@ @import 'src/@fuse/scss/fuse'; -app-fix-bonus { - #fix-bonus { +app-roulette-coupon { + #roulette-coupon { .top-bg { @include media-breakpoint('xs') { height: 224px; @@ -48,14 +48,14 @@ app-fix-bonus { } } - .fix-bonus-table { + .roulette-coupon-table { color: black; flex: 1 1 auto; border-bottom: 1px solid rgba(0, 0, 0, 0.301); overflow: auto; // -webkit-overflow-scrolling: touch; - .fix-bonus { + .roulette-coupon { position: relative; cursor: pointer; // height: 84px; diff --git a/src/app/pages/specials/special/component/roulette-coupon.component.ts b/src/app/pages/specials/special/component/roulette-coupon.component.ts index 0a97ea6..9813a35 100644 --- a/src/app/pages/specials/special/component/roulette-coupon.component.ts +++ b/src/app/pages/specials/special/component/roulette-coupon.component.ts @@ -23,14 +23,7 @@ import { RouletteCouponService } from 'src/modules/special/roulette-coupon/servi }) export class RouletteCouponComponent implements OnInit, OnDestroy, AfterViewInit { - displayedColumns = [ - 'gameType', - 'gameDescription', - 'userDescription', - 'odds', - 'folder', - 'allow' - ]; + displayedColumns = ['id', 'price', 'rate', 'priceWon']; constructor( private fb: FormBuilder, private rouletteCouponService: RouletteCouponService diff --git a/src/app/pages/specials/special/component/roulette-coupon.data-source.ts b/src/app/pages/specials/special/component/roulette-coupon.data-source.ts index 9af3dee..fc6b272 100644 --- a/src/app/pages/specials/special/component/roulette-coupon.data-source.ts +++ b/src/app/pages/specials/special/component/roulette-coupon.data-source.ts @@ -12,145 +12,58 @@ import { FormControl, FormGroup, Validators, FormArray } from '@angular/forms'; const ELEMENT_DATA: RouletteCoupon[] = [ { - gameType: 'gameType1', - gameDescription: '크로스', - userDescription: - '[ 3폴더 ] 이상 조합가능 보너스 ㅡㅡㅡ 1.2배당 이상경기만 인정', - odds: '1.03', - folder: 3, - allow: false, + id: 1, + price: '10,000', + rate: '5', + priceWon: '10,000원', createdAt: null, updatedAt: null }, { - gameType: 'gameType2', - gameDescription: '크로스', - userDescription: - '[ 3폴더 ] 이상 조합가능 보너스 ㅡㅡㅡ 1.2배당 이상경기만 인정', - odds: '1.03', - folder: 3, - allow: false, + id: 2, + price: '5,000', + rate: '20', + priceWon: '5,000원', createdAt: null, updatedAt: null }, { - gameType: 'gameType3', - gameDescription: '크로스', - userDescription: - '[ 3폴더 ] 이상 조합가능 보너스 ㅡㅡㅡ 1.2배당 이상경기만 인정', - odds: '1.03', - folder: 3, - allow: false, + id: 3, + price: '100,000', + rate: '0', + priceWon: '100,000원', createdAt: null, updatedAt: null }, { - gameType: 'gameType4', - gameDescription: '가상축구', - userDescription: - '[ 3폴더 ] 이상 조합가능 보너스 ㅡㅡㅡ 1.2배당 이상경기만 인정', - odds: '1.03', - folder: 3, - allow: false, + id: 4, + price: '10,000', + rate: '5', + priceWon: '10,000원', createdAt: null, updatedAt: null }, { - gameType: 'gameType5', - gameDescription: '가상축구', - userDescription: - '[ 3폴더 ] 이상 조합가능 보너스 ㅡㅡㅡ 1.2배당 이상경기만 인정', - odds: '1.03', - folder: 3, - allow: false, + id: 5, + price: '5,000', + rate: '20', + priceWon: '5,000원', createdAt: null, updatedAt: null }, { - gameType: 'gameType6', - gameDescription: '가상축구', - userDescription: - '[ 3폴더 ] 이상 조합가능 보너스 ㅡㅡㅡ 1.2배당 이상경기만 인정', - odds: '1.03', - folder: 3, - allow: false, + id: 6, + price: '300,000', + rate: '0', + priceWon: '300,000원', createdAt: null, updatedAt: null }, { - gameType: 'gameType7', - gameDescription: '스페셜', - userDescription: - '[ 3폴더 ] 이상 조합가능 보너스 ㅡㅡㅡ 1.2배당 이상경기만 인정', - odds: '1.03', - folder: 3, - allow: false, - createdAt: null, - updatedAt: null - }, - { - gameType: 'gameType8', - gameDescription: '스페셜', - userDescription: - '[ 3폴더 ] 이상 조합가능 보너스 ㅡㅡㅡ 1.2배당 이상경기만 인정', - odds: '1.03', - folder: 3, - allow: false, - createdAt: null, - updatedAt: null - }, - { - gameType: 'gameType9', - gameDescription: '스페셜', - userDescription: - '[ 3폴더 ] 이상 조합가능 보너스 ㅡㅡㅡ 1.2배당 이상경기만 인정', - odds: '1.03', - folder: 3, - allow: false, - createdAt: null, - updatedAt: null - }, - { - gameType: 'gameType10', - gameDescription: '실시간', - userDescription: - '[ 3폴더 ] 이상 조합가능 보너스 ㅡㅡㅡ 1.2배당 이상경기만 인정', - odds: '1.03', - folder: 3, - allow: false, - createdAt: null, - updatedAt: null - }, - { - gameType: 'gameType11', - gameDescription: '실시간', - userDescription: - '[ 3폴더 ] 이상 조합가능 보너스 ㅡㅡㅡ 1.2배당 이상경기만 인정', - odds: '1.03', - folder: 3, - allow: false, - createdAt: null, - updatedAt: null - }, - { - gameType: 'gameType12', - gameDescription: '실시간', - userDescription: - '[ 3폴더 ] 이상 조합가능 보너스 ㅡㅡㅡ 1.2배당 이상경기만 인정', - odds: '1.03', - folder: 3, - allow: false, - createdAt: null, - updatedAt: null - }, - { - gameType: 'gameType13', - gameDescription: '개경주', - userDescription: - '[ 3폴더 ] 이상 조합가능 보너스 ㅡㅡㅡ 1.2배당 이상경기만 인정', - odds: '1.03', - folder: 3, - allow: false, + id: 7, + price: '10,000', + rate: '5', + priceWon: '10,000원', createdAt: null, updatedAt: null } @@ -191,12 +104,10 @@ export class RouletteCouponDataSource extends DataSource { createRowFormGroup(r: RouletteCoupon): FormGroup { let f = new FormGroup({ - gameType: this.createNewFormContorl(r, 'gameType'), - gameDescription: this.createNewFormContorl(r, 'gameDescription'), - userDescription: this.createNewFormContorl(r, 'userDescription'), - odds: this.createNewFormContorl(r, 'odds'), - folder: this.createNewFormContorl(r, 'folder'), - allow: this.createNewFormContorl(r, 'allow') + id: this.createNewFormContorl(r, 'id'), + price: this.createNewFormContorl(r, 'price'), + rate: this.createNewFormContorl(r, 'rate'), + priceWon: this.createNewFormContorl(r, 'priceWon') }); return f; } diff --git a/src/modules/special/roulette-coupon/model/roulette-coupon.model.ts b/src/modules/special/roulette-coupon/model/roulette-coupon.model.ts index 87c3db3..36d5d4c 100644 --- a/src/modules/special/roulette-coupon/model/roulette-coupon.model.ts +++ b/src/modules/special/roulette-coupon/model/roulette-coupon.model.ts @@ -2,10 +2,7 @@ import { DateAudit } from 'src/modules/common/data/model/audit'; export interface RouletteCoupon extends DateAudit { id?: number; - gameType?: string; - gameDescription?: string; - userDescription?: string; - odds?: string; - folder?: number; - allow?: boolean; + price?: string; + rate?: string; + priceWon?: string; }