diff --git a/src/app/admin/agent/agent-edit/agent-edit.component.html b/src/app/admin/agent/agent-edit/agent-edit.component.html index a49418f..18ed894 100644 --- a/src/app/admin/agent/agent-edit/agent-edit.component.html +++ b/src/app/admin/agent/agent-edit/agent-edit.component.html @@ -76,7 +76,6 @@
-
diff --git a/src/app/admin/company/company-edit/company-edit.component.html b/src/app/admin/company/company-edit/company-edit.component.html index 9421d4d..66b1549 100644 --- a/src/app/admin/company/company-edit/company-edit.component.html +++ b/src/app/admin/company/company-edit/company-edit.component.html @@ -38,14 +38,7 @@ -
- - 联系电话 - - - - -
+
@@ -65,14 +58,6 @@
- - 公司地址 - - - - -
-
公司LOGO diff --git a/src/app/admin/company/company-edit/company-edit.component.ts b/src/app/admin/company/company-edit/company-edit.component.ts index 5c19fdf..6eef281 100644 --- a/src/app/admin/company/company-edit/company-edit.component.ts +++ b/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; diff --git a/src/app/admin/company/company-list/company-list.component.html b/src/app/admin/company/company-list/company-list.component.html index 499f69b..f78e537 100644 --- a/src/app/admin/company/company-list/company-list.component.html +++ b/src/app/admin/company/company-list/company-list.component.html @@ -52,8 +52,6 @@ 所属地区 公司名称 公司LOGO - 联系方式 - 地址 创建时间 更新时间 操作 @@ -67,8 +65,6 @@ - {{data.phone}} - {{data.address}} {{data.createTime | date: 'yyyy-MM-dd HH:mm'}} {{data.updateTime | date: 'yyyy-MM-dd HH:mm'}} 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 4affdca..b64197f 100644 --- a/src/app/admin/coupon/coupon-edit/coupon-edit.component.html +++ b/src/app/admin/coupon/coupon-edit/coupon-edit.component.html @@ -125,7 +125,7 @@ 归库天数 - +
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 a8e0f4e..5d1a64a 100644 --- a/src/app/admin/coupon/coupon-edit/coupon-edit.component.ts +++ b/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]; diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 184a1dc..02e8aa1 100644 --- a/src/environments/environment.ts +++ b/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/', };