diff --git a/src/app/admin/activate/activate-edit/activate-edit.component.html b/src/app/admin/activate/activate-edit/activate-edit.component.html index 72c2b5d..8126a9b 100644 --- a/src/app/admin/activate/activate-edit/activate-edit.component.html +++ b/src/app/admin/activate/activate-edit/activate-edit.component.html @@ -167,7 +167,7 @@ - {{control.discountName}} + {{control.prizeName}} diff --git a/src/app/admin/activate/activate-edit/activate-edit.component.ts b/src/app/admin/activate/activate-edit/activate-edit.component.ts index 7f0a115..771aba4 100644 --- a/src/app/admin/activate/activate-edit/activate-edit.component.ts +++ b/src/app/admin/activate/activate-edit/activate-edit.component.ts @@ -42,7 +42,7 @@ export class ActivateEditComponent implements OnInit { agentName: null, prizeNum: null, prizeId: null, - discountName: null, + prizeName: null, loading : false }]; FILE_URL = environment.imageUrl; @@ -59,8 +59,6 @@ export class ActivateEditComponent implements OnInit { private message: NzMessageService, // 信息提示 private activatedRoute: ActivatedRoute, private agent: AgentService, - private discount: DiscountService, - private msg: NzMessageService, ) { } ngOnInit(): void { @@ -81,7 +79,6 @@ export class ActivateEditComponent implements OnInit { this.validateFormAward = this.fb.group({ name: [null, [Validators.required]], - img: [null, [Validators.required]], num: [null, [Validators.required]], }); @@ -134,7 +131,7 @@ export class ActivateEditComponent implements OnInit { } getDiscountName(id: number , i ) { - this.listOfControl[i].discountName = this.discountList.find(item => { + this.listOfControl[i].prizeName = this.discountList.find(item => { return item['highDiscount'].id == id; })['highDiscount'].discountName; console.log(this.listOfControl); @@ -255,7 +252,7 @@ export class ActivateEditComponent implements OnInit { agentName: null, prizeNum: null, prizeId: null, - discountName: null, + prizeName: null, loading : false }; this.listOfControl.push(control); @@ -299,13 +296,24 @@ export class ActivateEditComponent implements OnInit { return; } - this.validateForm.value.ruleArray = [{ - partakeMode: 1, - productType: 1 , - productIdArray: this.validateForm.value.productIdArray - }]; - - console.log(this.listOfControl); + this.validateFormAward.value.activityPrizes = this.listOfControl; + this.validateFormAward.value.activityInfoId = 7; + if (this.logoFile.length !== 0) { + if (this.logoFile[0]['response'] != null) { + this.validateFormAward.value.img = this.logoFile[0]['response']['return_data'][0]; + } else { + this.validateFormAward.value.img = this.logoFile[0].name; + } + } + console.log(this.validateFormAward.value); + this.activate.editActivityAward(this.validateFormAward.value , data => { + console.log(data); + if (data['return_code'] === '000000') { + this.message.success('编辑成功'); + } else { + this.message.create('error', '编辑失败'); + } + }); } diff --git a/src/app/services/activate.service.ts b/src/app/services/activate.service.ts index ee2fb71..0dd33ae 100644 --- a/src/app/services/activate.service.ts +++ b/src/app/services/activate.service.ts @@ -55,10 +55,12 @@ export class ActivateService { } /** - * 查询活动中奖记录 - * @param param 参数 - * @param callBack - */ + * @Author Sum1Dream + * @methodName getWinLotteryList + * @Description //查询活动中奖记录 + * @Date 17:54 2021/9/30 + * @Param mod + **/ public getWinLotteryList(param: object, callBack) { this.http.get(environment.baseUrl + 'activityAward/getWinLotteryList?' + this.common.getWhereCondition(param)).subscribe(data => { callBack(data); @@ -86,4 +88,17 @@ export class ActivateService { callBack(data); }); } + + /** + * @Author Sum1Dream + * @methodName editActivityInfo + * @Description //新增中奖名次 + * @Date 15:43 2021/9/30 + * @Param mod + **/ + public editActivityAward(params: object, callBack) { + this.http.post(environment.baseUrl + 'activityAward/editActivityAward', params).subscribe(data => { + callBack(data); + }); + } }