From 5315c6f9f4d32f073abfeb3162412135fcf3e942 Mon Sep 17 00:00:00 2001 From: yuanye Date: Thu, 30 Sep 2021 15:27:42 +0800 Subject: [PATCH] 1 --- .../activate-edit.component.html | 117 ++++++++++- .../activate-edit.component.scss | 66 ++++++- .../activate-edit/activate-edit.component.ts | 185 +++++++++++++++++- src/assets/images/post.png | Bin 0 -> 4937 bytes 4 files changed, 349 insertions(+), 19 deletions(-) create mode 100644 src/assets/images/post.png 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 255950f..72c2b5d 100644 --- a/src/app/admin/activate/activate-edit/activate-edit.component.html +++ b/src/app/admin/activate/activate-edit/activate-edit.component.html @@ -34,7 +34,7 @@ formControlName="productIdArray" nzPlaceHolder="请选择有抽奖资格的产品" > - + @@ -67,10 +67,38 @@ -
-
+ +
+ 共计 {{11}} 条数据 +
+
- + + + + 奖励名称 + 数量 + 图片 + 操作 + + + + + {{ data.name }} + {{ data.num }} + + + + + Action 一 {{ data.name }} + + Delete + + + + + +
@@ -79,3 +107,84 @@
+ + + + +
基本信息
+ +
奖品信息
+
+
+
+ + 代理商 + + + + + {{control.agentName}} + + +
+
+ + 优惠券 + + + + + {{control.discountName}} + + +
+
+ + 奖励数量 + + + {{control.prizeNum}} + + +
+
+
+ +
+ +
+
+ diff --git a/src/app/admin/activate/activate-edit/activate-edit.component.scss b/src/app/admin/activate/activate-edit/activate-edit.component.scss index 60ffd9a..dd309eb 100644 --- a/src/app/admin/activate/activate-edit/activate-edit.component.scss +++ b/src/app/admin/activate/activate-edit/activate-edit.component.scss @@ -1,14 +1,62 @@ .main { width: 90%; margin-left: 5%; - .title { - width: 100%; - height: 46px; - line-height: 46px; - font-size: 16px; - text-align: center; - color: #1890ff; - background-color: #f3f9ff; - margin-bottom: 20px; + .idCard { + img { + width: 200px; + } + .userImg { + width: 90px; + } } + .post_p_l { + margin-left: 5% ; + } + .main_post_p { + font-size: 12px; + color: #999999; + margin-top: -10px; + } + .btn { + margin-top: 20px; + } + .bottom_solid { + border-bottom: 1px solid #e4e4e4; + } + .btn-post { + width: 20%; + margin-left: 40%; + margin-top: 40px; + } + +} +.pics{ + display: flex; + align-items: center; + +} +.pic{ + width:10rem; + height:8rem; + margin-right: 1rem; + position: relative; +} +.delPic{ + width:1rem !important; + height:1rem; + position: absolute; + right: -10px;top:-10px; +} +.btn { + margin-top: 20px; +} +.title { + width: 100%; + height: 46px; + line-height: 46px; + font-size: 16px; + text-align: center; + color: #1890ff; + background-color: #f3f9ff; + margin-bottom: 20px; } 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 cbb0809..7f0a115 100644 --- a/src/app/admin/activate/activate-edit/activate-edit.component.ts +++ b/src/app/admin/activate/activate-edit/activate-edit.component.ts @@ -4,6 +4,20 @@ import {NzMessageService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd'; import {ActivatedRoute} from '_@angular_router@9.0.7@@angular/router'; import {CouponService} from '../../../services/coupon.service'; import {ActivateService} from '../../../services/activate.service'; +import {NzUploadFile} from 'ng-zorro-antd'; +import {environment} from '../../../../environments/environment'; +import {Observable, Observer} from 'rxjs'; +import {AgentService} from "../../../services/agent.service"; +import {DiscountService} from "../../../services/discount.service"; + +function getBase64(file: File): Promise { + return new Promise((resolve, reject) => { + const reader = new FileReader(); + reader.readAsDataURL(file); + reader.onload = () => resolve(reader.result); + reader.onerror = error => reject(error); + }); +} @Component({ selector: 'app-activate-edit', @@ -17,14 +31,36 @@ export class ActivateEditComponent implements OnInit { data: any; editFlag = false; id: number; + agentId: number; listOfOption: string[] = []; - current = 0; + listOfData = []; + agentData = []; + current = 1; + listOfControl = [{ + isEdit: true, + agentId: null, + agentName: null, + prizeNum: null, + prizeId: null, + discountName: null, + loading : false + }]; + FILE_URL = environment.imageUrl; + POST_URL = environment.baseUrl; + isVisible = false; + logoFile = []; + previewImage: string | undefined = ''; + previewVisible = false; + discountList = []; // 列表数据 constructor( private fb: FormBuilder, private coupon: CouponService, private activate: ActivateService, private message: NzMessageService, // 信息提示 private activatedRoute: ActivatedRoute, + private agent: AgentService, + private discount: DiscountService, + private msg: NzMessageService, ) { } ngOnInit(): void { @@ -44,17 +80,31 @@ export class ActivateEditComponent implements OnInit { }); this.validateFormAward = this.fb.group({ - activityInfoId: [null, [Validators.required]], - img: [null, [Validators.required]], name: [null, [Validators.required]], + img: [null, [Validators.required]], num: [null, [Validators.required]], }); const whereObject = { pageNum: 1 , - pageSize: 200 , - status: 2 , + pageSize: 800 , + status: 2 }; + + const whereObjectA = { + pageNum: 1 , + pageSize: 800 , + type: 1 + }; + + this.getCouponList(whereObject); + this.getListAgent(whereObjectA); + + + } + + public getCouponList(whereObject) { + whereObject.status = 2; this.coupon.getCouponList(whereObject, data => { if (data['return_code'] === '000000') { this.listOfOption = data['return_data'].list; @@ -64,6 +114,52 @@ export class ActivateEditComponent implements OnInit { }); } + // 绑定优惠券 + public getDiscount(id: number , i ): void { + this.listOfControl[i].agentName = this.agentData.find(item => { + return item.id == id; + }).agentName; + this.agentId = id; + const whereObject = {}; + whereObject['pageNum'] = 1; + whereObject['pageSize'] = 10000; + whereObject['agentId'] = id; + this.agent.getDiscountAgentList(whereObject, data => { + if (data['return_code'] === '000000') { + this.discountList = data['return_data'].list; + } else { + this.message.error(data['return_msg']); + } + }); + } + + getDiscountName(id: number , i ) { + this.listOfControl[i].discountName = this.discountList.find(item => { + return item['highDiscount'].id == id; + })['highDiscount'].discountName; + console.log(this.listOfControl); + } + + public getListAgent(whereObject) { + this.agent.getListAgent(whereObject, data => { + if (data['return_code'] === '000000') { + this.agentData = data['return_data'].list; + } else { + this.message.error(data['return_msg']); + } + }); + } + + // 图片查看 + handlePreview = async (file: NzUploadFile) => { + if (!file.url && !file.preview) { + // tslint:disable-next-line:no-non-null-assertion + file.preview = await getBase64(file.originFileObj!); + } + this.previewImage = file.url || file.preview; + this.previewVisible = true; + } + // 返回 getBack() { history.back(); @@ -128,8 +224,10 @@ export class ActivateEditComponent implements OnInit { // 下一步 getNest(): void { - if (this.current === 1) { + if (this.current === 0) { this.editActivityInfo(); + } else { + } } @@ -140,4 +238,79 @@ export class ActivateEditComponent implements OnInit { } + // 新增 + addField(i): void { + if ( + this.listOfControl[i].prizeId == null || + this.listOfControl[i].prizeNum == null || + this.listOfControl[i].agentId == null + ) { + this.message.error('请填写必填项！'); + return; + } + this.listOfControl[i].isEdit = false; + const control = { + isEdit: true, + agentId: null, + agentName: null, + prizeNum: null, + prizeId: null, + discountName: null, + loading : false + }; + this.listOfControl.push(control); + + } + + // 删除资质 + removeField(i, e: MouseEvent): void { + e.preventDefault(); + if (this.listOfControl.length > 1) { + this.listOfControl.splice(i, 1); + this.listOfControl[i - 1].isEdit = true; + } + } + + + // 添加配置 + getAdd(): void { + this.isVisible = true; + } + + + handleOk(): void { + + // tslint:disable-next-line:forin + for (const i in this.validateFormAward.controls) { + this.validateFormAward.controls[i].markAsDirty(); + this.validateFormAward.controls[i].updateValueAndValidity(); + if (this.validateFormAward.controls[i].errors != null) { + this.message.error('必填项不能为空'); + return; + } + } + + if ( + this.listOfControl[this.listOfControl.length - 1].prizeId == null || + this.listOfControl[this.listOfControl.length - 1].prizeNum == null || + this.listOfControl[this.listOfControl.length - 1].agentId == null + ) { + this.message.error('请填写必填项！'); + return; + } + + this.validateForm.value.ruleArray = [{ + partakeMode: 1, + productType: 1 , + productIdArray: this.validateForm.value.productIdArray + }]; + + console.log(this.listOfControl); + + } + + handleCancel(): void { + this.isVisible = false; + } + } diff --git a/src/assets/images/post.png b/src/assets/images/post.png new file mode 100644 index 0000000000000000000000000000000000000000..fd650f625d4b37ca8bf27dcebbe6763a66d5de8c GIT binary patch literal 4937 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 ao^Tn1=TJVeFA8Xpfh^5!&`->8N&f+%*D@Ob literal 0 HcmV?d00001