From c640afd8956767253759083a2b6337e2a8933e06 Mon Sep 17 00:00:00 2001
From: Sum1Dream <418471657@qq.com>
Date: Wed, 31 Mar 2021 01:01:59 +0800
Subject: [PATCH] 1

---
 src/app/admin/coupon/coupon-list/coupon-list.component.ts | 1 +
 .../coupon/sales-code-list/sales-code-list.component.html | 2 +-
 .../merchant/merchant-edit/merchant-edit.component.html   | 8 --------
 .../merchant/merchant-edit/merchant-edit.component.ts     | 1 -
 src/environments/environment.test.ts                      | 4 ++--
 5 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/app/admin/coupon/coupon-list/coupon-list.component.ts b/src/app/admin/coupon/coupon-list/coupon-list.component.ts
index 63c7835..e010336 100644
--- a/src/app/admin/coupon/coupon-list/coupon-list.component.ts
+++ b/src/app/admin/coupon/coupon-list/coupon-list.component.ts
@@ -195,6 +195,7 @@ export class CouponListComponent implements OnInit {
 
     // 查看门店列表
     public getList(id: number , couponName: string , couponType: number): void {
+        console.log(couponType);
         this.router.navigate(['/admin/coupon/salesCode-list'], {
             queryParams: {
                 couponId: id,
diff --git a/src/app/admin/coupon/sales-code-list/sales-code-list.component.html b/src/app/admin/coupon/sales-code-list/sales-code-list.component.html
index 0de2db3..e06fe07 100644
--- a/src/app/admin/coupon/sales-code-list/sales-code-list.component.html
+++ b/src/app/admin/coupon/sales-code-list/sales-code-list.component.html
@@ -46,7 +46,7 @@
     <span>共计 {{total}} 条数据</span>
     <span *ngIf="id != null" style="margin-left: 30px;;">
         卡券名称:
-        <span style="font-weight: bold; font-size: 20px">{{name}}({{type === 1 ? '内部卷' : '外部卷'}})</span>
+        <span style="font-weight: bold; font-size: 20px">{{name}}({{type === 1 ? '内部券' : '外部券'}})</span>
     </span>
     <div class="operating-button">
         <button *ngIf="type === 1" nz-button nzType="primary" class="right-btn" (click)="showModal()"><i nz-icon
diff --git a/src/app/admin/merchant/merchant-edit/merchant-edit.component.html b/src/app/admin/merchant/merchant-edit/merchant-edit.component.html
index f641d58..7a4537d 100644
--- a/src/app/admin/merchant/merchant-edit/merchant-edit.component.html
+++ b/src/app/admin/merchant/merchant-edit/merchant-edit.component.html
@@ -34,14 +34,6 @@
                     </nz-form-control>
                 </nz-form-item>
             </div>
-            <div nz-col [nzSpan]="8">
-                <nz-form-item>
-                    <nz-form-label [nzFor]="'merchantKey'" nzRequired>商户编号</nz-form-label>
-                    <nz-form-control nzErrorTip="请输入商户编号!">
-                        <input nz-input placeholder="请输入商户编号..."  [formControlName]="'merchantKey'" id="'merchantKey'" />
-                    </nz-form-control>
-                </nz-form-item>
-            </div>
             <div nz-col [nzSpan]="8">
                 <nz-form-item>
                     <nz-form-label [nzFor]="'merchantName'" nzRequired>商户名称</nz-form-label>
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 afa3cb4..dd91d47 100644
--- a/src/app/admin/merchant/merchant-edit/merchant-edit.component.ts
+++ b/src/app/admin/merchant/merchant-edit/merchant-edit.component.ts
@@ -51,7 +51,6 @@ export class MerchantEditComponent implements OnInit {
         this.validateForm = this.fb.group({
             loginTelephone: [null, [Validators.required, ValidatorsService.mobile]],
             password: [null, [Validators.required, ValidatorsService.minLength(6)]],
-            merchantKey: [null, [Validators.required, ValidatorsService.maxLength(10)]],
             merchantName: [null, [Validators.required, ValidatorsService.pwdLength(2, 12)]],
             telephone: [null, [Validators.required]],
             address: [null, [Validators.required]],
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index 3ee1a1c..cee7c78 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -1,5 +1,5 @@
 export const environment = {
   production: true,
-  baseUrl: 'https://newhigh.shinwoten.cn/crest/', // 测试环境服务器地址(请求数据地址)
-  imageUrl: 'http://newhigh.shinwoten.cn/filesystem/',
+  baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
+  imageUrl: 'https://hsgcs.dctpay.com/filesystem/',
 };