diff --git a/src/app/admin/order/order-c-list/order-c-list.component.ts b/src/app/admin/order/order-c-list/order-c-list.component.ts index aab9e26..619839f 100644 --- a/src/app/admin/order/order-c-list/order-c-list.component.ts +++ b/src/app/admin/order/order-c-list/order-c-list.component.ts @@ -86,7 +86,7 @@ export class OrderCListComponent implements OnInit { } whereObject['pageNum'] = this.pageNum; whereObject['pageSize'] = this.pageSize; - this.order.getKfcOrderList(whereObject, data => { + this.order.getCinemaOrderList(whereObject, data => { if (data['return_code'] === '000000') { this.requestData = data['return_data'].list; this.total = data['return_data'].total; diff --git a/src/app/admin/order/order-k-list/order-k-list.component.ts b/src/app/admin/order/order-k-list/order-k-list.component.ts index eeb0cd3..0bf055c 100644 --- a/src/app/admin/order/order-k-list/order-k-list.component.ts +++ b/src/app/admin/order/order-k-list/order-k-list.component.ts @@ -85,7 +85,7 @@ export class OrderKListComponent implements OnInit { } whereObject['pageNum'] = this.pageNum; whereObject['pageSize'] = this.pageSize; - this.order.getCinemaOrderList(whereObject, data => { + this.order.getKfcOrderList(whereObject, data => { if (data['return_code'] === '000000') { this.requestData = data['return_data'].list; this.total = data['return_data'].total; diff --git a/src/app/admin/order/order-list/order-list.component.html b/src/app/admin/order/order-list/order-list.component.html index 760b68b..2eb37f9 100644 --- a/src/app/admin/order/order-list/order-list.component.html +++ b/src/app/admin/order/order-list/order-list.component.html @@ -36,9 +36,17 @@
- 订单流水号 + 商品名称 - + + + +
+
+ + 用户电话 + +
diff --git a/src/app/admin/order/order-list/order-list.component.ts b/src/app/admin/order/order-list/order-list.component.ts index b1d18b8..f363372 100644 --- a/src/app/admin/order/order-list/order-list.component.ts +++ b/src/app/admin/order/order-list/order-list.component.ts @@ -64,6 +64,8 @@ export class OrderListComponent implements OnInit { paySerialNo: [null], payModel: [null], payType: [null], + memDiscountName: [null], + memPhone: [null], orderStatus: [null], payTime: [null] }); diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 6506d77..350d219 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,10 +4,10 @@ export const environment = { production: false, - // baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址) - // imageUrl: 'http://localhost:9302/filesystem/', - baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址) - imageUrl: 'https://hsgcs.dctpay.com/filesystem/', + baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址) + imageUrl: 'http://localhost:9302/filesystem/', + // baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址) + // imageUrl: 'https://hsgcs.dctpay.com/filesystem/', key: 'https://hsgcs.dctpay.com/phone-recharge-H5/index.html?codeValue=', };