Merge branch 'dev' of http://139.159.177.244:3000/yuanye/high-web into dev

src/app/admin/activate/activate-edit/activate-edit.component.html

@@ -167,7 +167,7 @@
                         <nz-select *ngIf="control.isEdit" nzShowSearch nzAllowClear [(ngModel)]="control.prizeId" (ngModelChange)="getDiscountName($event , i)"  nzPlaceHolder="请选择优惠券">
                             <nz-option *ngFor="let item of discountList" nzLabel="{{item['highDiscount'].discountName}}" nzValue="{{item['highDiscount'].id}}"></nz-option>
                         </nz-select>
-                        <span *ngIf="!control.isEdit">{{control.discountName}}</span>
+                        <span *ngIf="!control.isEdit">{{control.prizeName}}</span>
                     </nz-form-control>
                 </nz-form-item>
             </div>

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 = [{
+    this.validateFormAward.value.activityPrizes = this.listOfControl;
-      partakeMode: 1,
+    this.validateFormAward.value.activityInfoId = 7;
-      productType: 1 ,
+    if (this.logoFile.length !== 0) {
-      productIdArray: this.validateForm.value.productIdArray
+      if (this.logoFile[0]['response'] != null) {
-    }];
+        this.validateFormAward.value.img = this.logoFile[0]['response']['return_data'][0];
-
+      } else {
-    console.log(this.listOfControl);
+        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', '编辑失败');
+      }
+    });
 
   }
 

src/app/services/activate.service.ts

@@ -55,10 +55,12 @@ export class ActivateService {
   }
 
   /**
-   * 查询活动中奖记录
+   * @Author Sum1Dream
-   * @param param 参数
+   * @methodName getWinLotteryList
-   * @param callBack
+   * @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);
+    });
+  }
 }