diff --git a/src/app/admin/order-manage/dicount-package-order-list/dicount-package-order-list.component.ts b/src/app/admin/order-manage/dicount-package-order-list/dicount-package-order-list.component.ts index c848fd0..6edc6dc 100644 --- a/src/app/admin/order-manage/dicount-package-order-list/dicount-package-order-list.component.ts +++ b/src/app/admin/order-manage/dicount-package-order-list/dicount-package-order-list.component.ts @@ -110,7 +110,7 @@ export class DicountPackageOrderListComponent implements OnInit { }); } // 查询订单状态数据 - this.commonsService.getDictionary('ORDER_OIL_STATUS', data => { + this.commonsService.getDictionary('ORDER_STATUS', data => { this.orderStatusArray = data['return_data']; }); this.getRequest(true, this.searchForm.value); diff --git a/src/app/admin/order-manage/hlt-charge-order/hlt-charge-order.component.ts b/src/app/admin/order-manage/hlt-charge-order/hlt-charge-order.component.ts index 90b256d..d952e0b 100644 --- a/src/app/admin/order-manage/hlt-charge-order/hlt-charge-order.component.ts +++ b/src/app/admin/order-manage/hlt-charge-order/hlt-charge-order.component.ts @@ -107,7 +107,7 @@ export class HltChargeOrderComponent implements OnInit { }); } // 查询订单状态数据 - this.commonsService.getDictionary('ORDER_OIL_STATUS', data => { + this.commonsService.getDictionary('ORDER_STATUS', data => { this.orderStatusArray = data['return_data']; }); this.getRequest(true, this.searchForm.value); diff --git a/src/app/admin/order-manage/kfc-order/kfc-order-list/kfc-order-list.component.ts b/src/app/admin/order-manage/kfc-order/kfc-order-list/kfc-order-list.component.ts index 3b16039..67f566c 100644 --- a/src/app/admin/order-manage/kfc-order/kfc-order-list/kfc-order-list.component.ts +++ b/src/app/admin/order-manage/kfc-order/kfc-order-list/kfc-order-list.component.ts @@ -105,7 +105,7 @@ export class KfcOrderListComponent implements OnInit { }); } // 查询订单状态数据 - this.commonsService.getDictionary('ORDER_OIL_STATUS', data => { + this.commonsService.getDictionary('ORDER_STATUS', data => { this.orderStatusArray = data['return_data']; }); this.getRequest(true, this.searchForm.value); diff --git a/src/app/admin/order-manage/member-charge-order/member-charge-order-list/member-charge-order-list.component.ts b/src/app/admin/order-manage/member-charge-order/member-charge-order-list/member-charge-order-list.component.ts index 6c26922..8be53ab 100644 --- a/src/app/admin/order-manage/member-charge-order/member-charge-order-list/member-charge-order-list.component.ts +++ b/src/app/admin/order-manage/member-charge-order/member-charge-order-list/member-charge-order-list.component.ts @@ -104,7 +104,7 @@ export class MemberChargeOrderListComponent implements OnInit { }); } // 查询订单状态数据 - this.commonsService.getDictionary('ORDER_OIL_STATUS', data => { + this.commonsService.getDictionary('ORDER_STATUS', data => { this.orderStatusArray = data['return_data']; }); this.getRequest(true, this.searchForm.value); diff --git a/src/app/admin/order-manage/mobile-recharge-order-list/mobile-recharge-order-list.component.ts b/src/app/admin/order-manage/mobile-recharge-order-list/mobile-recharge-order-list.component.ts index 661f5d6..4e1bb54 100644 --- a/src/app/admin/order-manage/mobile-recharge-order-list/mobile-recharge-order-list.component.ts +++ b/src/app/admin/order-manage/mobile-recharge-order-list/mobile-recharge-order-list.component.ts @@ -106,7 +106,7 @@ export class MobileRechargeOrderListComponent implements OnInit { }); } // 查询订单状态数据 - this.commonsService.getDictionary('ORDER_OIL_STATUS', data => { + this.commonsService.getDictionary('ORDER_STATUS', data => { this.orderStatusArray = data['return_data']; }); this.getRequest(true, this.searchForm.value); diff --git a/src/app/admin/order-manage/starbucks-order/starbucks-order-list/starbucks-order-list.component.ts b/src/app/admin/order-manage/starbucks-order/starbucks-order-list/starbucks-order-list.component.ts index 350f544..f873bc8 100644 --- a/src/app/admin/order-manage/starbucks-order/starbucks-order-list/starbucks-order-list.component.ts +++ b/src/app/admin/order-manage/starbucks-order/starbucks-order-list/starbucks-order-list.component.ts @@ -104,7 +104,7 @@ export class StarbucksOrderListComponent implements OnInit { }); } // 查询订单状态数据 - this.commonsService.getDictionary('ORDER_OIL_STATUS', data => { + this.commonsService.getDictionary('ORDER_STATUS', data => { this.orderStatusArray = data['return_data']; }); this.getRequest(true, this.searchForm.value); diff --git a/src/environments/environment.ts b/src/environments/environment.ts index ef7037a..54aeb74 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -5,7 +5,7 @@ export const environment = { production: false, baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址) - orderUrl: 'http://localhost:9304/order/', // 测试环境服务器地址(请求数据地址) + orderUrl: 'https://hsgcs.dctpay.com/order/', // 测试环境服务器地址(请求数据地址) imageUrl: 'https://hsgcs.dctpay.com/filesystem/', key: 'https://hsgcs.dctpay.com/phone-recharge-H5/index.html?codeValue=', inviteUrl: 'https://hsgcs.dctpay.com/wx/?action=ic&id=',