From a409d862d9d18403b8d65c041836ea7d50f1527c Mon Sep 17 00:00:00 2001
From: Sum1Dream <418471657@qq.com>
Date: Tue, 30 Mar 2021 19:45:46 +0800
Subject: [PATCH] 1

---
 .../coupon/coupon-edit/coupon-edit.component.html      | 10 ++++++++++
 .../admin/coupon/coupon-edit/coupon-edit.component.ts  |  2 ++
 src/environments/environment.prod.ts                   |  4 ++--
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/app/admin/coupon/coupon-edit/coupon-edit.component.html b/src/app/admin/coupon/coupon-edit/coupon-edit.component.html
index a9f9fd1..ebc18f6 100644
--- a/src/app/admin/coupon/coupon-edit/coupon-edit.component.html
+++ b/src/app/admin/coupon/coupon-edit/coupon-edit.component.html
@@ -31,6 +31,16 @@
                     </nz-form-control>
                 </nz-form-item>
             </div>
+            <div nz-col [nzSpan]="8">
+                <nz-form-item>
+                    <nz-form-label [nzFor]="'couponSource'" >卡券来源</nz-form-label>
+                    <nz-form-control  nzErrorTip="请选择卡券来源!">
+                        <nz-select nzPlaceHolder="请选择卡券来源"  [formControlName]="'couponSource'">
+                            <nz-option nzValue="1" nzLabel="中石化"></nz-option>
+                        </nz-select>
+                    </nz-form-control>
+                </nz-form-item>
+            </div>
             <div nz-col [nzSpan]="8">
                 <nz-form-item>
                     <nz-form-label [nzFor]="'displayArea'"  nzRequired>展示区域</nz-form-label>
diff --git a/src/app/admin/coupon/coupon-edit/coupon-edit.component.ts b/src/app/admin/coupon/coupon-edit/coupon-edit.component.ts
index 885bae8..d43cbda 100644
--- a/src/app/admin/coupon/coupon-edit/coupon-edit.component.ts
+++ b/src/app/admin/coupon/coupon-edit/coupon-edit.component.ts
@@ -80,6 +80,7 @@ export class CouponEditComponent implements OnInit {
       isPresent: [false, [Validators.required]],
       payType: [false, [Validators.required]],
       displayArea: [false, [Validators.required]],
+      couponSource: [null],
       handselCouponId: [null],
       status: [null],
       couponKey: [null],
@@ -258,6 +259,7 @@ export class CouponEditComponent implements OnInit {
         data['return_data']['couponType'] = String(data['return_data']['couponType']);
         data['return_data']['displayArea'] = String(data['return_data']['displayArea']);
         data['return_data']['payType'] = String(data['return_data']['payType']);
+        data['return_data']['couponSource'] = String(data['return_data']['couponSource']);
         this.content = data['return_data']['couponDesc'];
         if (data['return_data']['couponImg'] != null && data['return_data']['couponImg'] !== '') {
           const couponImg = String(data['return_data']['couponImg']);
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 726b1dc..2e60ec0 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -1,5 +1,5 @@
 export const environment = {
   production: true,
-  baseUrl: 'https://hsgcs.dctpay.com/brest/', // 正式环境服务器地址(请求数据地址)
-  imageUrl: 'https://hsgcs.dctpay.com/filesystem/',
+  baseUrl: 'https://hsg.dctpay.com/brest/', // 正式环境服务器地址(请求数据地址)
+  imageUrl: 'https://hsg.dctpay.com/filesystem/',
 };