From a9141bc3d89f359fd4fc6eccf43f76ac012c6319 Mon Sep 17 00:00:00 2001
From: yuanye <418471657@qq.com>
Date: Sun, 9 May 2021 22:35:26 +0800
Subject: [PATCH] 1

---
 src/app/admin/coupon/coupon-list/coupon-list.component.html | 6 ++++++
 .../admin/merchant/merchant-edit/merchant-edit.component.ts | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/app/admin/coupon/coupon-list/coupon-list.component.html b/src/app/admin/coupon/coupon-list/coupon-list.component.html
index 8c1f9a4..fee7a3c 100644
--- a/src/app/admin/coupon/coupon-list/coupon-list.component.html
+++ b/src/app/admin/coupon/coupon-list/coupon-list.component.html
@@ -102,8 +102,11 @@
             <th nzWidth="150px">卡券编号</th>
             <th nzWidth="160px">卡券名称</th>
             <th nzWidth="100px">销售价格</th>
+            <th nzWidth="100px">折扣价格</th>
             <th nzWidth="100px">有效库存</th>
+            <th nzWidth="100px">展示区域</th>
             <th nzWidth="100px">卡券类型</th>
+            <th nzWidth="100px">是否赠券</th>
             <th nzWidth="120px">卡券状态</th>
             <th nzWidth="150px">销售截止时间</th>
             <th nzWidth="150px">创建时间</th>
@@ -116,8 +119,11 @@
             <td>{{data.couponKey}}</td>
             <td>{{data.couponName}}</td>
             <td>¥{{data.salesPrice}}</td>
+            <td>¥{{data.discountPrice}}</td>
             <td>{{data.stockCount}}</td>
+            <td>{{data.displayArea === 1 ? '赠券专区' : '金币专区'}}</td>
             <td>{{data.couponType === 1 ? '内部卷' : '外部卷'}}</td>
+            <td>{{data.isPresent === true ? '赠券' : '无赠券'}}</td>
             <td>{{data.status | couponStatus}}</td>
             <td>{{data.salesEndTime | date: 'yyyy-MM-dd HH:mm'}}</td>
             <td>{{data.createTime | date: 'yyyy-MM-dd HH:mm'}}</td>
diff --git a/src/app/admin/merchant/merchant-edit/merchant-edit.component.ts b/src/app/admin/merchant/merchant-edit/merchant-edit.component.ts
index 0a88cb1..02e2e48 100644
--- a/src/app/admin/merchant/merchant-edit/merchant-edit.component.ts
+++ b/src/app/admin/merchant/merchant-edit/merchant-edit.component.ts
@@ -49,9 +49,9 @@ export class MerchantEditComponent implements OnInit {
             }
         });
         this.validateForm = this.fb.group({
-            loginTelephone: [null, [Validators.required, ValidatorsService.mobile]],
+            loginTelephone: [null, [Validators.required]],
             password: [null, [Validators.required, ValidatorsService.minLength(6)]],
-            merchantName: [null, [Validators.required, ValidatorsService.pwdLength(2, 5)]],
+            merchantName: [null, [Validators.required]],
             telephone: [null, [Validators.required]],
             address: [null, [Validators.required]],
             bankName: [null],