From 0eaf435888f34f945e339fcae8bedb31e5902cb6 Mon Sep 17 00:00:00 2001
From: yuanye <418471657@qq.com>
Date: Thu, 25 Nov 2021 22:41:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E5=8F=8A=E4=BF=AE=E6=94=B9=E8=B5=A0?=
 =?UTF-8?q?=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activate-edit/activate-edit.component.ts         |  1 -
 .../discount-edit/discount-edit.component.html       | 11 ++++++++++-
 .../discount-edit/discount-edit.component.ts         | 12 ++++++++++--
 3 files changed, 20 insertions(+), 4 deletions(-)

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 bc0ff24..0db2010 100644
--- a/src/app/admin/activate/activate-edit/activate-edit.component.ts
+++ b/src/app/admin/activate/activate-edit/activate-edit.component.ts
@@ -246,7 +246,6 @@ export class ActivateEditComponent implements OnInit {
 
   }
 
-
   // 新增
   addField(i): void {
     if (
diff --git a/src/app/admin/discount/discount-edit/discount-edit.component.html b/src/app/admin/discount/discount-edit/discount-edit.component.html
index f973e2c..1f15dca 100644
--- a/src/app/admin/discount/discount-edit/discount-edit.component.html
+++ b/src/app/admin/discount/discount-edit/discount-edit.component.html
@@ -32,7 +32,16 @@
                     </nz-form-control>
                 </nz-form-item>
             </div>
-
+            <div nz-col [nzSpan]="8">
+                <nz-form-item>
+                    <nz-form-label [nzFor]="'usingRange'"  nzRequired>优惠券使用范围</nz-form-label>
+                    <nz-form-control  nzErrorTip="请选择优惠券使用范围!">
+                        <nz-select formControlName="usingRange" nzAllowClear nzPlaceHolder="请选择优惠券使用范围">
+                            <nz-option *ngFor="let item  of usingRange" nzValue="{{item.codeValue}}" nzLabel="{{item.codeName}}"></nz-option>
+                        </nz-select>
+                    </nz-form-control>
+                </nz-form-item>
+            </div>
             <div nz-col [nzSpan]="8" *ngIf="validateForm.value.discountType === '1'">
                 <nz-form-item>
                     <nz-form-label [nzFor]="'discountCondition'" nzRequired>满减条件价格</nz-form-label>
diff --git a/src/app/admin/discount/discount-edit/discount-edit.component.ts b/src/app/admin/discount/discount-edit/discount-edit.component.ts
index eac1253..ad11a92 100644
--- a/src/app/admin/discount/discount-edit/discount-edit.component.ts
+++ b/src/app/admin/discount/discount-edit/discount-edit.component.ts
@@ -28,6 +28,7 @@ export class DiscountEditComponent implements OnInit {
     editFlag = false;
     id: number;
     discountImg = [];
+    usingRange = [];
     WEB_SERVE_URL = environment.baseUrl;
     previewImage: string | undefined = '';
     previewVisible = false;
@@ -36,6 +37,7 @@ export class DiscountEditComponent implements OnInit {
         private fb: FormBuilder,
         private discount: DiscountService,
         private common: CommonsService,
+        private commonsService: CommonsService,
         private message: NzMessageService, // 信息提示
         private activatedRoute: ActivatedRoute,
     ) {
@@ -55,11 +57,16 @@ export class DiscountEditComponent implements OnInit {
             discountType: [null, [Validators.required]],
             discountPrice: [null, [Validators.required]],
             salesEndTime: [null, [Validators.required]],
+            usingRange: [null, [Validators.required]],
             effectiveDay: [1, [Validators.required]],
             status: [null],
             createTime: [null],
             secUser: {},
         });
+
+        this.commonsService.getDictionary('USING_RANGE', data => {
+            this.usingRange = data['return_data'];
+        });
     }
 
 
@@ -93,9 +100,10 @@ export class DiscountEditComponent implements OnInit {
                 this.validateForm.value.discountImg = this.discountImg[0].name;
             }
         } else {
-            this.message.error('请上传卡券图片');
-            return;
+            // this.message.error('请上传卡券图片');
+            // return;
         }
+        this.validateForm.value.discountImg = 'img';
 
         if (this.editFlag) {
             this.common.showConfirm('是否确定修改,确定将下架', dataR => {