diff --git a/src/app/pages/audit/audit-list/audit-list.component.html b/src/app/pages/audit/audit-list/audit-list.component.html index 17419f4..171770e 100644 --- a/src/app/pages/audit/audit-list/audit-list.component.html +++ b/src/app/pages/audit/audit-list/audit-list.component.html @@ -131,7 +131,7 @@ 规格名称 价格(RMB) 图片 - 限购(个) + 库存(个) 时间 虚拟产品 @@ -163,7 +163,7 @@ - {{data.purLimit}} + {{data.stock}} {{ data.salesEndTime | date: 'yyyy-MM-dd HH:mm'}} {{ data.createTime | date: 'yyyy-MM-dd HH:mm'}} diff --git a/src/app/pages/goods/goods-list/goods-list.component.html b/src/app/pages/goods/goods-list/goods-list.component.html index 425f920..d285820 100644 --- a/src/app/pages/goods/goods-list/goods-list.component.html +++ b/src/app/pages/goods/goods-list/goods-list.component.html @@ -274,7 +274,7 @@ 规格名称 价格(RMB) 图片 - 限购(个) + 库存(个) 时间 虚拟产品 @@ -307,7 +307,7 @@ - {{data.purLimit}} + {{data.stock}} {{ data.salesEndTime | date: 'yyyy-MM-dd HH:mm'}} {{ data.createTime | date: 'yyyy-MM-dd HH:mm'}} @@ -419,8 +419,8 @@ - 跳转地址 - + 跳转地址 + diff --git a/src/app/pages/goods/goods-list/goods-list.component.ts b/src/app/pages/goods/goods-list/goods-list.component.ts index 728ac05..c5304c1 100644 --- a/src/app/pages/goods/goods-list/goods-list.component.ts +++ b/src/app/pages/goods/goods-list/goods-list.component.ts @@ -427,18 +427,13 @@ export class GoodsListComponent { this.editSpecsForm.controls['jumpType'].clearValidators(); this.editSpecsForm.controls['jumpType'].markAsPristine(); - this.editSpecsForm.controls['jumpUrl'].clearValidators(); - this.editSpecsForm.controls['jumpUrl'].markAsPristine(); } else { this.editSpecsForm.controls['jumpType'].setValidators(Validators.required); this.editSpecsForm.controls['jumpType'].markAsDirty(); - this.editSpecsForm.controls['jumpUrl'].setValidators(Validators.required); - this.editSpecsForm.controls['jumpUrl'].markAsDirty(); } - this.editSpecsForm.controls['jumpUrl'].updateValueAndValidity(); this.editSpecsForm.controls['jumpType'].updateValueAndValidity(); } diff --git a/src/app/pages/marketing/coupon-discount-list/coupon-discount-list.component.html b/src/app/pages/marketing/coupon-discount-list/coupon-discount-list.component.html index cf4390f..41d8de9 100644 --- a/src/app/pages/marketing/coupon-discount-list/coupon-discount-list.component.html +++ b/src/app/pages/marketing/coupon-discount-list/coupon-discount-list.component.html @@ -101,7 +101,7 @@ - + @@ -143,8 +143,8 @@ - 数量 - + 赠送数量 + diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index d57d853..d7d5461 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,7 +1,7 @@ export const environment = { production: true, - baseUrl: 'https://hsg.dctpay.com/brest/', // 正式环境服务器地址(请求数据地址) - orderUrl: 'https://hsg.dctpay.com/order/', // 测试环境服务器地址(请求数据地址) - imageUrl: 'https://hsg.dctpay.com/filesystem/', - userUrl: 'https://hsg.dctpay.com/User/', + baseUrl: 'https://phg.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址) + orderUrl: 'https://phg.dctpay.com/order/', // 测试环境服务器地址(请求数据地址) + userUrl: 'https://phg.dctpay.com/user/', // 测试环境服务器地址(请求数据地址) + imageUrl: 'https://phg.obs.cn-southwest-2.myhuaweicloud.com/', }; diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 548d026..efdd6ff 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,10 +4,10 @@ export const environment = { production: false, - baseUrl: 'https://phgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址) - orderUrl: 'https://phgcs.dctpay.com/order/', // 测试环境服务器地址(请求数据地址) - userUrl: 'https://phgcs.dctpay.com/user/', // 测试环境服务器地址(请求数据地址) - imageUrl: 'https://phg-test.obs.cn-southwest-2.myhuaweicloud.com/', + baseUrl: 'https://phg.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址) + orderUrl: 'https://phg.dctpay.com/order/', // 测试环境服务器地址(请求数据地址) + userUrl: 'https://phg.dctpay.com/user/', // 测试环境服务器地址(请求数据地址) + imageUrl: 'https://phg.obs.cn-southwest-2.myhuaweicloud.com/', // baseUrl: 'http://localhost:9702/brest/', // 测试环境服务器地址(请求数据地址) // orderUrl: 'http://localhost:9703/order/', // 测试环境服务器地址(请求数据地址) // userUrl: 'http://localhost:9704/user/', // 测试环境服务器地址(请求数据地址)