From c95c854062851961151a45a1bda586dc9466ab10 Mon Sep 17 00:00:00 2001
From: yuanye <carries31415@sina.com>
Date: Wed, 29 Sep 2021 17:25:26 +0800
Subject: [PATCH] 1

---
 .../activate-edit/activate-edit.component.html        |  6 ++++--
 .../activate/activate-edit/activate-edit.component.ts | 11 ++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

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 656ac0c..255950f 100644
--- a/src/app/admin/activate/activate-edit/activate-edit.component.html
+++ b/src/app/admin/activate/activate-edit/activate-edit.component.html
@@ -13,7 +13,6 @@
         <nz-steps [nzCurrent]="current">
             <nz-step nzTitle="配置基本信息"></nz-step>
             <nz-step nzTitle="配置奖品"></nz-step>
-            <nz-step nzTitle="Waiting"></nz-step>
         </nz-steps>
         <form style="margin-top: 30px;" *ngIf="current === 0" nz-form [formGroup]="validateForm">
             <div nz-row>
@@ -67,7 +66,10 @@
                     </nz-form-item>
                 </div>
             </div>
-
+        </form>
+        <form style="margin-top: 30px;" *ngIf="current === 1" nz-form [formGroup]="validateFormAward">
+            <div nz-row>
+            </div>
         </form>
         <div nz-row>
             <div nz-col [nzSpan]="24" class="search-area">
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 01104e8..cbb0809 100644
--- a/src/app/admin/activate/activate-edit/activate-edit.component.ts
+++ b/src/app/admin/activate/activate-edit/activate-edit.component.ts
@@ -13,6 +13,7 @@ import {ActivateService} from '../../../services/activate.service';
 export class ActivateEditComponent implements OnInit {
 
   validateForm!: FormGroup;
+  validateFormAward!: FormGroup;
   data: any;
   editFlag = false;
   id: number;
@@ -40,7 +41,13 @@ export class ActivateEditComponent implements OnInit {
       type: [null, [Validators.required]],
       content: [null, [Validators.required]],
       time: [null, [Validators.required]],
+    });
 
+    this.validateFormAward = this.fb.group({
+      activityInfoId: [null, [Validators.required]],
+      img: [null, [Validators.required]],
+      name: [null, [Validators.required]],
+      num: [null, [Validators.required]],
     });
 
     const whereObject = {
@@ -121,8 +128,10 @@ export class ActivateEditComponent implements OnInit {
 
   // 下一步
   getNest(): void {
+    if (this.current === 1) {
+      this.editActivityInfo();
+    }
 
-    this.editActivityInfo();
   }
 
   // 完成