1

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

@@ -76,7 +76,6 @@
                 </div>
                 <div nz-row>
                     <div nz-col [nzSpan]="24" class="search-area">
-                        <button nz-button (click)="resetForm()">重置</button>
                         <button nz-button [nzType]="'primary'" (click)="getSave()">提交</button>
                     </div>
                 </div>

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

@@ -38,14 +38,7 @@
                             </nz-form-control>
                         </nz-form-item>
                     </div>
-                    <div nz-col [nzSpan]="8">
-                        <nz-form-item>
-                            <nz-form-label [nzFor]="'phone'" nzRequired>联系电话</nz-form-label>
-                            <nz-form-control nzErrorTip="请输入联系电话!">
-                                <input nz-input placeholder="请输入联系电话..."  [formControlName]="'phone'" id="'phone'" />
-                            </nz-form-control>
-                        </nz-form-item>
-                    </div>
+
                     <nz-divider nzText="公司信息"></nz-divider>
                     <div nz-col [nzSpan]="8">
                         <nz-form-item>
@@ -65,14 +58,6 @@
                         </nz-form-item>
                     </div>
                     <div nz-col [nzSpan]="8">
-                        <nz-form-item>
-                            <nz-form-label [nzFor]="'address'" nzRequired>公司地址</nz-form-label>
-                            <nz-form-control nzErrorTip="请输入公司地址!">
-                                <input nz-input placeholder="请输入公司地址..."  [formControlName]="'address'" id="'address'" />
-                            </nz-form-control>
-                        </nz-form-item>
-                    </div>
-                    <div nz-col [nzSpan]="20">
                         <nz-form-item>
                             <nz-form-label>公司LOGO</nz-form-label>
                             <nz-form-control>

src/app/admin/company/company-edit/company-edit.component.ts

@@ -54,10 +54,8 @@ export class CompanyEditComponent implements OnInit {
     this.validateForm = this.fb.group({
       loginName: [null, [Validators.required, ValidatorsService.maxLength(20)]],
       password: [null, [Validators.required]],
-      phone: [null, [Validators.required]],
       regionId: [null],
       name: [null, [Validators.required, ValidatorsService.maxLength(50)]],
-      address: [null, [Validators.required, ValidatorsService.maxLength(80)]],
       logo: [null],
       regionName: [null],
       company: {},
@@ -96,8 +94,6 @@ export class CompanyEditComponent implements OnInit {
     }
     this.validateForm.value['company']['name'] = this.validateForm.value.name;
     this.validateForm.value['company']['regionId'] = this.regionId;
-    this.validateForm.value['company']['address'] = this.validateForm.value.address;
-    this.validateForm.value['company']['phone'] = this.validateForm.value.phone;
     this.validateForm.value['company']['logo'] = this.validateForm.value.logo;
     this.validateForm.value['user']['loginName'] = this.validateForm.value.loginName;
     this.validateForm.value['user']['password'] = this.validateForm.value.password;

src/app/admin/company/company-list/company-list.component.html

@@ -52,8 +52,6 @@
             <th nzWidth="80px">所属地区</th>
             <th nzWidth="80px">公司名称</th>
             <th nzWidth="80px">公司LOGO</th>
-            <th nzWidth="70px">联系方式</th>
-            <th nzWidth="100px">地址</th>
             <th nzWidth="100px">创建时间</th>
             <th nzWidth="100px">更新时间</th>
             <th nzWidth="80px" nzRight="0px">操作</th>
@@ -67,8 +65,6 @@
             <td>
                 <img class="head_img" src="{{WEB_SERVE_URL + data.logo}}" onerror="this.src='../../../../assets/admin/navigation/icon.png'" alt="">
             </td>
-            <td>{{data.phone}}</td>
-            <td>{{data.address}}</td>
             <td>{{data.createTime | date: 'yyyy-MM-dd HH:mm'}}</td>
             <td>{{data.updateTime | date: 'yyyy-MM-dd HH:mm'}}</td>
             <td nzRight="0px" class="table-td-operation">

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

@@ -125,7 +125,7 @@
                 <nz-form-item>
                     <nz-form-label [nzFor]="'recycleDay'" nzRequired>归库天数</nz-form-label>
                     <nz-form-control nzErrorTip="请输入归库天数!">
-                        <nz-input-number [formControlName]="'recycleDay'" [nzMin]="1" [nzMax]="100" [nzStep]="1"></nz-input-number>
+                        <input nz-input [type] ="'number'" placeholder="请输入归库天数 ..."  [formControlName]="'recycleDay'" id="'recycleDay'" />
                     </nz-form-control>
                 </nz-form-item>
             </div>

src/app/admin/coupon/coupon-edit/coupon-edit.component.ts

@@ -78,7 +78,7 @@ export class CouponEditComponent implements OnInit {
       salesPrice: [null, [Validators.required]],
       discountPrice: [null, [Validators.required]],
       merchantId: [null, [Validators.required]],
-      isPresent: [false, [Validators.required]],
+      isPresent: [false],
       payType: [null, [Validators.required]],
       displayArea: [null],
       couponSource: [null],
@@ -190,6 +190,14 @@ export class CouponEditComponent implements OnInit {
       }
     }
 
+    if (this.validateForm.value.isPresent == null) {
+      this.validateForm.value.isPresent = false;
+    }
+
+    if (this.validateForm.value.isPresent === false) {
+          this.validateForm.value.handselCouponId = [];
+    }
+
     if (this.couponImg.length !== 0) {
       if (this.couponImg[0]['response'] != null) {
         this.validateForm.value.couponImg = this.couponImg[0]['response']['return_data'][0];

src/environments/environment.ts

@@ -4,9 +4,9 @@
 
 export const environment = {
   production: false,
-  // baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址)
+  baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址)
   // imageUrl: 'http://localhost:9302/filesystem/',
-  baseUrl: 'https://hsgcs.dctpay.com/brest/', // 正式环境服务器地址(请求数据地址)
+  // baseUrl: 'https://hsgcs.dctpay.com/brest/', // 正式环境服务器地址(请求数据地址)
   imageUrl: 'https://hsgcs.dctpay.com/filesystem/',
 };